[Libreoffice-commits] .: 34 commits - desktop/source desktop/zipintro drawinglayer/source officecfg/registry readlicense_oo/odt sfx2/source sysui/desktop xmlhelp/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Feb 7 17:12:00 PST 2011
desktop/source/deployment/manager/dp_extensionmanager.cxx | 8
desktop/zipintro/makefile.mk | 20 +
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 15 +
officecfg/registry/data/org/openoffice/VCL.xcu | 52 ++--
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 2
readlicense_oo/odt/CREDITS.odt |binary
readlicense_oo/odt/LICENSE.odt |binary
sfx2/source/appl/app.hrc | 10
sfx2/source/appl/app.src | 54 ++++
sfx2/source/appl/appserv.cxx | 124 ++++++----
sfx2/source/appl/newhelp.cxx | 10
sfx2/source/appl/newhelp.hxx | 3
sfx2/source/appl/sfxhelp.cxx | 36 +-
sysui/desktop/icons/database.icns |binary
sysui/desktop/icons/database.ico |binary
sysui/desktop/icons/drawing-template.icns |binary
sysui/desktop/icons/drawing-template.ico |binary
sysui/desktop/icons/drawing.icns |binary
sysui/desktop/icons/drawing.ico |binary
sysui/desktop/icons/empty-document.icns |binary
sysui/desktop/icons/empty-document.ico |binary
sysui/desktop/icons/empty-template.icns |binary
sysui/desktop/icons/empty-template.ico |binary
sysui/desktop/icons/formula.icns |binary
sysui/desktop/icons/formula.ico |binary
sysui/desktop/icons/hicolor/128x128/apps/base.png |binary
sysui/desktop/icons/hicolor/128x128/apps/calc.png |binary
sysui/desktop/icons/hicolor/128x128/apps/draw.png |binary
sysui/desktop/icons/hicolor/128x128/apps/impress.png |binary
sysui/desktop/icons/hicolor/128x128/apps/main.png |binary
sysui/desktop/icons/hicolor/128x128/apps/math.png |binary
sysui/desktop/icons/hicolor/128x128/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/128x128/apps/writer.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png |binary
sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png |binary
sysui/desktop/icons/hicolor/16x16/apps/base.png |binary
sysui/desktop/icons/hicolor/16x16/apps/calc.png |binary
sysui/desktop/icons/hicolor/16x16/apps/draw.png |binary
sysui/desktop/icons/hicolor/16x16/apps/impress.png |binary
sysui/desktop/icons/hicolor/16x16/apps/main.png |binary
sysui/desktop/icons/hicolor/16x16/apps/math.png |binary
sysui/desktop/icons/hicolor/16x16/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/16x16/apps/writer.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png |binary
sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png |binary
sysui/desktop/icons/hicolor/32x32/apps/base.png |binary
sysui/desktop/icons/hicolor/32x32/apps/calc.png |binary
sysui/desktop/icons/hicolor/32x32/apps/draw.png |binary
sysui/desktop/icons/hicolor/32x32/apps/impress.png |binary
sysui/desktop/icons/hicolor/32x32/apps/main.png |binary
sysui/desktop/icons/hicolor/32x32/apps/math.png |binary
sysui/desktop/icons/hicolor/32x32/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/32x32/apps/writer.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png |binary
sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png |binary
sysui/desktop/icons/hicolor/48x48/apps/base.png |binary
sysui/desktop/icons/hicolor/48x48/apps/calc.png |binary
sysui/desktop/icons/hicolor/48x48/apps/draw.png |binary
sysui/desktop/icons/hicolor/48x48/apps/impress.png |binary
sysui/desktop/icons/hicolor/48x48/apps/main.png |binary
sysui/desktop/icons/hicolor/48x48/apps/math.png |binary
sysui/desktop/icons/hicolor/48x48/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/48x48/apps/writer.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png |binary
sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png |binary
sysui/desktop/icons/main.icns |binary
sysui/desktop/icons/main.ico |binary
sysui/desktop/icons/master-document.icns |binary
sysui/desktop/icons/master-document.ico |binary
sysui/desktop/icons/oasis-database.icns |binary
sysui/desktop/icons/oasis-database.ico |binary
sysui/desktop/icons/oasis-drawing-template.icns |binary
sysui/desktop/icons/oasis-drawing-template.ico |binary
sysui/desktop/icons/oasis-drawing.icns |binary
sysui/desktop/icons/oasis-drawing.ico |binary
sysui/desktop/icons/oasis-empty-document.icns |binary
sysui/desktop/icons/oasis-empty-document.ico |binary
sysui/desktop/icons/oasis-empty-template.icns |binary
sysui/desktop/icons/oasis-empty-template.ico |binary
sysui/desktop/icons/oasis-formula.icns |binary
sysui/desktop/icons/oasis-formula.ico |binary
sysui/desktop/icons/oasis-master-document.icns |binary
sysui/desktop/icons/oasis-master-document.ico |binary
sysui/desktop/icons/oasis-presentation-template.icns |binary
sysui/desktop/icons/oasis-presentation-template.ico |binary
sysui/desktop/icons/oasis-presentation.icns |binary
sysui/desktop/icons/oasis-presentation.ico |binary
sysui/desktop/icons/oasis-spreadsheet-template.icns |binary
sysui/desktop/icons/oasis-spreadsheet-template.ico |binary
sysui/desktop/icons/oasis-spreadsheet.icns |binary
sysui/desktop/icons/oasis-spreadsheet.ico |binary
sysui/desktop/icons/oasis-text-template.icns |binary
sysui/desktop/icons/oasis-text-template.ico |binary
sysui/desktop/icons/oasis-text.icns |binary
sysui/desktop/icons/oasis-text.ico |binary
sysui/desktop/icons/oasis-web-template.icns |binary
sysui/desktop/icons/oasis-web-template.ico |binary
sysui/desktop/icons/ooo3_base_app.icns |binary
sysui/desktop/icons/ooo3_base_app.ico |binary
sysui/desktop/icons/ooo3_calc_app.icns |binary
sysui/desktop/icons/ooo3_calc_app.ico |binary
sysui/desktop/icons/ooo3_draw_app.icns |binary
sysui/desktop/icons/ooo3_draw_app.ico |binary
sysui/desktop/icons/ooo3_impress_app.icns |binary
sysui/desktop/icons/ooo3_impress_app.ico |binary
sysui/desktop/icons/ooo3_main_app.icns |binary
sysui/desktop/icons/ooo3_main_app.ico |binary
sysui/desktop/icons/ooo3_math_app.icns |binary
sysui/desktop/icons/ooo3_math_app.ico |binary
sysui/desktop/icons/ooo3_open.icns |binary
sysui/desktop/icons/ooo3_open.ico |binary
sysui/desktop/icons/ooo3_writer_app.icns |binary
sysui/desktop/icons/ooo3_writer_app.ico |binary
sysui/desktop/icons/presentation-template.icns |binary
sysui/desktop/icons/presentation-template.ico |binary
sysui/desktop/icons/presentation.icns |binary
sysui/desktop/icons/presentation.ico |binary
sysui/desktop/icons/spreadsheet-template.icns |binary
sysui/desktop/icons/spreadsheet-template.ico |binary
sysui/desktop/icons/spreadsheet.icns |binary
sysui/desktop/icons/spreadsheet.ico |binary
sysui/desktop/icons/text-template.icns |binary
sysui/desktop/icons/text-template.ico |binary
sysui/desktop/icons/text.icns |binary
sysui/desktop/icons/text.ico |binary
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/javafilter.desktop | 1
sysui/desktop/menus/math.desktop | 1
sysui/desktop/menus/printeradmin.desktop | 2
sysui/desktop/menus/qstart.desktop | 1
sysui/desktop/menus/startcenter.desktop | 1
sysui/desktop/menus/writer.desktop | 1
sysui/desktop/share/brand.pl | 8
sysui/desktop/share/makefile.mk | 8
sysui/desktop/share/translate.pl | 6
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
179 files changed, 265 insertions(+), 104 deletions(-)
New commits:
commit b6844aaaaf56092d1c9321772f2afbebd1d790eb
Merge: 65e7e75... f6a1619...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 02:10:34 2011 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core
commit 65e7e751722389a0c52e005a17fc8318ea3ae1e9
Merge: 5af9eec... 73474b4...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 00:15:12 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sfx2/source/appl/appserv.cxx
diff --cc drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 17ced97,cfd0f47..bd1f6ce
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@@ -1380,6 -1380,7 +1380,7 @@@ namespace drawinglaye
{
// need to handle PolyPolygonHatchPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END
const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate);
- const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
++ const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon());
// #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points
@@@ -1387,8 -1388,20 +1388,20 @@@
while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon))
;
- if(rFillHatchAttribute.isFillBackground())
- {
- // with fixing #i111954# (see below) the possible background
- // fill of a hatched object was lost.Generate a background fill
- // primitive and render it
- const primitive2d::Primitive2DReference xBackground(
- new primitive2d::PolyPolygonColorPrimitive2D(
- aLocalPolyPolygon,
- rHatchCandidate.getBackgroundColor()));
-
- process(primitive2d::Primitive2DSequence(&xBackground, 1));
- }
++ if(rFillHatchAttribute.isFillBackground())
++ {
++ // with fixing #i111954# (see below) the possible background
++ // fill of a hatched object was lost.Generate a background fill
++ // primitive and render it
++ const primitive2d::Primitive2DReference xBackground(
++ new primitive2d::PolyPolygonColorPrimitive2D(
++ aLocalPolyPolygon,
++ rHatchCandidate.getBackgroundColor()));
++
++ process(primitive2d::Primitive2DSequence(&xBackground, 1));
++ }
+
SvtGraphicFill* pSvtGraphicFill = 0;
- const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
aLocalPolyPolygon.transform(maCurrentTransformation);
if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count())
diff --cc sysui/desktop/menus/base.desktop
index dbbff82,3cb84f8..40f7e79
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=base
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
-Exec=${UNIXBASISROOTNAME} -base %U
+Exec=${UNIXBASISROOTNAME} --base %U
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base
+ Name[pt_BR]=%PRODUCTNAME_BR Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
InitialPreference=5
diff --cc sysui/desktop/menus/calc.desktop
index 3b3bcce,d885589..3ae2bcb
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=calc
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
-Exec=${UNIXBASISROOTNAME} -calc %U
+Exec=${UNIXBASISROOTNAME} --calc %U
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
Name=%PRODUCTNAME Calc
+ Name[pt_BR]=%PRODUCTNAME_BR Calc
GenericName=Spreadsheet
Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
InitialPreference=5
diff --cc sysui/desktop/menus/draw.desktop
index 3fde5d0,21c31b8..f609d35
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=draw
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
-Exec=${UNIXBASISROOTNAME} -draw %U
+Exec=${UNIXBASISROOTNAME} --draw %U
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
Name=%PRODUCTNAME Draw
+ Name[pt_BR]=%PRODUCTNAME_BR Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
diff --cc sysui/desktop/menus/impress.desktop
index 3f6ce2f,33a7d90..814ee1d
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=impress
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
-Exec=${UNIXBASISROOTNAME} -impress %U
+Exec=${UNIXBASISROOTNAME} --impress %U
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
+ Name[pt_BR]=%PRODUCTNAME_BR Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
InitialPreference=5
diff --cc sysui/desktop/menus/javafilter.desktop
index 61e4ea7,44370f3..8b9c30a
--- a/sysui/desktop/menus/javafilter.desktop
+++ b/sysui/desktop/menus/javafilter.desktop
@@@ -2,8 -2,9 +2,9 @@@
Version=1.0
Terminal=false
Type=Application
-Exec=openoffice -writer %U
+Exec=${UNIXBASISROOTNAME} --writer %U
MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
Name=%PRODUCTNAME Small Device Format Importer
+ Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer
GenericName=Small Device Format Importer
NoDisplay=true
diff --cc sysui/desktop/menus/math.desktop
index 7b2e980,cd0717a..55fcc29
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=math
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
-Exec=${UNIXBASISROOTNAME} -math %U
+Exec=${UNIXBASISROOTNAME} --math %U
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
Name=%PRODUCTNAME Math
+ Name[pt_BR]=%PRODUCTNAME_BR Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
diff --cc sysui/desktop/menus/qstart.desktop
index fc39c22,1250fed..52ac185
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
@@@ -3,7 -3,8 +3,8 @@@ Version=1.
Terminal=false
Type=Application
Categories=Office;
-Exec=${UNIXBASISROOTNAME} -quickstart -nologo -nodefault
+Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault
NoDisplay=true
Name=%PRODUCTNAME Quickstarter
+ Name[pt_BR]=%PRODUCTNAME_BR Quickstarter
Comment=Hook for quickstarter startup
diff --cc sysui/desktop/menus/writer.desktop
index 8f7bf2b,95fe8db..59b4f57
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@@ -4,9 -4,10 +4,10 @@@ Terminal=fals
Icon=writer
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
-Exec=${UNIXBASISROOTNAME} -writer %U
+Exec=${UNIXBASISROOTNAME} --writer %U
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
+ Name[pt_BR]=%PRODUCTNAME_BR Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
InitialPreference=5
commit 73474b4bae74c3f6f6aac146db198ca958cef70c
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Feb 7 19:56:28 2011 +0100
wikihelp: Improve the check for existence of the localized help, fdo#33258.
This fixes commit 44eaa36c4ce25a7c861455e9dbe6c2c959adecb4 that introduced an
infinite recursion.
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8d8ca17..e55b8f7 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -132,8 +132,6 @@ using namespace ::com::sun::star::ui;
using namespace ::comphelper;
-extern void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark ); // sfxhelp.cxx
-
// defines ---------------------------------------------------------------
#define SPLITSET_ID 0
@@ -652,7 +650,7 @@ void IndexTabPage_Impl::InitializeIndex()
aURL += ::rtl::OUString( sFactory );
String aTemp = aURL;
- AppendConfigToken_Impl( aTemp, sal_True );
+ AppendConfigToken( aTemp, sal_True );
aURL = aTemp;
Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
@@ -1097,7 +1095,7 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
if ( !aFullWordsCB.IsChecked() )
aSearchText = sfx2::PrepareSearchString( aSearchText, xBreakIterator, true );
aSearchURL += aSearchText;
- AppendConfigToken_Impl( aSearchURL, sal_False );
+ AppendConfigToken( aSearchURL, sal_False );
if ( aScopeCB.IsChecked() )
aSearchURL += DEFINE_CONST_UNICODE("&Scope=Heading");
Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aSearchURL );
@@ -1522,7 +1520,7 @@ sal_Bool SfxHelpWindow_Impl::splitHelpURL(const ::rtl::OUString& sHelpURL,
sHelpURL.append(sFactory);
sHelpURL.append(sContent);
String sURL = String(sHelpURL.makeStringAndClear());
- AppendConfigToken_Impl(sURL, bUseQuestionMark);
+ AppendConfigToken(sURL, bUseQuestionMark);
if (sAnchor.getLength())
sURL += String(sAnchor);
return ::rtl::OUString(sURL);
@@ -1643,7 +1641,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
void SfxHelpIndexWindow_Impl::Initialize()
{
String aHelpURL = HELP_URL;
- AppendConfigToken_Impl( aHelpURL, sal_True );
+ AppendConfigToken( aHelpURL, sal_True );
Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpURL );
const ::rtl::OUString* pFacs = aFactories.getConstArray();
UINT32 i, nCount = aFactories.getLength();
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 268ca39..cb3e942 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -611,6 +611,9 @@ public:
inline String GetTitle() const { return aTitleED.GetText(); }
};
+/// Appends ?Language=xy&System=abc to the help URL in rURL
+void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUString &rLang = rtl::OUString() );
+
#endif // #ifndef INCLUDED_SFX_NEWHELP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 586515c..d425107 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -113,7 +113,7 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
#define STARTERLIST 0
-static bool impl_hasHelpInstalled();
+static bool impl_hasHelpInstalled( const rtl::OUString &rLang );
/// Return the locale we prefer for displaying help
static rtl::OUString HelpLocaleString()
@@ -121,13 +121,16 @@ static rtl::OUString HelpLocaleString()
static rtl::OUString aLocaleStr;
if (!aLocaleStr.getLength())
{
+ const rtl::OUString aEnglish( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
// detect installed locale
Any aLocale =
::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty(
::utl::ConfigManager::LOCALE );
aLocale >>= aLocaleStr;
bool bOk = aLocaleStr.getLength() != 0;
- if ( impl_hasHelpInstalled() && bOk )
+ if ( !bOk )
+ aLocaleStr = aEnglish;
+ else
{
rtl::OUString aBaseInstallPath;
// utl::Bootstrap::PathStatus aBaseLocateResult =
@@ -154,15 +157,19 @@ static rtl::OUString HelpLocaleString()
}
}
}
- if (!bOk)
- aLocaleStr = rtl::OUString( DEFINE_CONST_UNICODE("en") );
+ // if not OK, and not even English installed, we use online help, and
+ // have to preserve the full locale name
+ if ( !bOk && impl_hasHelpInstalled( aEnglish ) )
+ aLocaleStr = aEnglish;
}
return aLocaleStr;
}
-void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
+void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUString &rLang )
{
- ::rtl::OUString aLocaleStr(HelpLocaleString());
+ ::rtl::OUString aLocaleStr( rLang );
+ if ( !aLocaleStr.getLength() )
+ aLocaleStr = HelpLocaleString();
// query part exists?
if ( bQuestionMark )
@@ -338,7 +345,7 @@ void SfxHelp_Impl::Load()
// fill modules list
// create the help url (empty, without module and helpid)
String sHelpURL( DEFINE_CONST_UNICODE("vnd.sun.star.help://") );
- AppendConfigToken_Impl( sHelpURL, sal_True );
+ AppendConfigToken( sHelpURL, sal_True );
// open ucb content and get the list of the help modules
// the list contains strings with three tokens "ui title \t type \t url"
@@ -621,11 +628,11 @@ String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName )
aHelpURL += String::CreateFromInt64( nHelpId );
String aTempURL = aHelpURL;
- AppendConfigToken_Impl( aTempURL, sal_True );
+ AppendConfigToken( aTempURL, sal_True );
bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
}
- AppendConfigToken_Impl( aHelpURL, sal_True );
+ AppendConfigToken( aHelpURL, sal_True );
if ( bHasAnchor )
{
@@ -683,11 +690,11 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo
RTL_TEXTENCODING_ASCII_US ));
String aTempURL = aHelpURL;
- AppendConfigToken_Impl( aTempURL, sal_True );
+ AppendConfigToken( aTempURL, sal_True );
bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
}
- AppendConfigToken_Impl( aHelpURL, sal_True );
+ AppendConfigToken( aHelpURL, sal_True );
if ( bHasAnchor )
{
@@ -749,10 +756,10 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
}
/// Check for built-in help
-static bool impl_hasHelpInstalled()
+static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() )
{
String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
- AppendConfigToken_Impl( aHelpRootURL, sal_True );
+ AppendConfigToken( aHelpRootURL, sal_True, rLang );
Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
return ( aFactories.getLength() != 0 );
commit ed87a79ebafce971f91017ffb3adff55d9f34b42
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Feb 7 18:52:27 2011 +0100
fdo#33994: Fixed several crashes around config UNO API
cherry picked from 21427f17e1f6901ac9a7148d5d8ac13e0aad958e
Signed-off-by: Noel Power <noel.power at novell.com>
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 0382054..7fcd7a1 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -912,11 +912,7 @@ rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
OSL_ASSERT(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr Access has no service implementation name")),
- static_cast< cppu::OWeakObject * >(this));
+ return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.Access" ) );
}
sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
@@ -2095,7 +2091,9 @@ css::beans::Property Access::asProperty() {
default:
type = cppu::UnoType< css::uno::XInterface >::get(); //TODO: correct?
nillable = false;
- removable = getParentNode()->kind() == Node::KIND_SET;
+ removable = false;
+ if ( getParentNode() != NULL )
+ removable = getParentNode()->kind() == Node::KIND_SET;
break;
}
return css::beans::Property(
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 27f3884..ef5982e 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -327,6 +327,14 @@ css::util::ChangesSet RootAccess::getPendingChanges()
return changes.getAsConstList();
}
+rtl::OUString RootAccess::getImplementationName() throw (css::uno::RuntimeException)
+{
+ OSL_ASSERT(thisIs(IS_ANY));
+ osl::MutexGuard g(*lock_);
+ checkLocalizedPropertyAccess();
+ return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.RootAccess" ) );
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 4d74167..c175121 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -86,6 +86,11 @@ public:
bool isUpdate() const;
+protected:
+
+ virtual rtl::OUString SAL_CALL getImplementationName()
+ throw (com::sun::star::uno::RuntimeException);
+
private:
virtual ~RootAccess();
commit ac044cb591a40e688e61bea24db63258e826cd78
Author: Noel Power <noel.power at novell.com>
Date: Fri Feb 4 16:17:16 2011 +0000
fix for #30879
cherry picked from 6eb4e55b0a61f793f635a8038895cb2e452dc280
Signed-off-by: Muthu Subramanian K <sumuthu at novell.com>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 77cc1c3..7701bba 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -636,7 +636,7 @@ throw(::com::sun::star::uno::RuntimeException)
void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException )
{
osl::ClearableMutexGuard aGuard( GetMutex() );
- sal_Int16 nCount = m_nRequestCount;
+ sal_Int16 nCount = --m_nRequestCount;
aGuard.clear();
OfficeIPCThread::RequestsCompleted( 1 );
/*
commit 4c00e2b2d1f4c1b9aaa049ee3bd99bab99d5b3e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jan 27 02:36:52 2011 +0200
We don't need ddraw.lib which doesn't even exist in the current DX SDK
(cherry picked from commit 7bc42b864b22fd8e0b159dfec212abaf989ff9aa)
Signed-off-by: Noel Power <nopower at novell.com>
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index b70841e..7fdb923 100644
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -48,8 +48,7 @@ SLOFILES= \
$(SLO)$/manager.obj \
$(SLO)$/window.obj \
$(SLO)$/player.obj \
- $(SLO)$/framegrabber.obj
-
+ $(SLO)$/framegrabber.obj
EXCEPTIONSFILES= \
$(SLO)$/winuno.obj \
@@ -67,7 +66,6 @@ DEF1EXPORTFILE=exports.dxp
SHL1STDLIBS += $(OLE32LIB)
SHL1STDLIBS += $(OLEAUT32LIB)
SHL1STDLIBS += $(GDI32LIB)
-SHL1STDLIBS += $(DDRAWLIB)
.IF "$(COM)"=="GCC"
SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
commit 59c15b76481894696127b547294ffe24407b22f5
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Feb 3 17:27:48 2011 +0100
New mimetype icons for LibreOffice
Update from design team, source svg is
http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg
diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
index 115dc85..9fa0bbf 100644
Binary files a/sysui/desktop/icons/database.icns and b/sysui/desktop/icons/database.icns differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index e2377f4..02cf7a4 100755
Binary files a/sysui/desktop/icons/database.ico and b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns
index 359164f..64c373e 100644
Binary files a/sysui/desktop/icons/drawing-template.icns and b/sysui/desktop/icons/drawing-template.icns differ
diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico
index 2d3a088..af2e9ff 100755
Binary files a/sysui/desktop/icons/drawing-template.ico and b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns
index 81777c7..d179d04 100644
Binary files a/sysui/desktop/icons/drawing.icns and b/sysui/desktop/icons/drawing.icns differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 2d3a088..5297dae 100755
Binary files a/sysui/desktop/icons/drawing.ico and b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns
index 18d1133..c5c80a0 100644
Binary files a/sysui/desktop/icons/empty-document.icns and b/sysui/desktop/icons/empty-document.icns differ
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
index bd3aa12..20e665f 100644
Binary files a/sysui/desktop/icons/empty-document.ico and b/sysui/desktop/icons/empty-document.ico differ
diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns
index 034d30b..c5c80a0 100644
Binary files a/sysui/desktop/icons/empty-template.icns and b/sysui/desktop/icons/empty-template.icns differ
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
index b68f0f1..20e665f 100644
Binary files a/sysui/desktop/icons/empty-template.ico and b/sysui/desktop/icons/empty-template.ico differ
diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns
index 61cd00a..f6dc588 100644
Binary files a/sysui/desktop/icons/formula.icns and b/sysui/desktop/icons/formula.icns differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index 6360ec4..fb2f651 100755
Binary files a/sysui/desktop/icons/formula.ico and b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png
index 42b0276..d2c9458 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/base.png and b/sysui/desktop/icons/hicolor/128x128/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 368fb03..9614ca8 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/calc.png and b/sysui/desktop/icons/hicolor/128x128/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
index 72b67c8..b1405c5 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/draw.png and b/sysui/desktop/icons/hicolor/128x128/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
index 32ad785..1d0fdc0 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/impress.png and b/sysui/desktop/icons/hicolor/128x128/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index fd68a10..59efe69 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/main.png and b/sysui/desktop/icons/hicolor/128x128/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png
index 79e71ce..9a17a15 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/math.png and b/sysui/desktop/icons/hicolor/128x128/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
index b009ee2..59efe69 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png and b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
index 0d057fa..3fa71f4 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/writer.png and b/sysui/desktop/icons/hicolor/128x128/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
index 1429d82..d2c9458 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
index 4fdde3c..1925cee 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
index 7272482..b1405c5 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
index 9e4c72e..9a17a15 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
index 6f191e2..aa94c4b 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
index bf8229c..eff3f17 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
index 2b3a5bb..1d0fdc0 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
index 18c00ad..e396624 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
index ca48052..9614ca8 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
index ef5b5dd..0daebdf 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
index 178d4e2..3fa71f4 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
index 7edd66d..09ccf5f 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 3a08ee1..3465f32 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/base.png and b/sysui/desktop/icons/hicolor/16x16/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 2dc5407..3f1f4ae 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/calc.png and b/sysui/desktop/icons/hicolor/16x16/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index afc0370..94bc2aa 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/draw.png and b/sysui/desktop/icons/hicolor/16x16/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index f1957da..75d94f0 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/impress.png and b/sysui/desktop/icons/hicolor/16x16/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
new file mode 100644
index 0000000..2459b2a
Binary files /dev/null and b/sysui/desktop/icons/hicolor/16x16/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index de14882..ab945b1 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
index c81fc95..2459b2a 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png and b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 8304269..1aacbb5 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/writer.png and b/sysui/desktop/icons/hicolor/16x16/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
index 2f2d56d..3465f32 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
index 94f4ac9..456b810 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
index d65439a..94bc2aa 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index 9c628ce..ab945b1 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
index 137778d..40777f7 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
index 3153d8e..99d38d7 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
index c642127..75d94f0 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
index 689bb5a..74c312c 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
index f51a29a..3f1f4ae 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
index 1c20ed0..9d7c277 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
index 8b095bf..1aacbb5 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
index 795d926..16bf02e 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index f30fe4a..549bcb7 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/base.png and b/sysui/desktop/icons/hicolor/32x32/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index 4e7e423..162f69c 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/calc.png and b/sysui/desktop/icons/hicolor/32x32/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index f34faf5..2e05ffe 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/draw.png and b/sysui/desktop/icons/hicolor/32x32/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index 7b8ec64..a046ed3 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/impress.png and b/sysui/desktop/icons/hicolor/32x32/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
new file mode 100644
index 0000000..dba5f4e
Binary files /dev/null and b/sysui/desktop/icons/hicolor/32x32/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index 6c3c3b6..f392014 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/math.png and b/sysui/desktop/icons/hicolor/32x32/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
index 22bdd4a..dba5f4e 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png and b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 8a59432..1942e73 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/writer.png and b/sysui/desktop/icons/hicolor/32x32/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
index ddfcd7d..549bcb7 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
index e742adc..3bd7387 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
index 8d78d91..2e05ffe 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
index 302c7ab..f392014 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
index fc03240..2cf6741 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
index 03c96f8..ea8579d 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
index 465583b..a046ed3 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
index 383906a..0b2b6c5 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
index 67da85c..162f69c 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
index feb935c..cfd3907 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
index 571e6a0..1942e73 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
index e3bd788..c08fd88 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index d68e712..4851d31 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/base.png and b/sysui/desktop/icons/hicolor/48x48/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index 33690ba..c3deeb0 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/calc.png and b/sysui/desktop/icons/hicolor/48x48/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 2acb572..56a835c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/draw.png and b/sysui/desktop/icons/hicolor/48x48/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index a46324e..09bbb42 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/impress.png and b/sysui/desktop/icons/hicolor/48x48/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
new file mode 100644
index 0000000..7f3c00c
Binary files /dev/null and b/sysui/desktop/icons/hicolor/48x48/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 691ef83..8e2c0a1 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/math.png and b/sysui/desktop/icons/hicolor/48x48/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
index f67dc97..7f3c00c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png and b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 9ae7402..37c931c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/writer.png and b/sysui/desktop/icons/hicolor/48x48/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
index 2c2ffb8..4851d31 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
index 655a938..e4bec3b 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
index c1bbdc4..56a835c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
index fbdede2..8e2c0a1 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
index d06b5ca..01bf4e9 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
index f77c9c6..e072bcd 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
index 7336f35..09bbb42 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
index 850250c..d8ae2c5 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
index 6f6328c..c3deeb0 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
index ac0d373..58aaedd 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
index 8c2b714..37c931c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
index a7cf8d0..2b4f904 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c7ee5d7..c5c80a0 100644
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ
diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico
new file mode 100644
index 0000000..20e665f
Binary files /dev/null and b/sysui/desktop/icons/main.ico differ
diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns
index 2089b9a..4b0cf1b 100644
Binary files a/sysui/desktop/icons/master-document.icns and b/sysui/desktop/icons/master-document.icns differ
diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico
index e2377f4..bb849c6 100755
Binary files a/sysui/desktop/icons/master-document.ico and b/sysui/desktop/icons/master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns
index f64c6d2..9fa0bbf 100644
Binary files a/sysui/desktop/icons/oasis-database.icns and b/sysui/desktop/icons/oasis-database.icns differ
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
index 87c58e6..02cf7a4 100644
Binary files a/sysui/desktop/icons/oasis-database.ico and b/sysui/desktop/icons/oasis-database.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns
index bb357ba..64c373e 100644
Binary files a/sysui/desktop/icons/oasis-drawing-template.icns and b/sysui/desktop/icons/oasis-drawing-template.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
index 4a55c99..af2e9ff 100644
Binary files a/sysui/desktop/icons/oasis-drawing-template.ico and b/sysui/desktop/icons/oasis-drawing-template.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns
index 80adc9f..d179d04 100644
Binary files a/sysui/desktop/icons/oasis-drawing.icns and b/sysui/desktop/icons/oasis-drawing.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
index 47ed3ef..5297dae 100644
Binary files a/sysui/desktop/icons/oasis-drawing.ico and b/sysui/desktop/icons/oasis-drawing.ico differ
diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
index c529703..c5c80a0 100644
Binary files a/sysui/desktop/icons/oasis-empty-document.icns and b/sysui/desktop/icons/oasis-empty-document.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
index 67e3c34..20e665f 100644
Binary files a/sysui/desktop/icons/oasis-empty-document.ico and b/sysui/desktop/icons/oasis-empty-document.ico differ
diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
index ee6d299..c5c80a0 100644
Binary files a/sysui/desktop/icons/oasis-empty-template.icns and b/sysui/desktop/icons/oasis-empty-template.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
index eecd336..20e665f 100644
Binary files a/sysui/desktop/icons/oasis-empty-template.ico and b/sysui/desktop/icons/oasis-empty-template.ico differ
diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns
index a7bded1..f6dc588 100644
Binary files a/sysui/desktop/icons/oasis-formula.icns and b/sysui/desktop/icons/oasis-formula.icns differ
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
index 9e349dc..fb2f651 100644
Binary files a/sysui/desktop/icons/oasis-formula.ico and b/sysui/desktop/icons/oasis-formula.ico differ
diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns
index 1891c12..4b0cf1b 100644
Binary files a/sysui/desktop/icons/oasis-master-document.icns and b/sysui/desktop/icons/oasis-master-document.icns differ
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
index c7113f8..bb849c6 100644
Binary files a/sysui/desktop/icons/oasis-master-document.ico and b/sysui/desktop/icons/oasis-master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns
index 337df2f..324dc7a 100644
Binary files a/sysui/desktop/icons/oasis-presentation-template.icns and b/sysui/desktop/icons/oasis-presentation-template.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
index 0e80d9b..7e99e38 100644
Binary files a/sysui/desktop/icons/oasis-presentation-template.ico and b/sysui/desktop/icons/oasis-presentation-template.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns
index 4b9ba42..c9bc5d0 100644
Binary files a/sysui/desktop/icons/oasis-presentation.icns and b/sysui/desktop/icons/oasis-presentation.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
index 0e80d9b..9e96c3e 100644
Binary files a/sysui/desktop/icons/oasis-presentation.ico and b/sysui/desktop/icons/oasis-presentation.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns
index 2bae7e3..f527a14 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet-template.icns and b/sysui/desktop/icons/oasis-spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
index 2a72a5a..a472371 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet-template.ico and b/sysui/desktop/icons/oasis-spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns
index 69b46c2..9d61c69 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet.icns and b/sysui/desktop/icons/oasis-spreadsheet.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
index 92741f3..a9dd646 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet.ico and b/sysui/desktop/icons/oasis-spreadsheet.ico differ
diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns
index 1986a32..accd48b 100644
Binary files a/sysui/desktop/icons/oasis-text-template.icns and b/sysui/desktop/icons/oasis-text-template.icns differ
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
index f609be1..4d33ca0 100644
Binary files a/sysui/desktop/icons/oasis-text-template.ico and b/sysui/desktop/icons/oasis-text-template.ico differ
diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns
index 21a44a9..9b7a301 100644
Binary files a/sysui/desktop/icons/oasis-text.icns and b/sysui/desktop/icons/oasis-text.icns differ
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
index 1ed299a..cb08cc5 100644
Binary files a/sysui/desktop/icons/oasis-text.ico and b/sysui/desktop/icons/oasis-text.ico differ
diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns
index 66b0db7..7352237 100644
Binary files a/sysui/desktop/icons/oasis-web-template.icns and b/sysui/desktop/icons/oasis-web-template.icns differ
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
index eecd336..70c5d61 100644
Binary files a/sysui/desktop/icons/oasis-web-template.ico and b/sysui/desktop/icons/oasis-web-template.ico differ
diff --git a/sysui/desktop/icons/ooo3_base_app.icns b/sysui/desktop/icons/ooo3_base_app.icns
new file mode 100644
index 0000000..9fa0bbf
Binary files /dev/null and b/sysui/desktop/icons/ooo3_base_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
index c728e83..02cf7a4 100644
Binary files a/sysui/desktop/icons/ooo3_base_app.ico and b/sysui/desktop/icons/ooo3_base_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.icns b/sysui/desktop/icons/ooo3_calc_app.icns
new file mode 100644
index 0000000..9d61c69
Binary files /dev/null and b/sysui/desktop/icons/ooo3_calc_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
index f46433e..a9dd646 100644
Binary files a/sysui/desktop/icons/ooo3_calc_app.ico and b/sysui/desktop/icons/ooo3_calc_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.icns b/sysui/desktop/icons/ooo3_draw_app.icns
new file mode 100644
index 0000000..d179d04
Binary files /dev/null and b/sysui/desktop/icons/ooo3_draw_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
index 74abe03..5297dae 100644
Binary files a/sysui/desktop/icons/ooo3_draw_app.ico and b/sysui/desktop/icons/ooo3_draw_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.icns b/sysui/desktop/icons/ooo3_impress_app.icns
new file mode 100644
index 0000000..c9bc5d0
Binary files /dev/null and b/sysui/desktop/icons/ooo3_impress_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
index 1eed9c1..9e96c3e 100644
Binary files a/sysui/desktop/icons/ooo3_impress_app.ico and b/sysui/desktop/icons/ooo3_impress_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_main_app.icns b/sysui/desktop/icons/ooo3_main_app.icns
new file mode 100644
index 0000000..c5c80a0
Binary files /dev/null and b/sysui/desktop/icons/ooo3_main_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
index f858d92..20e665f 100644
Binary files a/sysui/desktop/icons/ooo3_main_app.ico and b/sysui/desktop/icons/ooo3_main_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_math_app.icns b/sysui/desktop/icons/ooo3_math_app.icns
new file mode 100644
index 0000000..f6dc588
Binary files /dev/null and b/sysui/desktop/icons/ooo3_math_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
index a712362..fb2f651 100644
Binary files a/sysui/desktop/icons/ooo3_math_app.ico and b/sysui/desktop/icons/ooo3_math_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_open.icns b/sysui/desktop/icons/ooo3_open.icns
new file mode 100644
index 0000000..c5c80a0
Binary files /dev/null and b/sysui/desktop/icons/ooo3_open.icns differ
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
index 78987ae..20e665f 100644
Binary files a/sysui/desktop/icons/ooo3_open.ico and b/sysui/desktop/icons/ooo3_open.ico differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.icns b/sysui/desktop/icons/ooo3_writer_app.icns
new file mode 100644
index 0000000..9b7a301
Binary files /dev/null and b/sysui/desktop/icons/ooo3_writer_app.icns differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
index 3e7efa6..cb08cc5 100644
Binary files a/sysui/desktop/icons/ooo3_writer_app.ico and b/sysui/desktop/icons/ooo3_writer_app.ico differ
diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns
index 5cdf700..324dc7a 100644
Binary files a/sysui/desktop/icons/presentation-template.icns and b/sysui/desktop/icons/presentation-template.icns differ
diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico
index 173db79..7e99e38 100755
Binary files a/sysui/desktop/icons/presentation-template.ico and b/sysui/desktop/icons/presentation-template.ico differ
diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns
index 3f6e268..c9bc5d0 100644
Binary files a/sysui/desktop/icons/presentation.icns and b/sysui/desktop/icons/presentation.icns differ
diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico
index 173db79..9e96c3e 100755
Binary files a/sysui/desktop/icons/presentation.ico and b/sysui/desktop/icons/presentation.ico differ
diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns
index 058a147..f527a14 100644
Binary files a/sysui/desktop/icons/spreadsheet-template.icns and b/sysui/desktop/icons/spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico
index bce2ae3..a472371 100755
Binary files a/sysui/desktop/icons/spreadsheet-template.ico and b/sysui/desktop/icons/spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns
index 8594b9b..9d61c69 100644
Binary files a/sysui/desktop/icons/spreadsheet.icns and b/sysui/desktop/icons/spreadsheet.icns differ
diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico
index bce2ae3..a9dd646 100755
Binary files a/sysui/desktop/icons/spreadsheet.ico and b/sysui/desktop/icons/spreadsheet.ico differ
diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns
index 0f7c006..accd48b 100644
Binary files a/sysui/desktop/icons/text-template.icns and b/sysui/desktop/icons/text-template.icns differ
diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico
index 745a58b..4d33ca0 100755
Binary files a/sysui/desktop/icons/text-template.ico and b/sysui/desktop/icons/text-template.ico differ
diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns
index 169ef09..9b7a301 100644
Binary files a/sysui/desktop/icons/text.icns and b/sysui/desktop/icons/text.icns differ
diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico
index 745a58b..cb08cc5 100755
Binary files a/sysui/desktop/icons/text.ico and b/sysui/desktop/icons/text.ico differ
commit b65fa5f769aea6673ea41fdc329df2fd00fb06e8
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Feb 4 10:42:47 2011 +0100
fdo#32872: Implementation names weren't matching with xcu.
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 199626d..61c0583 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -520,7 +520,7 @@ FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMult
OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkAlignmentController" ));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController" ));
}
// --------------------------------------------------------------------
@@ -758,7 +758,7 @@ FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Referenc
OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkCharacterSpacingController" ));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ));
}
// --------------------------------------------------------------------
commit a0f63a4c3a5430b6b81318f2dc380ca8975d4d65
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 18 12:11:52 2011 +0000
don't pushback and process a corrupt extension
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 603f524..b084d87 100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1620,7 +1620,8 @@ BackendImpl::PackageImpl::getPackagesFromDb(
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
OSL_ASSERT(xExtension.is());
- retVector.push_back(xExtension);
+ if (xExtension.is())
+ retVector.push_back(xExtension);
}
return retVector;
commit 76681cbb779c60cdfc2a4df3a6dd0ff2f874f6cb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 12:14:17 2011 +0000
Related: rhbz#610103 more woes on rpm upgrade vs rpm erase
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 7791ad7..cfa1711 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -370,13 +370,25 @@ extern "C" {
* upgraded, then the old quickstarter is still running, but is now unreliable
* as the old install has been deleted. A fairly intractable problem but we
* can avoid much of the pain if we turn off the quickstarter if we detect
- * that it has been physically deleted.
+ * that it has been physically deleted or overwritten
*/
static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
{
- if (event_type == G_FILE_MONITOR_EVENT_DELETED)
- exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+ //Shutdown the quick starter if anything has happened to make it unsafe
+ //to remain running, e.g. rpm --erased and all libs deleted, or
+ //rpm --upgrade and libs being overwritten
+ switch (event_type)
+ {
+ case G_FILE_MONITOR_EVENT_DELETED:
+ case G_FILE_MONITOR_EVENT_CREATED:
+ case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+ case G_FILE_MONITOR_EVENT_UNMOUNTED:
+ exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+ break;
+ default:
+ break;
+ }
}
#endif
commit 44eaa36c4ce25a7c861455e9dbe6c2c959adecb4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 1 22:39:43 2011 +0100
wikihelp: Do not check for existence of the localized help.
In case we do not have the help installed, it is up to the online service to
decide the fallback in case a language version is not available.
Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 53c15ce..586515c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -113,7 +113,10 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
#define STARTERLIST 0
-rtl::OUString HelpLocaleString()
+static bool impl_hasHelpInstalled();
+
+/// Return the locale we prefer for displaying help
+static rtl::OUString HelpLocaleString()
{
static rtl::OUString aLocaleStr;
if (!aLocaleStr.getLength())
@@ -124,7 +127,7 @@ rtl::OUString HelpLocaleString()
::utl::ConfigManager::LOCALE );
aLocale >>= aLocaleStr;
bool bOk = aLocaleStr.getLength() != 0;
- if ( bOk )
+ if ( impl_hasHelpInstalled() && bOk )
{
rtl::OUString aBaseInstallPath;
// utl::Bootstrap::PathStatus aBaseLocateResult =
commit 7922cf1235dac54df4c15533aaa01973e27c0652
Author: Andras Timar <timar at fsf.hu>
Date: Tue Feb 1 18:42:50 2011 +0100
s/su urpmi/sudo urpmi/ in Mandriva section of README
diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index 9e6dff9..a760bff 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -147,13 +147,13 @@
<p id="rpminstall3" xml:lang="en-US">This directory contains a subdirectory called "RPMS". Change directory to the "RPMS" directory.</p>
<p id="rpminstall4" xml:lang="en-US">Right-click within the directory and choose "Open in Terminal". A terminal window will open. From the command line of the terminal window, enter the following command (you will be prompted to enter your root user's password before the command will execute):</p>
<p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p>
- <p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: su urpmi *.rpm</p>
+ <p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p>
<p id="rpminstall7" xml:lang="en-US">For other RPM-based systems (Suse, etc.): rpm -Uvh *.rpm</p>
<p id="rpminstall8" xml:lang="en-US">The above command does the first part of the installation process. To complete the process, you also need to install the desktop integration packages. To do this, change directory to the "desktop-integration" directory that is within the "RPMS" directory, using the following command:</p>
<p id="rpminstall9" xml:lang="en-US">cd desktop-integration</p>
<p id="rpminstallA" xml:lang="en-US">Now run the installation command again:</p>
<p id="rpminstallB" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *redhat*.rpm'</p>
- <p id="rpminstallC" xml:lang="en-US">For Mandriva-based systems: su urpmi *mandriva*.rpm</p>
+ <p id="rpminstallC" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *mandriva*.rpm</p>
<p id="rpminstallD" xml:lang="en-US">For other RPM-based systems (Suse, etc.): rpm -Uvh *suse*.rpm</p>
<p id="rpminstallE" xml:lang="en-US">The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu.</p>
<h3 id="sdfsdfgf42t2" xml:lang="en-US">Notes Concerning Desktop Integration for Linux Distributions Not Covered in the Above Installation Instructions</h3>
@@ -167,7 +167,7 @@
<p id="linuxlangpack5" xml:lang="en-US">From the Nautilus file manager, right-click in the directory and choose the command "Open in terminal". In the terminal window you just opened, execute the command to install the language pack (with all of the commands below, you may be prompted to enter your root user's password):</p>
<p id="linuxlangpack6" xml:lang="en-US">For Debian/Ubuntu-based systems: sudo dpkg -i *.deb</p>
<p id="linuxlangpack7" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p>
- <p id="linuxlangpack8" xml:lang="en-US">For Mandriva-based systems: su urpmi *.rpm</p>
+ <p id="linuxlangpack8" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p>
<p id="linuxlangpack9" xml:lang="en-US">For other RPM-using systems (Suse, etc.): rpm -Uvh *.rpm</p>
<p id="linuxlangpackA" xml:lang="en-US">Now start one of the ${PRODUCTNAME} applications - Writer, for instance. Go to the Tools menu and choose Options. In the Options dialog box, click on "Language Settings" and then click on "Languages". Dropdown the "User interface" list and select the language you just installed. If you want, do the same thing for the "Locale setting", the "Default currency", and the "Default languages for documents".</p>
<p id="linuxlangpackB" xml:lang="en-US">After adjusting those settings, click on OK. The dialog box will close, and you will see an information message telling you that your changes will only be activated after you exit ${PRODUCTNAME} and start it again (remember to also exit the QuickStarter if it is started).</p>
commit 4972faf4bb4cbb15d4ff0408f38ff020a26a4c42
Author: Andras Timar <timar at fsf.hu>
Date: Tue Jan 18 23:05:50 2011 +0100
readme formatting - fdo#32741
* using CRLF instead of LF on WIN platform
* word wrap at column 75 for better readability
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 0efd971..29b51d5 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -79,6 +79,12 @@ $(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
--stringparam os1 $(OS) --stringparam gui1 $(GUI) --stringparam com1 $(COM) \
--stringparam cp1 $(CPUNAME) --stringparam type text --stringparam lang1 $(@:b:s/readme_//:s/README_//) \
$< $(MERGEDXRM)
+ fold -s -w 75 < $@ > $@.new
+ mv $@.new $@
+
+.IF "$(GUI)"=="WNT"
+ $(PERL) -pi -e 's/\n/\r\n/' $@
+.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
chmod g+w $(MISC)$/$(GUI)
commit d06c295137b3d787d2d930dc10ef98f984ced72a
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Jan 21 20:49:43 2011 +0100
fix KDE3 library search order (fdo#32797)
Use LINKFLAGS instead of STDLIBS, as the latter comes way too late
in the link command and may result in some stray -L/usr/lib getting
before -L$KDEDIR/lib. Since KDE4 libs often tend to be installed
under /usr while KDE3 libs are often somewhere else such as /opt/kde3/lib,
this could cause using wrong libraries.
(cherry picked from commit b13f9e3374f8f605e6bf6f7be8819142060c37e9)
Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index dcb16d9..b6a8a7c 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -61,10 +61,8 @@ SLOFILES =\
APP1TARGET=$(TARGET)
APP1OBJS=$(SLOFILES)
APP1RPATH=BRAND
-APP1STDLIBS=\
- $(SALLIB) \
- $(KDE_LIBS) -lkio -lX11
-
+APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
+APP1STDLIBS=$(SALLIB)
.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
commit 9e6b1553e04ed17d9f1481364c672f609a9b12e3
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Jan 22 17:21:18 2011 +0100
Start using technical.dic instead of oracle.dic (fdo#31798)
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 8762f83..3d4bb0b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -252,7 +252,7 @@
<desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
<label>Custom dictionaries</label>
</info>
- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;oracle.dic</value>
+ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;technical.dic</value>
</prop>
<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
<!-- OldLocation: NEW -->
commit cb7d7138b943042f11eec3211d7a913c9b85908c
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Tue Jan 18 10:43:05 2011 +0100
calc65: #i116371# fix backgrounds for polypolygons in metafile
Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 718a871..cfd0f47 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1380,6 +1380,7 @@ namespace drawinglayer
{
// need to handle PolyPolygonHatchPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END
const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate);
+ const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon());
// #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points
@@ -1387,8 +1388,20 @@ namespace drawinglayer
while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon))
;
+ if(rFillHatchAttribute.isFillBackground())
+ {
+ // with fixing #i111954# (see below) the possible background
+ // fill of a hatched object was lost.Generate a background fill
+ // primitive and render it
+ const primitive2d::Primitive2DReference xBackground(
+ new primitive2d::PolyPolygonColorPrimitive2D(
+ aLocalPolyPolygon,
+ rHatchCandidate.getBackgroundColor()));
+
+ process(primitive2d::Primitive2DSequence(&xBackground, 1));
+ }
+
SvtGraphicFill* pSvtGraphicFill = 0;
- const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
aLocalPolyPolygon.transform(maCurrentTransformation);
if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count())
commit 36a8e6738169e678d7539aba6d8dde962dae9d78
Author: Andras Timar <timar at fsf.hu>
Date: Sun Jan 16 21:08:02 2011 +0100
Sun Microsystems -> The Document Foundation in desktop file fdo#31191
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 8d33014..390dd93 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -9,4 +9,4 @@ MimeType=application/vnd.openofficeorg.extension;
Name=%PRODUCTNAME
Name[pt_BR]=%PRODUCTNAME_BR
GenericName=Office
-Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems.
+Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation.
commit 2c2774f3a20f35f9f5320efa9e7d1f37bb860266
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jan 13 21:13:19 2011 +0100
unopkg crasher on SLED11-SP1 (bnc#655912)
activateExtension call broke memory if dp_misc::getIdentifier and xNewExtension
were called inline; the problem was visible only with gcc-4.3.4 and did not
appear with older or newer gcc versions
valgrind got happy and unopkg stopped crashing after the values were passed via
the extra variables
it looks like a miscompilation; IMHO, it does not make sense to report it
because it does not happen with last gcc version
this code is not critical for the performance, so the workaround with
extra variables is fine; they might even be optimized out by the compiler
Signed off by Michael, Noel, Tor
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index c6529ec..11b38cd 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -740,9 +740,13 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
if (repository.equals(OUSTR("user")))
bUserDisabled2 = false;
+ // pass the two values via variables to workaround gcc-4.3.4 specific bug (bnc#655912)
+ OUString sNewExtensionIdentifier = dp_misc::getIdentifier(xNewExtension);
+ OUString sNewExtensionFileName = xNewExtension->getName();
+
activateExtension(
- dp_misc::getIdentifier(xNewExtension),
- xNewExtension->getName(), bUserDisabled2, false, xAbortChannel,
+ sNewExtensionIdentifier, sNewExtensionFileName,
+ bUserDisabled2, false, xAbortChannel,
Reference<ucb::XCommandEnvironment>());
}
else
commit 8539854f9af2c423d69ab9a89c79d3dbb8c6abd3
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Jan 14 13:59:23 2011 +0000
fix FMR crasher bug#33099
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index fac8b15..3f85e03 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -826,6 +826,8 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
for( sal_uInt32 i = 0; i < id.size(); ++i )
{
+ DBData aDBData;
+
listId[i] = id[i];
listAnchor[i] = anchor[i];
@@ -837,7 +839,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
DBHelp* pDBHelp = pDb->getDBHelp();
if( pDBHelp != NULL )
{
- DBData aDBData;
bool bSuccess = pDBHelp->getValueForKey( idi, aDBData );
if( bSuccess )
{
commit 4f81b94b7cee00c88e31612dc26800199c570ba6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jan 14 12:23:56 2011 +0200
Be slightly more paranoid defensive
(cherry picked from commit f8bfab1f464d0f26accb6d28b31b4749306bbfda)
Signed-off-by: Thorsten Behrens <thb at documentfoundation.org>
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 1746696..69d09a4 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -271,7 +271,7 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection,
DWORD nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName );
- while ( nRet && ( nRet + 2 == rSize ) ) // buffer was too small, retry until big enough
+ while ( nRet && ( nRet + 2 >= rSize ) ) // buffer was too small, retry until big enough
{
if (rSize > 1000000)
break;
@@ -291,7 +291,7 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection,
Log( sBuf );
return false;
}
- else if ( nRet + 2 == rSize )
+ else if ( nRet + 2 >= rSize )
{
SetError( ERROR_OUTOFMEMORY );
Log( TEXT( "ERROR: GetPrivateProfileSection() out of memory\r\n" ) );
commit c13ec5fbad1bbdc5a40a70b3d0b4ca86c01708fb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jan 13 23:49:18 2011 +0200
Fix buffer size problem that broke MSI installer localization
(cherry picked from commit 5b7719a49fd57a9f446201fabc02bf1787dbbeee)
Signed-off-by: Thorsten Behrens <thb at documentfoundation.org>
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 8bebaa2..1746696 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -265,22 +265,21 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection,
{
if ( !rSize || !*pRetBuf )
{
- rSize = 512;
+ rSize = 10000;
*pRetBuf = new TCHAR[ rSize ];
}
DWORD nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName );
- if ( nRet && ( nRet + 2 > rSize ) ) // buffer was too small, retry with bigger one
+ while ( nRet && ( nRet + 2 == rSize ) ) // buffer was too small, retry until big enough
{
- if ( nRet < 32767 - 2 )
- {
- delete [] (*pRetBuf);
- rSize = nRet + 2;
- *pRetBuf = new TCHAR[ rSize ];
+ if (rSize > 1000000)
+ break;
+ delete [] (*pRetBuf);
+ rSize = rSize * 2;
+ *pRetBuf = new TCHAR[ rSize ];
- nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName );
- }
+ nRet = GetPrivateProfileSection( pSection, *pRetBuf, rSize, pFileName );
}
if ( !nRet )
@@ -292,7 +291,7 @@ boolean SetupAppX::GetProfileSection( LPCTSTR pFileName, LPCTSTR pSection,
Log( sBuf );
return false;
}
- else if ( nRet + 2 > rSize )
+ else if ( nRet + 2 == rSize )
{
SetError( ERROR_OUTOFMEMORY );
Log( TEXT( "ERROR: GetPrivateProfileSection() out of memory\r\n" ) );
commit accd51f069a80bfe944d1c83f0d4320a223b5113
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 23:05:57 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit d1c7535dbe2839c9435ec9bd944ca353aa40dc6b
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 22:39:08 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit fe9114f836076dbbda2143d57af5dc585677292e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 11 09:06:36 2011 +0000
Resolves: fdo#32953 add preferred Malayalam fonts
(cherry picked from commit 2f70074be979ca4a58e653a561a45d8d75b52f19)
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index bef4fae..0967543 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -956,22 +956,22 @@
</node>
<node oor:name="ml-IN" oor:op="replace">
<prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
</prop>
<prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
- <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+ <value>AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
</prop>
</node>
<node oor:name="mr-IN" oor:op="replace">
commit 8317a0b3e54cfe4517b2774a39ab856d8beff26d
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 19:47:10 2011 +0100
Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)
commit 6be22fb369059e694361b3e33f396f2f677d6d76
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Jan 8 20:12:41 2011 +0100
Really set BrOffice in the linux desktop files
* dekstop files need "pt_BR" instead of "pt-BR" (undescore vs. dash)
* "%PRODUCTNAME_BR" was wrongly substitured to
"${PRODUCTNAME} ${PRODUCTVERSION}_BR"; it should be
"${PRODUCTNAME_BR} ${PRODUCTVERSION}"
Signed off by Michael Meeks
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index a195c89..3cb84f8 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplicat
Exec=${UNIXBASISROOTNAME} -base %U
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base
-Name[pt-BR]=%PRODUCTNAME_BR Base
+Name[pt_BR]=%PRODUCTNAME_BR Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
InitialPreference=5
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 522c179..d885589 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Sprea
Exec=${UNIXBASISROOTNAME} -calc %U
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
Name=%PRODUCTNAME Calc
-Name[pt-BR]=%PRODUCTNAME_BR Calc
+Name[pt_BR]=%PRODUCTNAME_BR Calc
GenericName=Spreadsheet
Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
InitialPreference=5
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 3ea1741..21c31b8 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawi
Exec=${UNIXBASISROOTNAME} -draw %U
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
Name=%PRODUCTNAME Draw
-Name[pt-BR]=%PRODUCTNAME_BR Draw
+Name[pt_BR]=%PRODUCTNAME_BR Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index dc08e25..33a7d90 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Prese
Exec=${UNIXBASISROOTNAME} -impress %U
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
-Name[pt-BR]=%PRODUCTNAME_BR Impress
+Name[pt_BR]=%PRODUCTNAME_BR Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
InitialPreference=5
diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop
index f7f1f4f..44370f3 100644
--- a/sysui/desktop/menus/javafilter.desktop
+++ b/sysui/desktop/menus/javafilter.desktop
@@ -5,6 +5,6 @@ Type=Application
Exec=openoffice -writer %U
MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
Name=%PRODUCTNAME Small Device Format Importer
-Name[pt-BR]=%PRODUCTNAME_BR Small Device Format Importer
+Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer
GenericName=Small Device Format Importer
NoDisplay=true
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index c10e548..cd0717a 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other
Exec=${UNIXBASISROOTNAME} -math %U
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
Name=%PRODUCTNAME Math
-Name[pt-BR]=%PRODUCTNAME_BR Math
+Name[pt_BR]=%PRODUCTNAME_BR Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop
index c845dd9..3da4d82 100644
--- a/sysui/desktop/menus/printeradmin.desktop
+++ b/sysui/desktop/menus/printeradmin.desktop
@@ -6,5 +6,5 @@ Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
Exec=${UNIXBASISROOTNAME}-printeradmin
Name=%PRODUCTNAME Printer Administration
-Name[pt-BR]=%PRODUCTNAME_BR Printer Administration
+Name[pt_BR]=%PRODUCTNAME_BR Printer Administration
diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
index c6f63d3..1250fed 100644
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
@@ -6,5 +6,5 @@ Categories=Office;
Exec=${UNIXBASISROOTNAME} -quickstart -nologo -nodefault
NoDisplay=true
Name=%PRODUCTNAME Quickstarter
-Name[pt-BR]=%PRODUCTNAME_BR Quickstarter
+Name[pt_BR]=%PRODUCTNAME_BR Quickstarter
Comment=Hook for quickstarter startup
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 2a03e56..8d33014 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -7,6 +7,6 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other
Exec=${UNIXBASISROOTNAME} %U
MimeType=application/vnd.openofficeorg.extension;
Name=%PRODUCTNAME
-Name[pt-BR]=%PRODUCTNAME_BR
+Name[pt_BR]=%PRODUCTNAME_BR
GenericName=Office
Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 75d26a7..95fe8db 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -7,7 +7,7 @@ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordp
Exec=${UNIXBASISROOTNAME} -writer %U
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
-Name[pt-BR]=%PRODUCTNAME_BR Writer
+Name[pt_BR]=%PRODUCTNAME_BR Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
InitialPreference=5
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 65ab6e2..b928ccd 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -39,6 +39,7 @@ $destdir = pop @ARGV;
mkdir $destdir,0777;
$productname = "LibreOffice";
+$productname_br = "BrOffice";
$productfilename = "libreoffice";
$prefix = "";
$iconprefix = "";
@@ -50,6 +51,10 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
+ if (/^-b/) {
+ $productname_br = $ARGV[0];
+ shift;
+ }
if (/^-u/) {
$productfilename = $ARGV[0];
shift;
@@ -116,6 +121,9 @@ while (<>) {
}
}
+ # replace %PRODUCTNAME_BR placeholders
+ s/%PRODUCTNAME_BR/$productname_br/g;
+
# replace %PRODUCTNAME placeholders
s/%PRODUCTNAME/$productname/g;
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 5b672aa..898d7b0 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list