David Tardon
12 years ago
parent
0d7420aa81
commit
dcf190cdf1
@ -1,99 +0,0 @@
|
|||||||
From 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marco Biscaro <marcobiscaro2112@gmail.com>
|
|
||||||
Date: Sun, 26 Aug 2012 21:32:41 -0300
|
|
||||||
Subject: [PATCH] fdo#47157 adding Keywords to .desktop files
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Adding Keywords to .desktop files, following the suggestions in
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0
|
|
||||||
|
|
||||||
Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/490
|
|
||||||
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
||||||
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
||||||
---
|
|
||||||
sysui/desktop/menus/base.desktop | 1 +
|
|
||||||
sysui/desktop/menus/calc.desktop | 1 +
|
|
||||||
sysui/desktop/menus/draw.desktop | 1 +
|
|
||||||
sysui/desktop/menus/impress.desktop | 1 +
|
|
||||||
sysui/desktop/menus/math.desktop | 1 +
|
|
||||||
sysui/desktop/menus/writer.desktop | 1 +
|
|
||||||
6 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
|
|
||||||
index 72cf467..578e5c7 100755
|
|
||||||
--- a/sysui/desktop/menus/base.desktop
|
|
||||||
+++ b/sysui/desktop/menus/base.desktop
|
|
||||||
@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.bas
|
|
||||||
Name=%PRODUCTNAME Base
|
|
||||||
GenericName=Database Development
|
|
||||||
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
|
|
||||||
+Keywords=Data;SQL;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
|
|
||||||
index e9f3250..638b9e2 100755
|
|
||||||
--- a/sysui/desktop/menus/calc.desktop
|
|
||||||
+++ b/sysui/desktop/menus/calc.desktop
|
|
||||||
@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op
|
|
||||||
Name=%PRODUCTNAME Calc
|
|
||||||
GenericName=Spreadsheet
|
|
||||||
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
|
|
||||||
+Keywords=Accounting;Stats;Chart;ods;xls;xlsx;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
|
|
||||||
index 9511fd5..6d92845 100755
|
|
||||||
--- a/sysui/desktop/menus/draw.desktop
|
|
||||||
+++ b/sysui/desktop/menus/draw.desktop
|
|
||||||
@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opend
|
|
||||||
Name=%PRODUCTNAME Draw
|
|
||||||
GenericName=Drawing Program
|
|
||||||
Comment=Create and edit drawings, flow charts, and logos by using Draw.
|
|
||||||
+Keywords=Vector;Schema;Diagram;odg;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
|
|
||||||
index 2fb8650..d8ca703 100755
|
|
||||||
--- a/sysui/desktop/menus/impress.desktop
|
|
||||||
+++ b/sysui/desktop/menus/impress.desktop
|
|
||||||
@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o
|
|
||||||
Name=%PRODUCTNAME Impress
|
|
||||||
GenericName=Presentation
|
|
||||||
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
|
|
||||||
+Keywords=Slideshow;odp;ppt;pptx;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
|
|
||||||
index 867711d..4381a49 100755
|
|
||||||
--- a/sysui/desktop/menus/math.desktop
|
|
||||||
+++ b/sysui/desktop/menus/math.desktop
|
|
||||||
@@ -10,6 +10,7 @@ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math
|
|
||||||
Name=%PRODUCTNAME Math
|
|
||||||
GenericName=Formula Editor
|
|
||||||
Comment=Create and edit scientific formulas and equations by using Math.
|
|
||||||
+Keywords=Equation;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
|
|
||||||
index 888b382..f76ac4e 100755
|
|
||||||
--- a/sysui/desktop/menus/writer.desktop
|
|
||||||
+++ b/sysui/desktop/menus/writer.desktop
|
|
||||||
@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum
|
|
||||||
Name=%PRODUCTNAME Writer
|
|
||||||
GenericName=Word Processor
|
|
||||||
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
|
|
||||||
+Keywords=Text;Letter;CV;odt;doc;docx;
|
|
||||||
InitialPreference=5
|
|
||||||
X-Ayatana-Desktop-Shortcuts=X-New
|
|
||||||
[X-New Shortcut Group]
|
|
||||||
--
|
|
||||||
1.7.11.7
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From bb6a12caede53029ecb99810f2f58daae4e11af7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rene Engelhard <rene@debian.org>
|
|
||||||
Date: Wed, 31 Oct 2012 18:00:18 +0100
|
|
||||||
Subject: [PATCH] fix sdext build with poppler >= 0.19.x
|
|
||||||
|
|
||||||
Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
|
|
||||||
---
|
|
||||||
configure.ac | 3 ---
|
|
||||||
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 +++-
|
|
||||||
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 +++++---
|
|
||||||
3 files changed, 8 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
index 77a9aa6..7adc487 100644
|
|
||||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
@@ -489,7 +489,9 @@ void PDFOutDev::endPage()
|
|
||||||
printf("endPage\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
||||||
+#if POPPLER_CHECK_VERSION(0, 19, 0)
|
|
||||||
+void PDFOutDev::processLink(AnnotLink *link)
|
|
||||||
+#elif POPPLER_CHECK_VERSION(0, 17, 0)
|
|
||||||
void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
|
||||||
#else
|
|
||||||
void PDFOutDev::processLink(Link* link, Catalog*)
|
|
||||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
||||||
index 0a19b9a..e5e48fc 100644
|
|
||||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
||||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
||||||
@@ -189,10 +189,12 @@ namespace pdfi
|
|
||||||
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
|
|
||||||
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
|
|
||||||
|
|
||||||
- #if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
||||||
- virtual void processLink(AnnotLink *link, Catalog *catalog);
|
|
||||||
- #else
|
|
||||||
//----- link borders
|
|
||||||
+ #if POPPLER_CHECK_VERSION(0, 19, 0)
|
|
||||||
+ virtual void processLink(AnnotLink *link);
|
|
||||||
+ #elif POPPLER_CHECK_VERSION(0, 17, 0)
|
|
||||||
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
|
|
||||||
+ #else
|
|
||||||
virtual void processLink(Link *link, Catalog *catalog);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.11.7
|
|
||||||
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From fef1b6e42dc22d764140ea0f8e690225c697bb96 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <fef1b6e42dc22d764140ea0f8e690225c697bb96.1351699658.git.erack@redhat.com>
|
|
||||||
From: Eike Rathke <erack@redhat.com>
|
|
||||||
Date: Fri, 26 Oct 2012 18:09:20 +0200
|
|
||||||
Subject: [PATCH] resolved rhbz865058 retard overflow of internal table of
|
|
||||||
number formats
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
|
||||||
|
|
||||||
This is a multi-part message in MIME format.
|
|
||||||
--------------erAck-patch-parts
|
|
||||||
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
|
|
||||||
Due to an insane amount of ridiculous "user-defined" number formats the
|
|
||||||
internal table may overflow during import, stave off and increase the
|
|
||||||
number of available slots to another arbitrary limit.
|
|
||||||
(cherry picked from commit 075e9ca0b96f37b3561824c23af60872d6a9d80a)
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
|
|
||||||
svl/inc/svl/zforlist.hxx
|
|
||||||
|
|
||||||
Change-Id: I2fb85c83a65d6c5b3183aeb3a3bda88828473a3c
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/951
|
|
||||||
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
||||||
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
||||||
---
|
|
||||||
svl/inc/svl/zforlist.hxx | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
|
|
||||||
--------------erAck-patch-parts
|
|
||||||
Content-Type: text/x-patch; name="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch"
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
Content-Disposition: attachment; filename="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch"
|
|
||||||
|
|
||||||
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
|
|
||||||
index 2dfa273..0a70557 100644
|
|
||||||
--- a/svl/inc/svl/zforlist.hxx
|
|
||||||
+++ b/svl/inc/svl/zforlist.hxx
|
|
||||||
@@ -63,7 +63,7 @@ namespace rtl {
|
|
||||||
class OUString;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#define SV_COUNTRY_LANGUAGE_OFFSET 5000 // Max count of formats per country/language
|
|
||||||
+#define SV_COUNTRY_LANGUAGE_OFFSET 10000 // Max count of formats per country/language
|
|
||||||
#define SV_MAX_ANZ_STANDARD_FORMATE 100 // Max count of builtin default formats per CL
|
|
||||||
|
|
||||||
// Format types
|
|
||||||
|
|
||||||
--------------erAck-patch-parts--
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in new issue