summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx8
-rw-r--r--desktop/zipintro/makefile.mk20
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx15
-rw-r--r--officecfg/registry/data/org/openoffice/VCL.xcu52
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs2
-rw-r--r--readlicense_oo/odt/CREDITS.odtbin24738 -> 43415 bytes
-rw-r--r--readlicense_oo/odt/LICENSE.odtbin167118 -> 154001 bytes
-rw-r--r--sfx2/source/appl/app.hrc10
-rw-r--r--sfx2/source/appl/app.src54
-rw-r--r--sfx2/source/appl/appserv.cxx124
-rw-r--r--sfx2/source/appl/newhelp.cxx10
-rw-r--r--sfx2/source/appl/newhelp.hxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx36
-rw-r--r--sysui/desktop/icons/database.icnsbin48416 -> 45789 bytes
-rwxr-xr-xsysui/desktop/icons/database.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/drawing-template.icnsbin10935 -> 46225 bytes
-rwxr-xr-xsysui/desktop/icons/drawing-template.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/drawing.icnsbin11290 -> 43334 bytes
-rwxr-xr-xsysui/desktop/icons/drawing.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/empty-document.icnsbin50465 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/empty-document.icobin25214 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/empty-template.icnsbin47059 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/empty-template.icobin25214 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/formula.icnsbin10380 -> 43893 bytes
-rwxr-xr-xsysui/desktop/icons/formula.icobin10638 -> 26918 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/base.pngbin16745 -> 8446 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/apps/calc.pngbin12968 -> 7002 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/draw.pngbin16732 -> 8228 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/impress.pngbin14614 -> 6617 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/main.pngbin12442 -> 2271 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/math.pngbin12934 -> 7538 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/apps/startcenter.pngbin11073 -> 2271 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/writer.pngbin11861 -> 6723 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.pngbin15854 -> 8446 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.pngbin16120 -> 12658 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.pngbin16063 -> 8228 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.pngbin12936 -> 7538 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.pngbin11992 -> 4218 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.pngbin13955 -> 11408 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.pngbin13654 -> 6617 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.pngbin12792 -> 11620 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.pngbin12338 -> 7002 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.pngbin12100 -> 11171 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.pngbin11770 -> 6723 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.pngbin17754 -> 7817 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/base.pngbin3618 -> 632 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/calc.pngbin3629 -> 539 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/draw.pngbin3606 -> 653 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/impress.pngbin3608 -> 577 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/main.pngbin0 -> 434 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/math.pngbin3607 -> 395 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/startcenter.pngbin1043 -> 434 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/writer.pngbin3586 -> 532 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.pngbin1009 -> 632 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.pngbin1094 -> 707 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.pngbin1082 -> 653 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.pngbin1014 -> 395 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.pngbin929 -> 487 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.pngbin1025 -> 626 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.pngbin960 -> 577 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.pngbin1018 -> 567 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.pngbin961 -> 539 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.pngbin986 -> 562 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.pngbin923 -> 532 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.pngbin1023 -> 593 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/base.pngbin3153 -> 1329 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/calc.pngbin2731 -> 1015 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/draw.pngbin3147 -> 1271 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/impress.pngbin2903 -> 1042 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/main.pngbin0 -> 698 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/math.pngbin2715 -> 1128 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/startcenter.pngbin2375 -> 698 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/writer.pngbin2485 -> 987 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.pngbin2922 -> 1329 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.pngbin2957 -> 1352 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.pngbin2828 -> 1271 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.pngbin2622 -> 1128 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.pngbin2338 -> 867 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.pngbin2812 -> 1390 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.pngbin2623 -> 1042 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.pngbin2856 -> 1281 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.pngbin2618 -> 1015 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.pngbin2575 -> 1328 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.pngbin2311 -> 987 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.pngbin2908 -> 1127 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/base.pngbin5196 -> 2135 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/calc.pngbin4319 -> 1465 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/draw.pngbin5207 -> 1690 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/impress.pngbin4974 -> 1560 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/main.pngbin0 -> 990 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/math.pngbin4489 -> 1588 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/startcenter.pngbin3615 -> 990 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/writer.pngbin3938 -> 1332 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.pngbin5032 -> 2135 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.pngbin4919 -> 2087 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.pngbin4935 -> 1690 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.pngbin4422 -> 1588 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.pngbin3808 -> 1399 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.pngbin4650 -> 1979 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.pngbin4611 -> 1560 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.pngbin4409 -> 1644 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.pngbin4211 -> 1465 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.pngbin4023 -> 1653 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.pngbin3785 -> 1332 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.pngbin4854 -> 1577 bytes
-rw-r--r--sysui/desktop/icons/main.icnsbin45712 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/main.icobin0 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/master-document.icnsbin11003 -> 40262 bytes
-rwxr-xr-xsysui/desktop/icons/master-document.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-database.icnsbin53983 -> 45789 bytes
-rw-r--r--sysui/desktop/icons/oasis-database.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing-template.icnsbin53400 -> 46225 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing.icnsbin52603 -> 43334 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-document.icnsbin40589 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-document.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-template.icnsbin42146 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-formula.icnsbin50335 -> 43893 bytes
-rw-r--r--sysui/desktop/icons/oasis-formula.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-master-document.icnsbin48904 -> 40262 bytes
-rw-r--r--sysui/desktop/icons/oasis-master-document.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation-template.icnsbin51890 -> 44901 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation.icnsbin51073 -> 41919 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet-template.icnsbin51919 -> 46239 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet.icnsbin50953 -> 43146 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-text-template.icnsbin49196 -> 43403 bytes
-rw-r--r--sysui/desktop/icons/oasis-text-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-text.icnsbin47545 -> 40399 bytes
-rw-r--r--sysui/desktop/icons/oasis-text.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/oasis-web-template.icnsbin55853 -> 42359 bytes
-rw-r--r--sysui/desktop/icons/oasis-web-template.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_base_app.icnsbin0 -> 45789 bytes
-rw-r--r--sysui/desktop/icons/ooo3_base_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_calc_app.icnsbin0 -> 43146 bytes
-rw-r--r--sysui/desktop/icons/ooo3_calc_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_draw_app.icnsbin0 -> 43334 bytes
-rw-r--r--sysui/desktop/icons/ooo3_draw_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_impress_app.icnsbin0 -> 41919 bytes
-rw-r--r--sysui/desktop/icons/ooo3_impress_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_main_app.icnsbin0 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/ooo3_main_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_math_app.icnsbin0 -> 43893 bytes
-rw-r--r--sysui/desktop/icons/ooo3_math_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_open.icnsbin0 -> 35005 bytes
-rw-r--r--sysui/desktop/icons/ooo3_open.icobin25214 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/ooo3_writer_app.icnsbin0 -> 40399 bytes
-rw-r--r--sysui/desktop/icons/ooo3_writer_app.icobin295606 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/presentation-template.icnsbin10690 -> 44901 bytes
-rwxr-xr-xsysui/desktop/icons/presentation-template.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/presentation.icnsbin10947 -> 41919 bytes
-rwxr-xr-xsysui/desktop/icons/presentation.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet-template.icnsbin10085 -> 46239 bytes
-rwxr-xr-xsysui/desktop/icons/spreadsheet-template.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet.icnsbin10457 -> 43146 bytes
-rwxr-xr-xsysui/desktop/icons/spreadsheet.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/text-template.icnsbin10095 -> 43403 bytes
-rwxr-xr-xsysui/desktop/icons/text-template.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/icons/text.icnsbin10401 -> 40399 bytes
-rwxr-xr-xsysui/desktop/icons/text.icobin10638 -> 26918 bytes
-rw-r--r--sysui/desktop/menus/base.desktop1
-rw-r--r--sysui/desktop/menus/calc.desktop1
-rw-r--r--sysui/desktop/menus/draw.desktop1
-rw-r--r--sysui/desktop/menus/impress.desktop1
-rw-r--r--sysui/desktop/menus/javafilter.desktop1
-rw-r--r--sysui/desktop/menus/math.desktop1
-rw-r--r--sysui/desktop/menus/printeradmin.desktop2
-rw-r--r--sysui/desktop/menus/qstart.desktop1
-rw-r--r--sysui/desktop/menus/startcenter.desktop1
-rw-r--r--sysui/desktop/menus/writer.desktop1
-rw-r--r--sysui/desktop/share/brand.pl8
-rw-r--r--sysui/desktop/share/makefile.mk8
-rw-r--r--sysui/desktop/share/translate.pl6
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx2
179 files changed, 265 insertions, 104 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index fac52892f450..1b84fea78f77 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -729,9 +729,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
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index d15f2deafe45..cdc547fcc5c7 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -33,11 +33,11 @@ TARGET=zipintro
.INCLUDE : settings.mk
ZIP1LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
+ $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/about.png
ZIP2LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
+ $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png
ZIP3LIST= \
$(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
$(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
@@ -90,3 +90,15 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
$(MISC)$/%.png : $(SOLARSRC)$/%.png
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
+
+.IF "$(INTRO_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/intro.png : $(INTRO_BITMAP)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+.ENDIF
+
+.IF "$(ABOUT_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/about.png : $(ABOUT_BITMAP)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+.ENDIF
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 36c06cfc8b18..e3eae5a9995a 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())
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 2992adba05d3..c0cf57397902 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -515,31 +515,31 @@
</node>
<node oor:name="ja" oor:op="replace">
<prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
- <value>HG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;MS P明朝;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;UmePlus P Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi Mincho;さざなみ明朝;Mincho;Serif</value>
+ <value>HG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;MS P明朝;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;UmePlus P Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;Takao P明朝;東風明朝;Kochi Mincho;さざなみ明朝;Mincho;Serif</value>
</prop>
<prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
- <value>HG 明朝L Sun;HG 明朝L;HG Mincho Light J;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Gothic;MS 明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS P明朝;HG Mincho Light J;MS ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS Pゴシック;UmePlus P Gothic;Andale Sans UI</value>
+ <value>HG 明朝L Sun;HG 明朝L;HG Mincho Light J;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;Gothic;MS 明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS P明朝;HG Mincho Light J;MS ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS Pゴシック;UmePlus P Gothic;Andale Sans UI</value>
</prop>
<prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
- <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;MS Pゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;MS ゴシック;MS Pゴシック;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic;Andale Sans UI</value>
+ <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;MS Pゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;MS ゴシック;MS Pゴシック;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic;Andale Sans UI</value>
</prop>
<prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
<value>Andale;Arial</value>
</prop>
<prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
- <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value>
+ <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value>
</prop>
<prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
- <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;Andale Sans UI;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value>
+ <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;Andale Sans UI;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value>
</prop>
<prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
- <value>HG ゴシックB Sun;HG-GothicB Sun;HG Mincho Light J;MS Pゴシック;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
+ <value>HG ゴシックB Sun;HG-GothicB Sun;HG Mincho Light J;MS Pゴシック;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
</prop>
<prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
- <value>HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
+ <value>HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;MS Pゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
</prop>
<prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
- <value>HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;Andale Sans UI;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;Gothic;Gnu-Unifont</value>
+ <value>HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;Andale Sans UI;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;Gothic;Gnu-Unifont</value>
</prop>
<prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
<value>hgmincholightj;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced</value>
@@ -3245,7 +3245,7 @@
</node>
<node oor:name="gothic" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hggothicbsun;msgothic;mspgothic;hiraginominchopronw3;hiraginominchoprow3;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hggothicbsun;msgothic;mspgothic;hiraginominchopronw3;hiraginominchoprow3;hggothic;hggothicb;hggothice;ipagothic;takaogothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3262,7 +3262,7 @@
</node>
<node oor:name="gothicb" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;takaogothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3279,7 +3279,7 @@
</node>
<node oor:name="gothicl" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothic;hggothicb;hggothice;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>msgothic;mspgothic;hggothic;hggothicb;hggothice;ipapgothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3635,7 +3635,7 @@
</node>
<node oor:name="hgpmincholsun" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>mspmincho;ipapmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
+ <value>mspmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
</node>
@@ -3658,7 +3658,7 @@
</node>
<node oor:name="hggothicb" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;takaogothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3675,7 +3675,7 @@
</node>
<node oor:name="hggothice" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothic;hggothicb;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>msgothic;mspgothic;hggothic;hggothicb;ipagothic;ipapgothic;takaogothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -3698,7 +3698,7 @@
</node>
<node oor:name="hgminchoj" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholightj;msmincho;mspmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hgmincholightj;msmincho;mspmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3715,7 +3715,7 @@
</node>
<node oor:name="hgminchol" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hgminchoj;ipamincho;ipapmincho;sazanamimincho;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hgminchoj;ipamincho;ipapmincho;takaomincho;takaopmincho;sazanamimincho;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -3738,7 +3738,7 @@
</node>
<node oor:name="hgmincholightj" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;msmincho;mspmincho;ipapmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;msmincho;mspmincho;ipapmincho;takaopmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5181,7 +5181,7 @@
</node>
<node oor:name="mincho" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hiraginominchopronw3;hiraginominchoprow3;ipamincho;ipapmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hiraginominchopronw3;hiraginominchoprow3;ipamincho;ipapmincho;takaomincho;takaopmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5215,7 +5215,7 @@
</node>
<node oor:name="minchol" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;takaomincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5232,7 +5232,7 @@
</node>
<node oor:name="minchou" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;ipamicho;ipapmincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;hgmincholightj;msmincho;ipamicho;ipapmincho;takaomicho;takaopminchosazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -5541,7 +5541,7 @@
</node>
<node oor:name="msgothic" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hggothicbsun;mspgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipagothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
+ <value>hggothicbsun;mspgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipagothic;takaogothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -5564,7 +5564,7 @@
</node>
<node oor:name="mspgothic" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgpgothicbsun;mspgothic;msgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hgpgothicbsun;mspgothic;msgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipapgothic;takaogothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="FontWeight"> <value>Normal</value> </prop>
<prop oor:name="FontWidth"> <value>Normal</value> </prop>
@@ -5572,7 +5572,7 @@
</node>
<node oor:name="msmincho" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;ipamincho;hiraginominchopronw3;hiraginominchoprow3;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgmincholsun;hgmincholightj;ipamincho;takaomincho;hiraginominchopronw3;hiraginominchoprow3;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -5618,7 +5618,7 @@
</node>
<node oor:name="mspmincho" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgpmincholsun;hgmincholightj;msmincho;hiraginominchopronw3;hiraginominchoprow3;ipapmincho;sazanamimincho;hgminchoj;hgminchol;kochimincho;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgpmincholsun;hgmincholightj;msmincho;hiraginominchopronw3;hiraginominchoprow3;ipapmincho;takaopmincho;sazanamimincho;hgminchoj;hgminchol;kochimincho;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS">
<value></value>
@@ -6205,7 +6205,7 @@
</node>
<node oor:name="pgothic" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;takaopgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
@@ -6268,7 +6268,7 @@
</node>
<node oor:name="pmincho" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
</prop>
<prop oor:name="SubstFontsMS"><value>mspmincho</value></prop>
<prop oor:name="SubstFontsPS"><value></value></prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index aa758a161252..42d0f5428d64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -221,7 +221,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 -->
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt
index 673bf9f3aa56..b9246dc6936d 100644
--- a/readlicense_oo/odt/CREDITS.odt
+++ b/readlicense_oo/odt/CREDITS.odt
Binary files differ
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index 67acbd1d1521..13f3649d593d 100644
--- a/readlicense_oo/odt/LICENSE.odt
+++ b/readlicense_oo/odt/LICENSE.odt
Binary files differ
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 92304bf3d22f..4750c21e7a7c 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -240,6 +240,16 @@
#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202)
#define RID_SVXSTR_GRFILTER_TOOBIG (RID_SFX_APP_START + 203)
+// For the License Information dialog box
+#define DLG_HELP_LICENSING (RID_SFX_APP_START + 204)
+#define STR_LICENSING_INFORMATION_1 (RID_SFX_APP_START + 205)
+#define STR_LICENSING_INFORMATION_2 (RID_SFX_APP_START + 206)
+#define STR_LICENSING_INFORMATION_3 (RID_SFX_APP_START + 207)
+#define STR_LICENSING_INFORMATION_4 (RID_SFX_APP_START + 208)
+#define STR_LICENSING_INFORMATION_5 (RID_SFX_APP_START + 209)
+#define PB_LICENSING_SHOW (RID_SFX_APP_START + 210)
+#define PB_LICENSING_CLOSE (RID_SFX_APP_START + 211)
+
#define MD_DDE_LINKEDIT (RID_SFX_APP_START + 1)
#endif // #ifndef _SFX_APP_HRC
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 9dfa4b884aaf..df82a9fe94a3 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -1092,3 +1092,57 @@ String RID_SVXSTR_GRFILTER_TOOBIG
Text [ en-US ] = "Not enough memory to insert graphic" ;
};
+ModalDialog DLG_HELP_LICENSING
+{
+ // Size is computed
+ Text [ en-US ] = "Licensing and Legal information";
+ MOVEABLE = TRUE ;
+ CLOSEABLE = TRUE ;
+ OUTPUTSIZE = TRUE ;
+ SVLOOK = TRUE ;
+ String STR_LICENSING_INFORMATION_1
+ {
+ Text [ en-US ] =
+ "%PRODUCTNAME is made available subject to the terms of GNU Lesser General Public\n"
+ "License Version 3. A copy of the LGPL license can be found at\n"
+ "http://www.gnu.org/licenses/lgpl-3.0.html" ;
+ };
+ String STR_LICENSING_INFORMATION_2
+ {
+ Text [ en-US ] =
+ "Third Party Code Additional copyright notices and license terms applicable to\n"
+ "portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html\n"
+ "file; choose Show License to see exact details in English." ;
+ };
+ String STR_LICENSING_INFORMATION_3
+ {
+ Text [ en-US ] =
+ "All trademarks and registered trademarks mentioned herein are the property of\n"
+ "their respective owners." ;
+ };
+ String STR_LICENSING_INFORMATION_4
+ {
+ Text [ en-US ] =
+ "Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights\n"
+ "reserved." ;
+ };
+ String STR_LICENSING_INFORMATION_5
+ {
+ Text [ en-US ] =
+ "This product was created by %OOOVENDOR, based on OpenOffice.org,\n"
+ "which is Copyright 2000, 2010 Oracle and/or its affiliates.\n"
+ "%OOOVENDOR acknowledges all community members, please see\n"
+ "http://www.libreoffice.org/ for more details." ;
+ };
+ OKButton PB_LICENSING_SHOW
+ {
+ // Position and size is computed
+ Text [ en-US ] = "~Show License" ;
+ DefButton = TRUE ;
+ };
+ CancelButton PB_LICENSING_CLOSE
+ {
+ // Position and size is computed
+ Text [ en-US ] = "~Close" ;
+ };
+};
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 4e7ad0cd4bf7..3c6973d8af85 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -157,20 +157,42 @@ long QuitAgain_Impl( void* pObj, void* pArg )
return 0;
}
-namespace {
- sal_Bool checkURL( const char *pName, rtl::OUString &rURL )
- {
- using namespace osl;
- DirectoryItem aDirItem;
-
- rURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/") );
- rURL += rtl::OUString::createFromAscii( pName );
- rtl::Bootstrap::expandMacros( rURL );
+/// Find the correct location of the document (LICENSE.odt, etc.), and return
+/// it in rURL if found.
+static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL )
+{
+ using namespace osl;
+ DirectoryItem aDirItem;
+
+ rURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/") );
+ rURL += rtl::OUString::createFromAscii( pName );
+ rURL += rtl::OUString::createFromAscii( pExt );
+ rtl::Bootstrap::expandMacros( rURL );
+
+ if (rURL.getLength() != 0)
+ return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
+ else
+ return sal_False;
+}
- if (rURL.getLength() != 0)
- return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
- else
- return sal_False;
+/// Displays CREDITS or LICENSE in any of the available version
+static void showDocument( const char* pBaseName )
+{
+ try {
+ Reference < XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
+ Sequence < com::sun::star::beans::PropertyValue > args(2);
+ args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ViewOnly"));
+ args[0].Value <<= sal_True;
+ args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ args[1].Value <<= sal_True;
+
+ rtl::OUString aURL;
+ if ( checkURL ( pBaseName, ".odt", aURL ) ||
+ checkURL ( pBaseName, ".html", aURL ) ||
+ checkURL ( pBaseName, "", aURL ) ) {
+ xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
+ }
+ } catch (const ::com::sun::star::uno::Exception &) {
}
}
@@ -354,43 +376,51 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
- case SID_SHOW_CREDITS:
case SID_SHOW_LICENSE:
{
- try {
- Reference < XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
- Sequence < com::sun::star::beans::PropertyValue > args(2);
- args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ViewOnly"));
- args[0].Value <<= sal_True;
- args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
- args[1].Value <<= sal_True;
-
- rtl::OUString aURL;
- char const** pNames;
- if( rReq.GetSlot() == SID_SHOW_LICENSE )
- {
- static char const* pLicenseStrings[] =
- {
- "LICENSE.odt", "LICENSE.html", "LICENSE"
- };
- pNames = pLicenseStrings;
- }
- else
- {
- static char const* pCreditsStrings[] =
- {
- "CREDITS.odt", "CREDITS.html", "CREDITS"
- };
- pNames = pCreditsStrings;
- }
-
- if ( checkURL ( pNames[0], aURL ) ||
- checkURL ( pNames[1], aURL ) ||
- checkURL ( pNames[2], aURL ) ) {
- xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
- }
- } catch (const ::com::sun::star::uno::Exception &) {
+ ModalDialog aDialog( NULL, SfxResId( DLG_HELP_LICENSING ) );
+
+ String aLicensing;
+ for ( int i = STR_LICENSING_INFORMATION_1; i <= STR_LICENSING_INFORMATION_5; ++i )
+ {
+ if ( i != STR_LICENSING_INFORMATION_1 )
+ aLicensing += String( RTL_CONSTASCII_USTRINGPARAM( "\n\n" ) );
+ aLicensing += String( SfxResId( i ) );
}
+
+ FixedText aText( &aDialog );
+ aText.SetText( aLicensing );
+ OKButton aShow( &aDialog, SfxResId( PB_LICENSING_SHOW ) );
+ CancelButton aClose( &aDialog, SfxResId( PB_LICENSING_CLOSE ) );
+
+ // positions and sizes are computed to always fit the language
+ Size aTextSize( aText.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+ Size aShowSize( aShow.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+ Size aCloseSize( aClose.GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+
+ long nDelimX = 12;
+ long nDelimY = 12;
+ long nWidth = aTextSize.Width() + 2*nDelimX;
+ long nButtonY = aTextSize.Height() + 2*nDelimY;
+ Size aButtonSize( std::max( aShowSize.Width(), aCloseSize.Width() ) + nDelimX,
+ std::max( aShowSize.Height(), aCloseSize.Height() ) );
+
+ aDialog.SetSizePixel( Size( nWidth, aTextSize.Height() + 3*nDelimY + aButtonSize.Height() ) );
+ aText.SetPosSizePixel( Point( nDelimX, nDelimY ), aTextSize );
+ aShow.SetPosSizePixel( Point( ( nWidth - nDelimX ) / 2 - aButtonSize.Width(), nButtonY ), aButtonSize );
+ aClose.SetPosSizePixel( Point( aShow.GetPosPixel().X() + aButtonSize.Width() + nDelimX, nButtonY ), aButtonSize );
+
+ aText.Show();
+
+ if ( aDialog.Execute() == RET_OK )
+ showDocument( "LICENSE" );
+
+ break;
+ }
+
+ case SID_SHOW_CREDITS:
+ {
+ showDocument( "CREDITS" );
break;
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 66871240d742..bc88a149b83f 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
@@ -645,7 +643,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 > () );
@@ -1090,7 +1088,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 );
@@ -1515,7 +1513,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);
@@ -1634,7 +1632,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 19e53df75256..7c9bd4c90c46 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 cecb88465b85..d0281c8b3ba6 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -113,18 +113,24 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
#define STARTERLIST 0
-rtl::OUString HelpLocaleString()
+static bool impl_hasHelpInstalled( const rtl::OUString &rLang );
+
+/// Return the locale we prefer for displaying help
+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 ( bOk )
+ if ( !bOk )
+ aLocaleStr = aEnglish;
+ else
{
rtl::OUString aBaseInstallPath;
// utl::Bootstrap::PathStatus aBaseLocateResult =
@@ -151,15 +157,19 @@ 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 )
@@ -335,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"
@@ -618,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 )
{
@@ -659,11 +669,11 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM
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 )
{
@@ -725,10 +735,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 );
diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
index 115dc859cdcd..9fa0bbf3ed67 100644
--- a/sysui/desktop/icons/database.icns
+++ b/sysui/desktop/icons/database.icns
Binary files differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index e2377f4422b4..02cf7a484023 100755
--- a/sysui/desktop/icons/database.ico
+++ b/sysui/desktop/icons/database.ico
Binary files differ
diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns
index 359164f314ac..64c373ecaa33 100644
--- a/sysui/desktop/icons/drawing-template.icns
+++ b/sysui/desktop/icons/drawing-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico
index 2d3a08807509..af2e9ffd93d9 100755
--- a/sysui/desktop/icons/drawing-template.ico
+++ b/sysui/desktop/icons/drawing-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns
index 81777c7f92b6..d179d041a6ca 100644
--- a/sysui/desktop/icons/drawing.icns
+++ b/sysui/desktop/icons/drawing.icns
Binary files differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 2d3a08807509..5297daeee5b6 100755
--- a/sysui/desktop/icons/drawing.ico
+++ b/sysui/desktop/icons/drawing.ico
Binary files differ
diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns
index 18d1133eb66b..c5c80a01e799 100644
--- a/sysui/desktop/icons/empty-document.icns
+++ b/sysui/desktop/icons/empty-document.icns
Binary files differ
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
index bd3aa12af516..20e665faa5e8 100644
--- a/sysui/desktop/icons/empty-document.ico
+++ b/sysui/desktop/icons/empty-document.ico
Binary files differ
diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns
index 034d30bccb32..c5c80a01e799 100644
--- a/sysui/desktop/icons/empty-template.icns
+++ b/sysui/desktop/icons/empty-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
index b68f0f15f5bd..20e665faa5e8 100644
--- a/sysui/desktop/icons/empty-template.ico
+++ b/sysui/desktop/icons/empty-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns
index 61cd00a0e001..f6dc588095f4 100644
--- a/sysui/desktop/icons/formula.icns
+++ b/sysui/desktop/icons/formula.icns
Binary files differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index 6360ec449502..fb2f6515bdb2 100755
--- a/sysui/desktop/icons/formula.ico
+++ b/sysui/desktop/icons/formula.ico
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png
index 42b027626c3a..d2c94583e667 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/base.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/base.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 368fb03e2d9c..9614ca81d6af 100644
--- a/sysui/desktop/icons/hicolor/128x128/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
index 72b67c831218..b1405c52888a 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
index 32ad785e16ce..1d0fdc08af2f 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index fd68a10960a6..59efe6991dfb 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/main.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png
index 79e71ce22321..9a17a15f855c 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/math.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/math.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
index b009ee2b9277..59efe6991dfb 100644
--- a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
index 0d057fa4baff..3fa71f4dc140 100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
index 1429d82ce829..d2c94583e667 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
Binary files 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 4fdde3c34c3f..1925cee34f4f 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
index 7272482a04b3..b1405c52888a 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
index 9e4c72eab7af..9a17a15f855c 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
Binary files 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 6f191e2cf0d4..aa94c4b1b3cd 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
Binary files 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 bf8229c1f55c..eff3f17b6b18 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
index 2b3a5bb90065..1d0fdc08af2f 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
Binary files 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 18c00ad4bb82..e396624efe52 100644
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
index ca480522d847..9614ca81d6af 100644
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
Binary files 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 ef5b5dd7a5f4..0daebdf256ce 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
index 178d4e26d967..3fa71f4dc140 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
Binary files 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 7edd66d369d0..09ccf5f74569 100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 3a08ee118221..3465f32dde01 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/base.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/base.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 2dc540711b3c..3f1f4ae93cc5 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index afc037060da2..94bc2aa8564b 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index f1957da748a3..75d94f0030ab 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
Binary files 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 000000000000..2459b2a5d6dc
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index de1488226a19..ab945b1ecf88 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/math.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/math.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
index c81fc95d4770..2459b2a5d6dc 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 8304269862ac..1aacbb52b5c0 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
index 2f2d56dd0daa..3465f32dde01 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
Binary files 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 94f4ac9ec58e..456b8108b6e3 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
index d65439afbc6c..94bc2aa8564b 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index 9c628ce789f9..ab945b1ecf88 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
Binary files 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 137778d11fa2..40777f7276dc 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
Binary files 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 3153d8e3c705..99d38d75afbb 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
index c642127abc1e..75d94f0030ab 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
Binary files 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 689bb5aef425..74c312c2724d 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
index f51a29a85492..3f1f4ae93cc5 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
Binary files 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 1c20ed072ba8..9d7c277546fd 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
index 8b095bfcbafb..1aacbb52b5c0 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
Binary files 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 795d92615e4f..16bf02e1b5b2 100644
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index f30fe4a53c54..549bcb7eea5c 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/base.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/base.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index 4e7e423d713e..162f69c44766 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index f34faf5b51fa..2e05ffe8e571 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index 7b8ec6432fc7..a046ed3fda9d 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
Binary files 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 000000000000..dba5f4e030a7
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index 6c3c3b68f05d..f392014275ee 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/math.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/math.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
index 22bdd4a7fef9..dba5f4e030a7 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 8a5943255821..1942e73d021f 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
index ddfcd7d19588..549bcb7eea5c 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
Binary files 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 e742adc40258..3bd738714aee 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
index 8d78d91c1866..2e05ffe8e571 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
index 302c7ab633f4..f392014275ee 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
Binary files 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 fc032402b756..2cf6741bbfe3 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
Binary files 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 03c96f8dd867..ea8579d40519 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
index 465583b9b06b..a046ed3fda9d 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
Binary files 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 383906a70a2e..0b2b6c537952 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
index 67da85c10bf1..162f69c44766 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
Binary files 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 feb935cc1df4..cfd3907193ee 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
index 571e6a0e4a48..1942e73d021f 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
Binary files 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 e3bd788ea1dc..c08fd88c0447 100644
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index d68e712812d1..4851d31c5542 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/base.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/base.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index 33690ba3c21c..c3deeb0737a4 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 2acb57226dc0..56a835cf9cf1 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index a46324e006bb..09bbb42baec0 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
Binary files 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 000000000000..7f3c00c4a307
--- /dev/null
+++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 691ef832b1a0..8e2c0a1c1b5d 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/math.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/math.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
index f67dc976750b..7f3c00c4a307 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 9ae740237401..37c931ce31b5 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
index 2c2ffb86e6c5..4851d31c5542 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
Binary files 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 655a938f826c..e4bec3bff9fd 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
index c1bbdc4de6bb..56a835cf9cf1 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
index fbdede243a6f..8e2c0a1c1b5d 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
Binary files 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 d06b5ca8b11f..01bf4e91aa80 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
Binary files 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 f77c9c6e9ad9..e072bcd8fbaa 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
index 7336f3530367..09bbb42baec0 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
Binary files 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 850250c71a45..d8ae2c5b020f 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
index 6f6328cece2c..c3deeb0737a4 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
Binary files 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 ac0d373a0362..58aaedd73611 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
Binary files differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
index 8c2b714b292b..37c931ce31b5 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
Binary files 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 a7cf8d0f7d14..2b4f9043cb68 100644
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
Binary files differ
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c7ee5d7552aa..c5c80a01e799 100644
--- a/sysui/desktop/icons/main.icns
+++ b/sysui/desktop/icons/main.icns
Binary files differ
diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico
new file mode 100644
index 000000000000..20e665faa5e8
--- /dev/null
+++ b/sysui/desktop/icons/main.ico
Binary files differ
diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns
index 2089b9a660ef..4b0cf1bb7ea6 100644
--- a/sysui/desktop/icons/master-document.icns
+++ b/sysui/desktop/icons/master-document.icns
Binary files differ
diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico
index e2377f4422b4..bb849c6e011e 100755
--- a/sysui/desktop/icons/master-document.ico
+++ b/sysui/desktop/icons/master-document.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns
index f64c6d2570ae..9fa0bbf3ed67 100644
--- a/sysui/desktop/icons/oasis-database.icns
+++ b/sysui/desktop/icons/oasis-database.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
index 87c58e600eb5..02cf7a484023 100644
--- a/sysui/desktop/icons/oasis-database.ico
+++ b/sysui/desktop/icons/oasis-database.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns
index bb357bae58a1..64c373ecaa33 100644
--- a/sysui/desktop/icons/oasis-drawing-template.icns
+++ b/sysui/desktop/icons/oasis-drawing-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
index 4a55c995be55..af2e9ffd93d9 100644
--- a/sysui/desktop/icons/oasis-drawing-template.ico
+++ b/sysui/desktop/icons/oasis-drawing-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns
index 80adc9feaaf5..d179d041a6ca 100644
--- a/sysui/desktop/icons/oasis-drawing.icns
+++ b/sysui/desktop/icons/oasis-drawing.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
index 47ed3efbc406..5297daeee5b6 100644
--- a/sysui/desktop/icons/oasis-drawing.ico
+++ b/sysui/desktop/icons/oasis-drawing.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
index c52970324b27..c5c80a01e799 100644
--- a/sysui/desktop/icons/oasis-empty-document.icns
+++ b/sysui/desktop/icons/oasis-empty-document.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
index 67e3c345e69d..20e665faa5e8 100644
--- a/sysui/desktop/icons/oasis-empty-document.ico
+++ b/sysui/desktop/icons/oasis-empty-document.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
index ee6d299991d7..c5c80a01e799 100644
--- a/sysui/desktop/icons/oasis-empty-template.icns
+++ b/sysui/desktop/icons/oasis-empty-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
index eecd336bc4b1..20e665faa5e8 100644
--- a/sysui/desktop/icons/oasis-empty-template.ico
+++ b/sysui/desktop/icons/oasis-empty-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns
index a7bded196c99..f6dc588095f4 100644
--- a/sysui/desktop/icons/oasis-formula.icns
+++ b/sysui/desktop/icons/oasis-formula.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
index 9e349dcfcbfd..fb2f6515bdb2 100644
--- a/sysui/desktop/icons/oasis-formula.ico
+++ b/sysui/desktop/icons/oasis-formula.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns
index 1891c129ad47..4b0cf1bb7ea6 100644
--- a/sysui/desktop/icons/oasis-master-document.icns
+++ b/sysui/desktop/icons/oasis-master-document.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
index c7113f89e089..bb849c6e011e 100644
--- a/sysui/desktop/icons/oasis-master-document.ico
+++ b/sysui/desktop/icons/oasis-master-document.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns
index 337df2fa7b25..324dc7aae336 100644
--- a/sysui/desktop/icons/oasis-presentation-template.icns
+++ b/sysui/desktop/icons/oasis-presentation-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
index 0e80d9b01d46..7e99e381a3ff 100644
--- a/sysui/desktop/icons/oasis-presentation-template.ico
+++ b/sysui/desktop/icons/oasis-presentation-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns
index 4b9ba4231f24..c9bc5d020470 100644
--- a/sysui/desktop/icons/oasis-presentation.icns
+++ b/sysui/desktop/icons/oasis-presentation.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
index 0e80d9b01d46..9e96c3e57653 100644
--- a/sysui/desktop/icons/oasis-presentation.ico
+++ b/sysui/desktop/icons/oasis-presentation.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns
index 2bae7e38a860..f527a14b7969 100644
--- a/sysui/desktop/icons/oasis-spreadsheet-template.icns
+++ b/sysui/desktop/icons/oasis-spreadsheet-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
index 2a72a5ad4d80..a4723714d65f 100644
--- a/sysui/desktop/icons/oasis-spreadsheet-template.ico
+++ b/sysui/desktop/icons/oasis-spreadsheet-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns
index 69b46c2a1d86..9d61c699c47b 100644
--- a/sysui/desktop/icons/oasis-spreadsheet.icns
+++ b/sysui/desktop/icons/oasis-spreadsheet.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
index 92741f3c6e84..a9dd6462e742 100644
--- a/sysui/desktop/icons/oasis-spreadsheet.ico
+++ b/sysui/desktop/icons/oasis-spreadsheet.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns
index 1986a329cbf8..accd48b9bdd2 100644
--- a/sysui/desktop/icons/oasis-text-template.icns
+++ b/sysui/desktop/icons/oasis-text-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
index f609be128aaf..4d33ca0d5a38 100644
--- a/sysui/desktop/icons/oasis-text-template.ico
+++ b/sysui/desktop/icons/oasis-text-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns
index 21a44a91d6b7..9b7a301ee02b 100644
--- a/sysui/desktop/icons/oasis-text.icns
+++ b/sysui/desktop/icons/oasis-text.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
index 1ed299a865f9..cb08cc50e27e 100644
--- a/sysui/desktop/icons/oasis-text.ico
+++ b/sysui/desktop/icons/oasis-text.ico
Binary files differ
diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns
index 66b0db74ad0a..735223732855 100644
--- a/sysui/desktop/icons/oasis-web-template.icns
+++ b/sysui/desktop/icons/oasis-web-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
index eecd336bc4b1..70c5d61ce49c 100644
--- a/sysui/desktop/icons/oasis-web-template.ico
+++ b/sysui/desktop/icons/oasis-web-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_base_app.icns b/sysui/desktop/icons/ooo3_base_app.icns
new file mode 100644
index 000000000000..9fa0bbf3ed67
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_base_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
index c728e830273d..02cf7a484023 100644
--- a/sysui/desktop/icons/ooo3_base_app.ico
+++ b/sysui/desktop/icons/ooo3_base_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.icns b/sysui/desktop/icons/ooo3_calc_app.icns
new file mode 100644
index 000000000000..9d61c699c47b
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_calc_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
index f46433ec0864..a9dd6462e742 100644
--- a/sysui/desktop/icons/ooo3_calc_app.ico
+++ b/sysui/desktop/icons/ooo3_calc_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.icns b/sysui/desktop/icons/ooo3_draw_app.icns
new file mode 100644
index 000000000000..d179d041a6ca
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_draw_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
index 74abe03ace38..5297daeee5b6 100644
--- a/sysui/desktop/icons/ooo3_draw_app.ico
+++ b/sysui/desktop/icons/ooo3_draw_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.icns b/sysui/desktop/icons/ooo3_impress_app.icns
new file mode 100644
index 000000000000..c9bc5d020470
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_impress_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
index 1eed9c1f1753..9e96c3e57653 100644
--- a/sysui/desktop/icons/ooo3_impress_app.ico
+++ b/sysui/desktop/icons/ooo3_impress_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_main_app.icns b/sysui/desktop/icons/ooo3_main_app.icns
new file mode 100644
index 000000000000..c5c80a01e799
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_main_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
index f858d92bdd6f..20e665faa5e8 100644
--- a/sysui/desktop/icons/ooo3_main_app.ico
+++ b/sysui/desktop/icons/ooo3_main_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_math_app.icns b/sysui/desktop/icons/ooo3_math_app.icns
new file mode 100644
index 000000000000..f6dc588095f4
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_math_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
index a7123627957a..fb2f6515bdb2 100644
--- a/sysui/desktop/icons/ooo3_math_app.ico
+++ b/sysui/desktop/icons/ooo3_math_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_open.icns b/sysui/desktop/icons/ooo3_open.icns
new file mode 100644
index 000000000000..c5c80a01e799
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_open.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
index 78987aec3422..20e665faa5e8 100644
--- a/sysui/desktop/icons/ooo3_open.ico
+++ b/sysui/desktop/icons/ooo3_open.ico
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.icns b/sysui/desktop/icons/ooo3_writer_app.icns
new file mode 100644
index 000000000000..9b7a301ee02b
--- /dev/null
+++ b/sysui/desktop/icons/ooo3_writer_app.icns
Binary files differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
index 3e7efa610be3..cb08cc50e27e 100644
--- a/sysui/desktop/icons/ooo3_writer_app.ico
+++ b/sysui/desktop/icons/ooo3_writer_app.ico
Binary files differ
diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns
index 5cdf700d9744..324dc7aae336 100644
--- a/sysui/desktop/icons/presentation-template.icns
+++ b/sysui/desktop/icons/presentation-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico
index 173db796ccce..7e99e381a3ff 100755
--- a/sysui/desktop/icons/presentation-template.ico
+++ b/sysui/desktop/icons/presentation-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns
index 3f6e268c681b..c9bc5d020470 100644
--- a/sysui/desktop/icons/presentation.icns
+++ b/sysui/desktop/icons/presentation.icns
Binary files differ
diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico
index 173db796ccce..9e96c3e57653 100755
--- a/sysui/desktop/icons/presentation.ico
+++ b/sysui/desktop/icons/presentation.ico
Binary files differ
diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns
index 058a147b5011..f527a14b7969 100644
--- a/sysui/desktop/icons/spreadsheet-template.icns
+++ b/sysui/desktop/icons/spreadsheet-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico
index bce2ae3628cb..a4723714d65f 100755
--- a/sysui/desktop/icons/spreadsheet-template.ico
+++ b/sysui/desktop/icons/spreadsheet-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns
index 8594b9ba862e..9d61c699c47b 100644
--- a/sysui/desktop/icons/spreadsheet.icns
+++ b/sysui/desktop/icons/spreadsheet.icns
Binary files differ
diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico
index bce2ae3628cb..a9dd6462e742 100755
--- a/sysui/desktop/icons/spreadsheet.ico
+++ b/sysui/desktop/icons/spreadsheet.ico
Binary files differ
diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns
index 0f7c006b42f4..accd48b9bdd2 100644
--- a/sysui/desktop/icons/text-template.icns
+++ b/sysui/desktop/icons/text-template.icns
Binary files differ
diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico
index 745a58b5189f..4d33ca0d5a38 100755
--- a/sysui/desktop/icons/text-template.ico
+++ b/sysui/desktop/icons/text-template.ico
Binary files differ
diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns
index 169ef0961d98..9b7a301ee02b 100644
--- a/sysui/desktop/icons/text.icns
+++ b/sysui/desktop/icons/text.icns
Binary files differ
diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico
index 745a58b5189f..cb08cc50e27e 100755
--- a/sysui/desktop/icons/text.ico
+++ b/sysui/desktop/icons/text.ico
Binary files differ
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index dbbff82a9144..40f7e79ebc8c 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -7,6 +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
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 3b3bcce4e502..3ae2bcb0b121 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -7,6 +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
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 3fde5d00afe9..f609d35f6965 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -7,6 +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
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 3f6ce2fc84b1..814ee1d1fd49 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -7,6 +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
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 61e4ea7e3340..8b9c30a2f70f 100644
--- a/sysui/desktop/menus/javafilter.desktop
+++ b/sysui/desktop/menus/javafilter.desktop
@@ -5,5 +5,6 @@ Type=Application
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 --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 7b2e9807cb04..55fcc29f312d 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -7,6 +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
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 17b5831d5c33..3da4d82a33b1 100644
--- a/sysui/desktop/menus/printeradmin.desktop
+++ b/sysui/desktop/menus/printeradmin.desktop
@@ -6,3 +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
+
diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
index fc39c227ade7..52ac185b9d3f 100644
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
@@ -6,4 +6,5 @@ Categories=Office;
Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault
NoDisplay=true
Name=%PRODUCTNAME 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 0c6d0a1eb8cd..390dd93f3a0a 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -7,5 +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
GenericName=Office
Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 8f7bf2b16443..59b4f5778e8b 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -7,6 +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
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 279302ab5f08..ec71b9f90995 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 5b672aa7b2fc..898d7b029f01 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)
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
.ENDIF
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 197c333e6f37..cdc636b7a266 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -37,6 +37,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
my ($prefix, $ext, $key);
$productname = "LibreOffice";
+$productname_br = "BrOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
@@ -46,6 +47,10 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
+ if (/^-b/) {
+ $productname_br = $ARGV[0];
+ shift;
+ }
if (/^-d/) {
$workdir = $ARGV[0];
shift;
@@ -122,6 +127,7 @@ KEY: while (<TEMPLATE>) {
$value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
# replace resource placeholder
+ $value=~s/%PRODUCTNAME_BR/$productname_br/g;
$value=~s/%PRODUCTNAME/$productname/g;
$locale=~s/-/_/;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 2ca87546fed6..886c1e42d2c9 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -833,6 +833,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];