[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - configure.in default_images/minimizer default_images/presenter default_images/res extensions.lst officecfg/registry postprocess/packcomponents postprocess/packregistry postprocess/prj scp2/source sdext/prj sdext/source sd/inc sd/sdi sd/source sd/uiconfig set_soenv.in vcl/aqua
Ariel Constenla-Haile
arielch at apache.org
Tue Mar 26 17:53:42 PDT 2013
configure.in | 35
default_images/minimizer/opt_16.png |binary
default_images/minimizer/opt_16_h.png |binary
default_images/minimizer/opt_26.png |binary
default_images/minimizer/opt_26_h.png |binary
dev/null |binary
extensions.lst | 12
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 170 -
officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu | 1220 ----------
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/makefile.mk | 11
officecfg/registry/data/org/openoffice/makefile.mk | 7
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 127 -
officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs | 470 ---
officecfg/registry/schema/org/openoffice/Office/makefile.mk | 25
postprocess/packcomponents/makefile.mk | 4
postprocess/packregistry/makefile.mk | 4
postprocess/prj/build.lst | 2
scp2/source/ooo/file_library_ooo.scp | 26
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/module_lang_template.scp | 3
sd/inc/app.hrc | 1
sd/sdi/drviewsh.sdi | 5
sd/sdi/sdraw.sdi | 25
sd/source/ui/presenter/PresenterHelper.cxx | 18
sd/source/ui/view/drviewse.cxx | 30
sd/uiconfig/simpress/menubar/menubar.xml | 1
sdext/prj/build.lst | 8
sdext/prj/d.lst | 33
sdext/source/minimizer/PresentationMinimizer.component | 30
sdext/source/minimizer/configurationaccess.cxx | 198 -
sdext/source/minimizer/configurationaccess.hxx | 18
sdext/source/minimizer/delzip | 1
sdext/source/minimizer/description.xml | 58
sdext/source/minimizer/fileopendialog.cxx | 62
sdext/source/minimizer/fileopendialog.hxx | 6
sdext/source/minimizer/graphiccollector.cxx | 61
sdext/source/minimizer/graphiccollector.hxx | 6
sdext/source/minimizer/help/component.txt | 2
sdext/source/minimizer/help/help_de.odt |binary
sdext/source/minimizer/help/help_en-US.odt |binary
sdext/source/minimizer/helpid.hrc | 57
sdext/source/minimizer/impoptimizer.cxx | 93
sdext/source/minimizer/impoptimizer.hxx | 9
sdext/source/minimizer/informationdialog.cxx | 215 -
sdext/source/minimizer/informationdialog.hxx | 75
sdext/source/minimizer/makefile.mk | 158 -
sdext/source/minimizer/manifest.xml | 36
sdext/source/minimizer/minimizer.hrc | 95
sdext/source/minimizer/minimizer.pmk | 24
sdext/source/minimizer/minimizer.src | 379 ---
sdext/source/minimizer/optimizationstats.cxx | 3
sdext/source/minimizer/optimizerdialog.cxx | 430 +--
sdext/source/minimizer/optimizerdialog.hxx | 244 +-
sdext/source/minimizer/optimizerdialogcontrols.cxx | 289 --
sdext/source/minimizer/pagecollector.cxx | 3
sdext/source/minimizer/pppoptimizer.cxx | 16
sdext/source/minimizer/pppoptimizer.hxx | 4
sdext/source/minimizer/pppoptimizerdialog.cxx | 194 -
sdext/source/minimizer/pppoptimizerdialog.hxx | 49
sdext/source/minimizer/pppoptimizertoken.cxx | 13
sdext/source/minimizer/pppoptimizertoken.hxx | 13
sdext/source/minimizer/pppoptimizeruno.cxx | 116
sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu | 86
sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu | 31
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu | 404 +++
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk | 46
sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk | 44
sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs | 346 ++
sdext/source/minimizer/unodialog.cxx | 117
sdext/source/minimizer/unodialog.hxx | 44
sdext/source/presenter/Jobs.xcu | 41
sdext/source/presenter/PresenterAccessibility.cxx | 6
sdext/source/presenter/PresenterBitmapContainer.cxx | 21
sdext/source/presenter/PresenterBitmapContainer.hxx | 5
sdext/source/presenter/PresenterClock.cxx | 19
sdext/source/presenter/PresenterComponent.cxx | 146 +
sdext/source/presenter/PresenterComponent.hxx | 51
sdext/source/presenter/PresenterConfigurationAccess.cxx | 2
sdext/source/presenter/PresenterHelpView.cxx | 2
sdext/source/presenter/PresenterScreen.component | 30
sdext/source/presenter/PresenterScreen.cxx | 4
sdext/source/presenter/PresenterScreen.hrc | 113
sdext/source/presenter/PresenterScreen.src | 113
sdext/source/presenter/PresenterScrollBar.cxx | 4
sdext/source/presenter/PresenterSlideSorter.cxx | 6
sdext/source/presenter/PresenterTheme.cxx | 45
sdext/source/presenter/PresenterToolBar.cxx | 8
sdext/source/presenter/PresenterWindowManager.cxx | 4
sdext/source/presenter/ProtocolHandler.xcu | 31
sdext/source/presenter/bitmaps/Background.png |binary
sdext/source/presenter/bitmaps/BorderActiveBottom.png |binary
sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png |binary
sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png |binary
sdext/source/presenter/bitmaps/BorderActiveBottomRight.png |binary
sdext/source/presenter/bitmaps/BorderActiveLeft.png |binary
sdext/source/presenter/bitmaps/BorderActiveRight.png |binary
sdext/source/presenter/bitmaps/BorderActiveTop.png |binary
sdext/source/presenter/bitmaps/BorderActiveTopLeft.png |binary
sdext/source/presenter/bitmaps/BorderActiveTopRight.png |binary
sdext/source/presenter/bitmaps/BorderBottom.png |binary
sdext/source/presenter/bitmaps/BorderBottomLeft.png |binary
sdext/source/presenter/bitmaps/BorderBottomRight.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png |binary
sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png |binary
sdext/source/presenter/bitmaps/BorderLeft.png |binary
sdext/source/presenter/bitmaps/BorderRight.png |binary
sdext/source/presenter/bitmaps/BorderToolbarBottom.png |binary
sdext/source/presenter/bitmaps/BorderToolbarLeft.png |binary
sdext/source/presenter/bitmaps/BorderToolbarRight.png |binary
sdext/source/presenter/bitmaps/BorderToolbarTop.png |binary
sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png |binary
sdext/source/presenter/bitmaps/BorderToolbarTopRight.png |binary
sdext/source/presenter/bitmaps/BorderTop.png |binary
sdext/source/presenter/bitmaps/BorderTopLeft.png |binary
sdext/source/presenter/bitmaps/BorderTopRight.png |binary
sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png |binary
sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png |binary
sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png |binary
sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png |binary
sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png |binary
sdext/source/presenter/bitmaps/ButtonHelpDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonHelpNormal.png |binary
sdext/source/presenter/bitmaps/ButtonHelpSelected.png |binary
sdext/source/presenter/bitmaps/ButtonMinusDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonMinusNormal.png |binary
sdext/source/presenter/bitmaps/ButtonMinusSelected.png |binary
sdext/source/presenter/bitmaps/ButtonNotesDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonNotesNormal.png |binary
sdext/source/presenter/bitmaps/ButtonNotesSelected.png |binary
sdext/source/presenter/bitmaps/ButtonPlusDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonPlusNormal.png |binary
sdext/source/presenter/bitmaps/ButtonPlusSelected.png |binary
sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png |binary
sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png |binary
sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png |binary
sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png |binary
sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png |binary
sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png |binary
sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png |binary
sdext/source/presenter/bitmaps/LabelMouseOverCenter.png |binary
sdext/source/presenter/bitmaps/LabelMouseOverLeft.png |binary
sdext/source/presenter/bitmaps/LabelMouseOverRight.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png |binary
sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png |binary
sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png |binary
sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png |binary
sdext/source/presenter/bitmaps/ViewBackground.png |binary
sdext/source/presenter/components.cxx | 74
sdext/source/presenter/delzip | 1
sdext/source/presenter/description.xml | 58
sdext/source/presenter/help/component.txt | 2
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk | 47
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp | 180 +
sdext/source/presenter/makefile.mk | 393 ++-
sdext/source/presenter/manifest.xml | 38
sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu | 41
sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu | 31
sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu | 1220 ++++++++++
sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk | 47
sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk | 44
sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs | 465 +++
set_soenv.in | 2
vcl/aqua/source/window/salframeview.mm | 6
196 files changed, 5087 insertions(+), 4537 deletions(-)
New commits:
commit 22a01f66b7dea315583f5145df61e9462c34195d
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Tue Mar 26 11:56:56 2013 +0000
i1457158 - Revert revision 1457160 and revision 1457158
diff --git a/configure.in b/configure.in
index 1f22d77..08361e0 100644
--- a/configure.in
+++ b/configure.in
@@ -519,6 +519,9 @@ AC_ARG_WITH(beanshell-jar,
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
[ BSH_JAR="$withval"
])
+AC_ARG_ENABLE(minimizer,
+[ --enable-minimizer enables the build of the Presentation Minimizer extension
+],,)
AC_ARG_ENABLE(presenter-screen,
[ --enable-presenter-screen enables the build of the Presenter Screen extension
],,)
@@ -6410,6 +6413,15 @@ fi
AC_SUBST(ENABLE_OPENGL)
+AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
+if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_MINIMIZER=YES
+else
+ AC_MSG_RESULT([no])
+ ENABLE_MINIMIZER=NO
+fi
+AC_SUBST(ENABLE_MINIMIZER)
AC_MSG_CHECKING([whether to build the Presenter Screen extension])
if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
@@ -6449,7 +6461,7 @@ AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(POPPLER_CFLAGS)
AC_SUBST(POPPLER_LIBS)
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
AC_MSG_CHECKING([for sdext module])
if test -d ./sdext; then
AC_MSG_RESULT([OK])
diff --git a/default_images/minimizer/opt_16.png b/default_images/minimizer/opt_16.png
new file mode 100644
index 0000000..9762000
Binary files /dev/null and b/default_images/minimizer/opt_16.png differ
diff --git a/default_images/minimizer/opt_16_h.png b/default_images/minimizer/opt_16_h.png
new file mode 100644
index 0000000..7b7e850
Binary files /dev/null and b/default_images/minimizer/opt_16_h.png differ
diff --git a/default_images/minimizer/opt_26.png b/default_images/minimizer/opt_26.png
new file mode 100644
index 0000000..7dba57b
Binary files /dev/null and b/default_images/minimizer/opt_26.png differ
diff --git a/default_images/minimizer/opt_26_h.png b/default_images/minimizer/opt_26_h.png
new file mode 100644
index 0000000..924ad50
Binary files /dev/null and b/default_images/minimizer/opt_26_h.png differ
diff --git a/default_images/res/commandimagelist/lc_presentationminimizer.png b/default_images/res/commandimagelist/lc_presentationminimizer.png
deleted file mode 100644
index 7dba57b..0000000
Binary files a/default_images/res/commandimagelist/lc_presentationminimizer.png and /dev/null differ
diff --git a/default_images/res/commandimagelist/lch_presentationminimizer.png b/default_images/res/commandimagelist/lch_presentationminimizer.png
deleted file mode 100644
index 924ad50..0000000
Binary files a/default_images/res/commandimagelist/lch_presentationminimizer.png and /dev/null differ
diff --git a/default_images/res/commandimagelist/sc_presentationminimizer.png b/default_images/res/commandimagelist/sc_presentationminimizer.png
deleted file mode 100644
index 9762000..0000000
Binary files a/default_images/res/commandimagelist/sc_presentationminimizer.png and /dev/null differ
diff --git a/default_images/res/commandimagelist/sch_presentationminimizer.png b/default_images/res/commandimagelist/sch_presentationminimizer.png
deleted file mode 100644
index 7b7e850..0000000
Binary files a/default_images/res/commandimagelist/sch_presentationminimizer.png and /dev/null differ
diff --git a/extensions.lst b/extensions.lst
index 4fde85c..1472ebe 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -37,6 +37,12 @@
[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
file://presenter/presenter-screen.oxt
+# the presentation minimizer
+[ language=all && ENABLE_MINIMIZER=YES ]
+ file://minimizer/presentation-minimizer.oxt
+
+
+
# English dictionary
[ language=en.* || language=de || language=it ]
b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 54ce9d7..85d1d5f8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -159,174 +159,4 @@
<value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
</prop>
</node>
- <node oor:name="PresentationMinimizer">
- <node oor:name="LastUsedSettings">
- <prop oor:name="Name">
- <value xml:lang="en-US">Projector optimized</value>
- </prop>
- <prop oor:name="JPEGCompression">
- <value>true</value>
- </prop>
- <prop oor:name="JPEGQuality">
- <value>50</value>
- </prop>
- <prop oor:name="RemoveCropArea">
- <value>true</value>
- </prop>
- <prop oor:name="ImageResolution">
- <value>150</value>
- </prop>
- <prop oor:name="EmbedLinkedGraphics">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimization">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimizationType">
- <value>0</value>
- </prop>
- <prop oor:name="DeleteUnusedMasterPages">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteHiddenSlides">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteNotesPages">
- <value>false</value>
- </prop>
- <prop oor:name="SaveAs">
- <value>true</value>
- </prop>
- <prop oor:name="OpenNewDocument">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="Settings">
- <node oor:name="Templates">
- <node oor:name="template1" oor:op="replace">
- <prop oor:name="Name">
- <value xml:lang="en-US">Screen optimized (smallest file size)</value>
- </prop>
- <prop oor:name="JPEGCompression">
- <value>true</value>
- </prop>
- <prop oor:name="JPEGQuality">
- <value>25</value>
- </prop>
- <prop oor:name="RemoveCropArea">
- <value>true</value>
- </prop>
- <prop oor:name="ImageResolution">
- <value>90</value>
- </prop>
- <prop oor:name="EmbedLinkedGraphics">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimization">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimizationType">
- <value>0</value>
- </prop>
- <prop oor:name="DeleteUnusedMasterPages">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteHiddenSlides">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteNotesPages">
- <value>false</value>
- </prop>
- <prop oor:name="SaveAs">
- <value>true</value>
- </prop>
- <prop oor:name="OpenNewDocument">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="template2" oor:op="replace">
- <prop oor:name="Name">
- <value xml:lang="en-US">Projector optimized</value>
- </prop>
- <prop oor:name="JPEGCompression">
- <value>true</value>
- </prop>
- <prop oor:name="JPEGQuality">
- <value>50</value>
- </prop>
- <prop oor:name="RemoveCropArea">
- <value>true</value>
- </prop>
- <prop oor:name="ImageResolution">
- <value>150</value>
- </prop>
- <prop oor:name="EmbedLinkedGraphics">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimization">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimizationType">
- <value>0</value>
- </prop>
- <prop oor:name="DeleteUnusedMasterPages">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteHiddenSlides">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteNotesPages">
- <value>false</value>
- </prop>
- <prop oor:name="SaveAs">
- <value>true</value>
- </prop>
- <prop oor:name="OpenNewDocument">
- <value>true</value>
- </prop>
- </node>
- <node oor:name="template3" oor:op="replace">
- <prop oor:name="Name">
- <value xml:lang="en-US">Print optimized</value>
- </prop>
- <prop oor:name="JPEGCompression">
- <value>true</value>
- </prop>
- <prop oor:name="JPEGQuality">
- <value>75</value>
- </prop>
- <prop oor:name="RemoveCropArea">
- <value>true</value>
- </prop>
- <prop oor:name="ImageResolution">
- <value>300</value>
- </prop>
- <prop oor:name="EmbedLinkedGraphics">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimization">
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimizationType">
- <value>0</value>
- </prop>
- <prop oor:name="DeleteUnusedMasterPages">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteHiddenSlides">
- <value>true</value>
- </prop>
- <prop oor:name="DeleteNotesPages">
- <value>false</value>
- </prop>
- <prop oor:name="SaveAs">
- <value>true</value>
- </prop>
- <prop oor:name="OpenNewDocument">
- <value>true</value>
- </prop>
- </node>
- </node>
- </node>
- </node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index e723a9a..befef1a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1279,14 +1279,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:PresentationMinimizer" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Minimize Presentation...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Black and White</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 7a88c7e..c954c53 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -86,113 +86,6 @@
</info>
</prop>
</group>
- <group oor:name="PresentationMinimizerSettings">
- <info>
- <desc>Describes the Presentation Optimization Wizard settings of one session</desc>
- </info>
- <prop oor:name="Name" oor:type="xs:string" oor:localized="true">
- <info>
- <desc>Specifies the name settings name</desc>
- </info>
- <value>Default</value>
- </prop>
- <prop oor:name="JPEGCompression" oor:type="xs:boolean">
- <info>
- <desc>Specifies if JPEG compression is being used</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="JPEGQuality" oor:type="xs:int">
- <info>
- <desc>Specifies quality of the JPG export. A higher value results in higher quality and file size.</desc>
- </info>
- <constraints>
- <minInclusive oor:value="1">
- <info>
- <desc>Represents lowest value that can be used. The lower the value, the less good is the compression quality and the bigger is be the file size.</desc>
- </info>
- </minInclusive>
- <maxInclusive oor:value="100">
- <info>
- <desc>Represents highest value that can be used. The higher the value, the better is the compression quality and the smaller is the file size.</desc>
- </info>
- </maxInclusive>
- </constraints>
- <value>45</value>
- </prop>
- <prop oor:name="RemoveCropArea" oor:type="xs:boolean">
- <info>
- <desc>Specifies if the crop area of a picture has to be removed</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="ImageResolution" oor:type="xs:int">
- <info>
- <desc>Specifies the Image Resolution that should be used in dpi. A value of zero determines that the image resolution should not be changed.</desc>
- </info>
- <value>150</value>
- </prop>
- <prop oor:name="EmbedLinkedGraphics" oor:type="xs:boolean">
- <info>
- <desc>Specifies if linked graphics are to be embedded</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimization" oor:type="xs:boolean">
- <info>
- <desc>Specifies if OLE Objects are converted to Graphic objects at all</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="OLEOptimizationType" oor:type="xs:short">
- <info>
- <desc>Specifies the compression type that is being used,.</desc>
- </info>
- <constraints>
- <enumeration oor:value="0">
- <info>
- <desc>Each</desc>
- </info>
- </enumeration>
- <enumeration oor:value="1">
- <info>
- <desc>Alien</desc>
- </info>
- </enumeration>
- </constraints>
- <value>0</value>
- </prop>
- <prop oor:name="DeleteUnusedMasterPages" oor:type="xs:boolean">
- <info>
- <desc>Specifies if unused Master Pages are being deleted</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="DeleteHiddenSlides" oor:type="xs:boolean">
- <info>
- <desc>Specifies if hidden Slides are being deleted</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="DeleteNotesPages" oor:type="xs:boolean">
- <info>
- <desc>Specifies if Notes Pages are being deleted</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="SaveAs" oor:type="xs:boolean">
- <info>
- <desc>Specifies if the optimization is done on a new document.</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="OpenNewDocument" oor:type="xs:boolean">
- <info>
- <desc>Specifies if the newly created document is opened automatically.</desc>
- </info>
- <value>true</value>
- </prop>
- </group>
</templates>
<component>
<group oor:name="Layout">
@@ -1642,25 +1535,5 @@
</group>
</group>
</group>
- <group oor:name="PresentationMinimizer">
- <info>
- <desc>Contains configuration for the Presentation Minimizer.</desc>
- </info>
- <node-ref oor:name="LastUsedSettings" oor:node-type="PresentationMinimizerSettings">
- <info>
- <desc>describes the name of the last used settings</desc>
- </info>
- </node-ref>
- <group oor:name="Settings">
- <info>
- <desc>The PresentationMinimizer settings</desc>
- </info>
- <set oor:name="Templates" oor:node-type="PresentationMinimizerSettings">
- <info>
- <desc>List of the saved Presentation Minimizer Wizard settings</desc>
- </info>
- </set>
- </group>
- </group>
</component>
</oor:component-schema>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a92d18..e7ae0c5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -174,8 +174,7 @@ my_components = \
xmlfd \
xmx \
xsltdlg \
- xstor \
- PresentationMinimizer
+ xstor
.IF "$(OS)" == "MACOSX"
my_components += component/vcl/vcl.macosx
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 521c356..e1c2a72 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 8654993..0299e35 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1337,19 +1337,6 @@ File gid_File_Lib_Slideshow
#endif
End
-File gid_File_Lib_PresentationMinimizer
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX));
- #elif defined OS2
- Name = "PresentationMinimizer.dll";
- #else
- Name = "PresentationMinimizer.uno.dll";
- #endif
-End
-
File gid_File_Lib_Sdbc_2
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 317f2fb..e863575 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -126,5 +126,3 @@ STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
STD_RES_FILE( gid_File_Res_Forui, forui )
STD_RES_FILE( gid_File_Res_For, for )
-STD_RES_FILE( gid_File_Res_PresentationMinimizer, minimizer )
-
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b020a7f..511201d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -338,7 +338,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sax_Uno,
gid_File_Lib_Fastsax_Uno,
gid_File_Lib_Slideshow,
- gid_File_Lib_PresentationMinimizer
gid_File_Lib_Recentfile,
gid_File_Lib_Scriptframe,
gid_File_Lib_Sdbc_2,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 089492b..05fd735 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -102,8 +102,7 @@ Module gid_Module_Langpack_Resource_Template
gid_File_Res_Tfu,
gid_File_Res_Eps,
gid_File_Res_UpdChk,
- gid_File_Res_Upd,
- gid_File_Res_PresentationMinimizer);
+ gid_File_Res_Upd);
End
Module gid_Module_Langpack_Help_Template
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 5d8bcd4..b733f5a 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -503,6 +503,5 @@
#define SID_ADD_MOTION_PATH (SID_SD_START+441)
#define SID_TABLE_TOOLBOX (SID_SD_START+442)
-#define SID_PRESENTATION_MINIMIZER (SID_SD_START+442)
#endif
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 156bfdc..2df7bcd 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -75,11 +75,6 @@ interface ImpressEditView : DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
- SID_PRESENTATION_MINIMIZER
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
SID_CLEAR_UNDO_STACK // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e7907b4..e553a56 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -5385,31 +5385,6 @@ SfxVoidItem PresentationDialog SID_PRESENTATION_DLG
]
//--------------------------------------------------------------------------
-SfxVoidItem PresentationMinimizer SID_PRESENTATION_MINIMIZER
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem PresentationEnd SID_PRESENTATION_END
()
[
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index d980973..0753846 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <comphelper/processfactory.hxx>
@@ -103,7 +102,6 @@
#include "fuformatpaintbrush.hxx"
using ::rtl::OUString;
-using com::sun::star::ui::dialogs::XExecutableDialog;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
@@ -1474,34 +1472,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- case SID_PRESENTATION_MINIMIZER:
- {
- if ( GetDoc()->GetDocumentType() == DOCUMENT_TYPE_IMPRESS &&
- GetViewShellBase().GetController() != NULL )
- {
- try
- {
- uno::Reference< uno::XComponentContext > xContext(
- ::comphelper::getProcessComponentContext() );
- uno::Sequence< uno::Any > aArgs(1);
- aArgs[0] <<= GetViewShellBase().GetController();
-
- uno::Reference< XExecutableDialog > xDialog(
- xContext->getServiceManager()->
- createInstanceWithArgumentsAndContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.dialogs.PresentationMinimizerDialog")),
- aArgs, xContext), uno::UNO_QUERY_THROW );
- xDialog->execute();
- }
- catch (...)
- {}
- }
-
- rReq.Done();
- }
- break;
-
default:
break;
}
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 0c2f454..ba54639 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -270,7 +270,6 @@
<menu:menuitem menu:id=".uno:Gallery"/>
<menu:menuitem menu:id=".uno:BmpMask"/>
<menu:menuitem menu:id=".uno:AVMediaPlayer"/>
- <menu:menuitem menu:id=".uno:PresentationMinimizer"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:MacrosMenu">
<menu:menupopup>
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 29350f7..7462e48 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,7 +1,9 @@
dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
-dx sdext\source\minimizer nmake - all sdext_minimizer sdext_inc NULL
+dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL
+dx sdext\source\minimizer\registry\data\org\openoffice\Office\extension nmake - all sdext_minimizer_rdoooe NULL
+dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL
dx sdext\source\presenter\registry\data\org\openoffice\Office\extension nmake - all sdext_presenter_xcu NULL
dx sdext\source\presenter\help\en-US\com.sun.PresenterScreen nmake - all sdext_presenter_help NULL
dx sdext\source\presenter nmake - all sdext_presenter sdext_inc sdext_presenter_xcu sdext_presenter_help NULL
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index aacc8a5..bcaa430 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -1,30 +1,10 @@
+mkdir: %_DEST%\bin%_EXT%\minimizer
mkdir: %_DEST%\bin%_EXT%\presenter
mkdir: %_DEST%\bin%_EXT%\pdfimport
..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
+..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
+..\%__SRC%\bin\presentation_minimizer_develop.zip %_DEST%\bin%_EXT%\minimizer\presentation_minimizer_develop.zip
..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip
-
-
-
-mkdir: %COMMON_DEST%\res%_EXT%
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-mkdir: %_DEST%\xml%_EXT%
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler
-
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Addons\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\ProtocolHandler\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler
-
-mkdir: %_DEST%\xml%_EXT%
-..\%__SRC%\misc\PresentationMinimizer.component %_DEST%\xml%_EXT%\PresentationMinimizer.component
-
-..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll
-..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT%
diff --git a/sdext/source/minimizer/PresentationMinimizer.component b/sdext/source/minimizer/PresentationMinimizer.component
deleted file mode 100644
index 2a243c2..0000000
--- a/sdext/source/minimizer/PresentationMinimizer.component
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.PPPOptimizerImp">
- <service name="com.sun.star.comp.PPPOptimizer"/>
- </implementation>
- <implementation name="com.sun.star.comp.ui.dialogs.PresentationMinimizerDialog">
- <service name="com.sun.star.ui.dialogs.PresentationMinimizerDialog"/>
- </implementation>
-</component>
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index a0375a2..48df1a3 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -31,39 +31,13 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/resource/XResourceBundleLoader.hpp>
-
-#include <rtl/ustrbuf.hxx>
-
-#include "minimizer.hrc"
+using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
-
-#include <rtl/instance.hxx>
-
-typedef std::map < sal_Int32, rtl::OUString > StringResourceMap;
-
-struct StaticResourceMap
- : public rtl::StaticWithInit< StringResourceMap, StaticResourceMap >
-{
- StringResourceMap &
- operator()() const;
-};
-
-StringResourceMap &
-StaticResourceMap::operator()() const
-{
- static StringResourceMap aMap;
- return aMap;
-}
-
static const OUString& GetConfigurationProviderServiceName (void)
{
static const OUString sConfigurationProviderServiceName (
@@ -74,31 +48,10 @@ static const OUString& GetConfigurationProviderServiceName (void)
static const OUString& GetPathToConfigurationRoot (void)
{
static const OUString sPathToConfigurationRoot (
- RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Impress/PresentationMinimizer"));
+ RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.SunPresentationMinimizer"));
return sPathToConfigurationRoot;
}
-static OUString lcl_loadString(
- const Reference< resource::XResourceBundle > xResourceBundle,
- sal_Int32 nResourceId )
-{
- OUString sString;
- OUStringBuffer sKey;
- sKey.appendAscii( RTL_CONSTASCII_STRINGPARAM( "string:" ) );
- sKey.append( nResourceId );
-
- try
- {
- OSL_VERIFY( xResourceBundle->getByName( sKey.makeStringAndClear() ) >>= sString );
- }
- catch( const uno::Exception& )
- {
- OSL_ENSURE( false, "OptimizerSettings: missing resource!" );
- }
-
- return sString;
-}
-
void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAccess >& rSettings )
{
if ( rSettings.is() )
@@ -206,8 +159,8 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti
}
-ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxContext, OptimizerSettings* pDefaultSettings ) :
- m_xContext( rxContext )
+ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxMSF, OptimizerSettings* pDefaultSettings ) :
+ mxMSF( rxMSF )
{
LoadStrings();
maSettings.push_back( pDefaultSettings ?
@@ -221,101 +174,66 @@ ConfigurationAccess::~ConfigurationAccess()
{
}
-rtl::OUString ConfigurationAccess::getString( sal_Int32 nResId )
+rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken )
+{
+ rtl::OUString aPath;
+ try
+ {
+ static const OUString sProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) );
+ static const OUString stheMacroExpander( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" ) );
+ Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW );
+ if ( xSet->hasByName( TKGet( eToken ) ) )
+ xSet->getByName( TKGet( eToken ) ) >>= aPath;
+ if ( aPath.match( sProtocol, 0 ) )
+ {
+ rtl::OUString aTmp( aPath.copy( 20 ) );
+ Reference< util::XMacroExpander > xExpander;
+ if ( mxMSF->getValueByName( stheMacroExpander ) >>= xExpander )
+ {
+ aPath = xExpander->expandMacros( aTmp );
+ }
+ }
+ }
+ catch ( Exception& )
+ {
+ }
+ return aPath;
+}
+
+rtl::OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const
{
- const StringResourceMap &aStrings = StaticResourceMap::get();
- StringResourceMap::const_iterator aIter( aStrings.find( nResId ) );
- return aIter != aStrings.end() ? ((*aIter).second) : rtl::OUString();
+ std::map< PPPOptimizerTokenEnum, rtl::OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) );
+ return aIter != maStrings.end() ? ((*aIter).second) : rtl::OUString();
}
void ConfigurationAccess::LoadStrings()
{
- static bool bLoaded = false;
- if ( bLoaded )
- return;
- else
- bLoaded = true;
try
{
-
- Reference< resource::XResourceBundleLoader > xResourceBundleLoader(
- m_xContext->getValueByName(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ) ),
- UNO_QUERY_THROW );
-
- Reference< resource::XResourceBundle > xResourceBundle(
- xResourceBundleLoader->loadBundle_Default(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "minimizer" ) ) ),
- UNO_SET_THROW );
-
- StringResourceMap &aStrings = StaticResourceMap::get();
- aStrings[ STR_PRESENTATION_MINIMIZER ] = lcl_loadString( xResourceBundle, STR_PRESENTATION_MINIMIZER );
- aStrings[ STR_STEPS ] = lcl_loadString( xResourceBundle, STR_STEPS );
- aStrings[ STR_HELP ] = lcl_loadString( xResourceBundle, STR_HELP );
- aStrings[ STR_BACK ] = lcl_loadString( xResourceBundle, STR_BACK );
- aStrings[ STR_NEXT ] = lcl_loadString( xResourceBundle, STR_NEXT );
- aStrings[ STR_FINISH ] = lcl_loadString( xResourceBundle, STR_FINISH );
- aStrings[ STR_CANCEL ] = lcl_loadString( xResourceBundle, STR_CANCEL );
- aStrings[ STR_INTRODUCTION ] = lcl_loadString( xResourceBundle, STR_INTRODUCTION );
- aStrings[ STR_INTRODUCTION_T ] = lcl_loadString( xResourceBundle, STR_INTRODUCTION_T );
- aStrings[ STR_CHOSE_SETTINGS ] = lcl_loadString( xResourceBundle, STR_CHOSE_SETTINGS );
- aStrings[ STR_REMOVE ] = lcl_loadString( xResourceBundle, STR_REMOVE );
- aStrings[ STR_GRAPHIC_OPTIMIZATION ] = lcl_loadString( xResourceBundle, STR_GRAPHIC_OPTIMIZATION );
- aStrings[ STR_IMAGE_OPTIMIZATION ] = lcl_loadString( xResourceBundle, STR_IMAGE_OPTIMIZATION );
- aStrings[ STR_LOSSLESS_COMPRESSION ] = lcl_loadString( xResourceBundle, STR_LOSSLESS_COMPRESSION );
- aStrings[ STR_JPEG_COMPRESSION ] = lcl_loadString( xResourceBundle, STR_JPEG_COMPRESSION );
- aStrings[ STR_QUALITY ] = lcl_loadString( xResourceBundle, STR_QUALITY );
- aStrings[ STR_REMOVE_CROP_AREA ] = lcl_loadString( xResourceBundle, STR_REMOVE_CROP_AREA );
- aStrings[ STR_IMAGE_RESOLUTION ] = lcl_loadString( xResourceBundle, STR_IMAGE_RESOLUTION );
- aStrings[ STR_IMAGE_RESOLUTION_0 ] = lcl_loadString( xResourceBundle, STR_IMAGE_RESOLUTION_0 );
- aStrings[ STR_IMAGE_RESOLUTION_1 ] = lcl_loadString( xResourceBundle, STR_IMAGE_RESOLUTION_1 );
- aStrings[ STR_IMAGE_RESOLUTION_2 ] = lcl_loadString( xResourceBundle, STR_IMAGE_RESOLUTION_2 );
- aStrings[ STR_IMAGE_RESOLUTION_3 ] = lcl_loadString( xResourceBundle, STR_IMAGE_RESOLUTION_3 );
- aStrings[ STR_EMBED_LINKED_GRAPHICS ] = lcl_loadString( xResourceBundle, STR_EMBED_LINKED_GRAPHICS );
- aStrings[ STR_OLE_OBJECTS ] = lcl_loadString( xResourceBundle, STR_OLE_OBJECTS );
- aStrings[ STR_OLE_OPTIMIZATION ] = lcl_loadString( xResourceBundle, STR_OLE_OPTIMIZATION );
- aStrings[ STR_OLE_REPLACE ] = lcl_loadString( xResourceBundle, STR_OLE_REPLACE );
- aStrings[ STR_ALL_OLE_OBJECTS ] = lcl_loadString( xResourceBundle, STR_ALL_OLE_OBJECTS );
- aStrings[ STR_ALIEN_OLE_OBJECTS_ONLY ] = lcl_loadString( xResourceBundle, STR_ALIEN_OLE_OBJECTS_ONLY );
- aStrings[ STR_OLE_OBJECTS_DESC ] = lcl_loadString( xResourceBundle, STR_OLE_OBJECTS_DESC );
- aStrings[ STR_NO_OLE_OBJECTS_DESC ] = lcl_loadString( xResourceBundle, STR_NO_OLE_OBJECTS_DESC );
- aStrings[ STR_SLIDES ] = lcl_loadString( xResourceBundle, STR_SLIDES );
- aStrings[ STR_CHOOSE_SLIDES ] = lcl_loadString( xResourceBundle, STR_CHOOSE_SLIDES );
- aStrings[ STR_MASTER_PAGES ] = lcl_loadString( xResourceBundle, STR_MASTER_PAGES );
- aStrings[ STR_DELETE_MASTER_PAGES ] = lcl_loadString( xResourceBundle, STR_DELETE_MASTER_PAGES );
- aStrings[ STR_DELETE_NOTES_PAGES ] = lcl_loadString( xResourceBundle, STR_DELETE_NOTES_PAGES );
- aStrings[ STR_DELETE_HIDDEN_SLIDES ] = lcl_loadString( xResourceBundle, STR_DELETE_HIDDEN_SLIDES );
- aStrings[ STR_CUSTOM_SHOW ] = lcl_loadString( xResourceBundle, STR_CUSTOM_SHOW );
- aStrings[ STR_SUMMARY ] = lcl_loadString( xResourceBundle, STR_SUMMARY );
- aStrings[ STR_SUMMARY_TITLE ] = lcl_loadString( xResourceBundle, STR_SUMMARY_TITLE );
- aStrings[ STR_PROGRESS ] = lcl_loadString( xResourceBundle, STR_PROGRESS );
- aStrings[ STR_OBJECTS_OPTIMIZED ] = lcl_loadString( xResourceBundle, STR_OBJECTS_OPTIMIZED );
- aStrings[ STR_APPLY_TO_CURRENT ] = lcl_loadString( xResourceBundle, STR_APPLY_TO_CURRENT );
- aStrings[ STR_AUTOMATICALLY_OPEN ] = lcl_loadString( xResourceBundle, STR_AUTOMATICALLY_OPEN );
- aStrings[ STR_SAVE_SETTINGS ] = lcl_loadString( xResourceBundle, STR_SAVE_SETTINGS );
- aStrings[ STR_SAVE_AS ] = lcl_loadString( xResourceBundle, STR_SAVE_AS );
- aStrings[ STR_DELETE_SLIDES ] = lcl_loadString( xResourceBundle, STR_DELETE_SLIDES );
- aStrings[ STR_OPTIMIZE_IMAGES ] = lcl_loadString( xResourceBundle, STR_OPTIMIZE_IMAGES );
- aStrings[ STR_CREATE_REPLACEMENT ] = lcl_loadString( xResourceBundle, STR_CREATE_REPLACEMENT );
- aStrings[ STR_CURRENT_FILESIZE ] = lcl_loadString( xResourceBundle, STR_CURRENT_FILESIZE );
- aStrings[ STR_ESTIMATED_FILESIZE ] = lcl_loadString( xResourceBundle, STR_ESTIMATED_FILESIZE );
- aStrings[ STR_MB ] = lcl_loadString( xResourceBundle, STR_MB );
- aStrings[ STR_MY_SETTINGS ] = lcl_loadString( xResourceBundle, STR_MY_SETTINGS );
- aStrings[ STR_DEFAULT_SESSION ] = lcl_loadString( xResourceBundle, STR_DEFAULT_SESSION );
- aStrings[ STR_MODIFY_WARNING ] = lcl_loadString( xResourceBundle, STR_MODIFY_WARNING );
- aStrings[ STR_YES ] = lcl_loadString( xResourceBundle, STR_YES );
- aStrings[ STR_OK ] = lcl_loadString( xResourceBundle, STR_OK );
- aStrings[ STR_INFO_1 ] = lcl_loadString( xResourceBundle, STR_INFO_1 );
- aStrings[ STR_INFO_2 ] = lcl_loadString( xResourceBundle, STR_INFO_2 );
- aStrings[ STR_INFO_3 ] = lcl_loadString( xResourceBundle, STR_INFO_3 );
- aStrings[ STR_INFO_4 ] = lcl_loadString( xResourceBundle, STR_INFO_4 );
- aStrings[ STR_DUPLICATING_PRESENTATION ] = lcl_loadString( xResourceBundle, STR_DUPLICATING_PRESENTATION );
- aStrings[ STR_DELETING_SLIDES ] = lcl_loadString( xResourceBundle, STR_DELETING_SLIDES );
- aStrings[ STR_OPTIMIZING_GRAPHICS ] = lcl_loadString( xResourceBundle, STR_OPTIMIZING_GRAPHICS );
- aStrings[ STR_CREATING_OLE_REPLACEMENTS] = lcl_loadString( xResourceBundle, STR_CREATING_OLE_REPLACEMENTS );
- aStrings[ STR_FILESIZESEPARATOR ] = lcl_loadString( xResourceBundle, STR_FILESIZESEPARATOR );
- aStrings[ STR_INFO_DIALOG ] = lcl_loadString( xResourceBundle, STR_INFO_DIALOG );
+ do
+ {
+ Reference< XInterface > xRoot( OpenConfiguration( true ) );
+ if ( !xRoot.is() )
+ break;
+ Reference< container::XNameAccess > xSet( GetConfigurationNode( xRoot, TKGet( TK_Strings ) ), UNO_QUERY );
+ if ( xSet.is() )
+ {
+ const Sequence< OUString > aElements( xSet->getElementNames() );
+ for ( int i = 0; i < aElements.getLength(); i++ )
+ {
+ try
+ {
+ OUString aString, aPropertyName( aElements[ i ] );
+ if ( xSet->getByName( aPropertyName ) >>= aString )
+ maStrings[ TKGet( aPropertyName ) ] = aString;
+ }
+ catch( Exception& )
+ {
+ }
+ }
+ }
+ }
+ while( false );
}
catch( Exception& )
{
@@ -416,7 +334,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
Reference< XInterface > xRoot;
try
{
- Reference< lang::XMultiServiceFactory > xProvider( m_xContext->getServiceManager()->createInstanceWithContext( GetConfigurationProviderServiceName(), m_xContext ), UNO_QUERY );
+ Reference< lang::XMultiServiceFactory > xProvider( mxMSF->getServiceManager()->createInstanceWithContext( GetConfigurationProviderServiceName(), mxMSF ), UNO_QUERY );
if ( xProvider.is() )
{
Sequence< Any > aCreationArguments( 2 );
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 73a0d45..5ef805b 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/container/XNameReplace.hpp>
#include <map>
-
struct OptimizerSettings
{
rtl::OUString maName;
@@ -87,12 +86,13 @@ class ConfigurationAccess
{
public :
- ConfigurationAccess( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
+ ConfigurationAccess( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rXFactory,
OptimizerSettings* pDefaultSettings = NULL );
~ConfigurationAccess();
void SaveConfiguration();
- static rtl::OUString getString( sal_Int32 nResId );
+ rtl::OUString getPath( const PPPOptimizerTokenEnum );
+ rtl::OUString getString( const PPPOptimizerTokenEnum ) const;
// access to current OptimizerSettings (stored in the first entry of maSettings)
com::sun::star::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const;
@@ -110,10 +110,20 @@ class ConfigurationAccess
private :
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
+ struct Compare
+ {
+ bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const
+ {
+ return s1 < s2;
+ }
+ };
+ std::map < PPPOptimizerTokenEnum, rtl::OUString, Compare > maStrings;
+
std::vector< OptimizerSettings > maSettings;
std::vector< OptimizerSettings > maInitialSettings;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
+
void LoadStrings();
void LoadConfiguration();
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > OpenConfiguration( bool bReadOnly );
diff --git a/sdext/source/minimizer/delzip b/sdext/source/minimizer/delzip
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/sdext/source/minimizer/delzip
@@ -0,0 +1 @@
+
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
new file mode 100644
index 0000000..05253a9
--- /dev/null
+++ b/sdext/source/minimizer/description.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+<description
+
+ xmlns="http://openoffice.org/extensions/description/2006"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:dep="http://openoffice.org/extensions/description/2006">
+
+ <identifier value="UPDATED_IDENTIFIER"/>
+
+ <dependencies>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
+ </dependencies>
+
+ <registration>
+ <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
+ <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+ </simple-license>
+ </registration>
+
+ <version value="1.1.0"/>
+
+ <platform value="UPDATED_SUPPORTED_PLATFORM"/>
+
+ <publisher>
+ <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
+ </publisher>
+
+ <display-name>
+ <name lang="en-US">Presentation Minimizer</name>
+ </display-name>
+
+ <icon>
+ <default xlink:href="bitmaps/extension_32.png" />
+ <high-contrast xlink:href="bitmaps/extension_32_h.png" />
+ </icon>
+
+</description>
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index c80099f..f074640 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -57,6 +57,7 @@
#include <rtl/ustrbuf.hxx>
+using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
@@ -64,53 +65,14 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::ui::dialogs;
-using ::com::sun::star::awt::XWindow;
-using ::rtl::OUString;
-
-namespace
+FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
+ mxMSF( rxMSF )
{
- inline bool lcl_isSystemDialog(
- const Reference< XInterface > &rxIfce )
- {
- Reference< XServiceInfo > xInfo( rxIfce, UNO_QUERY );
- if ( !xInfo.is() )
- return false;
-
- return xInfo->supportsService(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.dialogs.SystemFilePicker" ) ) );
- }
-}
-
-FileOpenDialog::FileOpenDialog(
- const Reference< XComponentContext >& rxContext,
- const Reference< XWindow > &rxParent )
- : mxContext( rxContext )
-{
- mxFilePicker = Reference < XFilePicker >(
- mxContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.dialogs.FilePicker" ) ),
- rxContext ), UNO_QUERY_THROW );
- Reference< XInitialization > xInit( mxFilePicker, UNO_QUERY_THROW );
- bool bIsSystemDlg = lcl_isSystemDialog( mxFilePicker );
- Sequence< Any > aInitPropSeq( bIsSystemDlg ? 1 : 2 );
- if ( bIsSystemDlg )
- {
- aInitPropSeq[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION;
- xInit->initialize( aInitPropSeq );
- }
- else
- {
- aInitPropSeq[ 0 ] <<= NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TemplateDescription")),
- makeAny( (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION));
- aInitPropSeq[ 1 ] <<= NamedValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")),
- makeAny( rxParent ));
- xInit->initialize( aInitPropSeq );
- }
+ Sequence< Any > aInitPropSeq( 1 );
+ aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION; // TemplateDescription.FILEOPEN_SIMPLE
+ mxFilePicker = Reference < XFilePicker >( mxMSF->getServiceManager()->createInstanceWithArgumentsAndContext(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aInitPropSeq, rxMSF ),UNO_QUERY_THROW );
mxFilePicker->setMultiSelectionMode( sal_False );
Reference< XFilePickerControlAccess > xAccess( mxFilePicker, UNO_QUERY );
@@ -126,8 +88,8 @@ FileOpenDialog::FileOpenDialog(
}
// collecting a list of impress filters
- Reference< XNameAccess > xFilters( mxContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ), rxContext ), UNO_QUERY_THROW );
+ Reference< XNameAccess > xFilters( mxMSF->getServiceManager()->createInstanceWithContext(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ), rxMSF ), UNO_QUERY_THROW );
Sequence< OUString > aFilterList( xFilters->getElementNames() );
for ( int i = 0; i < aFilterList.getLength(); i++ )
{
@@ -171,14 +133,14 @@ FileOpenDialog::FileOpenDialog(
}
}
- Reference< XNameAccess > xTypes( mxContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxContext ), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTypes( mxMSF->getServiceManager()->createInstanceWithContext(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxMSF ), UNO_QUERY_THROW );
Sequence< OUString > aTypeList( xFilters->getElementNames() );
// mxFilePicker->setDefaultName( );
const char filter[] = "*.";
- // the filter title must be formed in the same way it is currently done
+ // the filter title must be formed in the same it is currently done
// in the internal implementation: "UIName (.<extension>)"
rtl::OUStringBuffer aUIName;
// the filter must be in the form "*.<extension>"
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 1c50dcb..eadc94c 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
class FileOpenDialog
{
@@ -47,14 +46,13 @@ class FileOpenDialog
FilterEntry() :
maFlags( 0 ) {}
};
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > mxFilePicker;
std::vector< FilterEntry > aFilterEntryList;
public :
- FileOpenDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- const com::sun::star::uno::Reference< com::sun::star::awt::XWindow > &rxParent );
+ FileOpenDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
~FileOpenDialog();
sal_Int16 execute();
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index b7cab57..4374cf2 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -35,6 +35,7 @@
#include "impoptimizer.hxx"
+using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -44,8 +45,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::presentation;
-using ::rtl::OUString;
-
const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentContext >& rxFact )
{
static DeviceInfo aDeviceInfo;
@@ -96,7 +95,7 @@ void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntit
}
}
-void ImpAddGraphicEntity( const Reference< XComponentContext >& rxContext, Reference< XShape >& rxShape, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference< XShape >& rxShape, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
{
Reference< XGraphic > xGraphic;
Reference< XPropertySet > xShapePropertySet( rxShape, UNO_QUERY_THROW );
@@ -115,7 +114,7 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxContext, Refer
// calculating the logical size, as if there were no cropping
if ( aGraphicCropLogic.Left || aGraphicCropLogic.Right || aGraphicCropLogic.Top || aGraphicCropLogic.Bottom )
{
- awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
+ awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
if ( aSize100thMM.Width && aSize100thMM.Height )
{
awt::Size aCropSize( aSize100thMM.Width - ( aGraphicCropLogic.Left + aGraphicCropLogic.Right ),
@@ -134,7 +133,7 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxContext, Refer
}
}
-void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxContext, const Reference< XPropertySet >& rxPropertySet, const awt::Size& rLogicalSize,
+void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const Reference< XPropertySet >& rxPropertySet, const awt::Size& rLogicalSize,
std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const Reference< XPropertySet >& rxPagePropertySet )
{
try
@@ -172,7 +171,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxContext, co
{
if ( !aSize.Width || !aSize.Height )
{
- awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
+ awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
if ( aSize100thMM.Width && aSize100thMM.Height )
aLogicalSize = aSize100thMM;
}
@@ -206,7 +205,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxContext, co
}
}
-void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxContext, const Reference< XDrawPage >& rxDrawPage, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, const Reference< XDrawPage >& rxDrawPage, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
{
try
{
@@ -217,14 +216,14 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxContex
Reference< XPropertySet > xBackgroundPropSet;
if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
- ImpAddFillBitmapEntity( rxContext, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
+ ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
}
catch( Exception& )
{
}
}
-void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxContext, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
{
for ( sal_Int32 i = 0; i < rxShapes->getCount(); i++ )
{
@@ -237,18 +236,18 @@ void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxContext,
if ( sShapeType == sGroupShape )
{
Reference< XShapes > xShapes( xShape, UNO_QUERY_THROW );
- ImpCollectGraphicObjects( rxContext, xShapes, rGraphicSettings, rGraphicEntities );
+ ImpCollectGraphicObjects( rxMSF, xShapes, rGraphicSettings, rGraphicEntities );
continue;
}
if ( sShapeType == sGraphicObjectShape )
- ImpAddGraphicEntity( rxContext, xShape, rGraphicSettings, rGraphicEntities );
+ ImpAddGraphicEntity( rxMSF, xShape, rGraphicSettings, rGraphicEntities );
// now check for a fillstyle
Reference< XPropertySet > xEmptyPagePropSet;
Reference< XPropertySet > xShapePropertySet( xShape, UNO_QUERY_THROW );
awt::Size aLogicalSize( xShape->getSize() );
- ImpAddFillBitmapEntity( rxContext, xShapePropertySet, aLogicalSize, rGraphicEntities, rGraphicSettings, xEmptyPagePropSet );
+ ImpAddFillBitmapEntity( rxMSF, xShapePropertySet, aLogicalSize, rGraphicEntities, rGraphicSettings, xEmptyPagePropSet );
}
catch( Exception& )
{
@@ -256,7 +255,7 @@ void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxContext,
}
}
-awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext >& rxContext, const Reference< XGraphic >& rxGraphic )
+awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext >& rxMSF, const Reference< XGraphic >& rxGraphic )
{
awt::Size aSize100thMM( 0, 0 );
Reference< XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW );
@@ -267,7 +266,7 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
awt::Size aSourceSizePixel( 0, 0 );
if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel )
{
- const DeviceInfo& rDeviceInfo( GraphicCollector::GetDeviceInfo( rxContext ) );
+ const DeviceInfo& rDeviceInfo( GraphicCollector::GetDeviceInfo( rxMSF ) );
if ( rDeviceInfo.PixelPerMeterX && rDeviceInfo.PixelPerMeterY )
{
aSize100thMM.Width = static_cast< sal_Int32 >( ( aSourceSizePixel.Width * 100000.0 ) / rDeviceInfo.PixelPerMeterX );
@@ -279,7 +278,7 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
return aSize100thMM;
}
-void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel,
+void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel,
const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicList )
{
try
@@ -290,24 +289,24 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx
for ( i = 0; i < xDrawPages->getCount(); i++ )
{
Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
- ImpCollectBackgroundGraphic( rxContext, xDrawPage, rGraphicSettings, rGraphicList );
+ ImpCollectBackgroundGraphic( rxMSF, xDrawPage, rGraphicSettings, rGraphicList );
Reference< XShapes > xDrawShapes( xDrawPage, UNO_QUERY_THROW );
- ImpCollectGraphicObjects( rxContext, xDrawShapes, rGraphicSettings, rGraphicList );
+ ImpCollectGraphicObjects( rxMSF, xDrawShapes, rGraphicSettings, rGraphicList );
Reference< XPresentationPage > xPresentationPage( xDrawPage, UNO_QUERY_THROW );
Reference< XDrawPage > xNotesPage( xPresentationPage->getNotesPage() );
- ImpCollectBackgroundGraphic( rxContext, xNotesPage, rGraphicSettings, rGraphicList );
+ ImpCollectBackgroundGraphic( rxMSF, xNotesPage, rGraphicSettings, rGraphicList );
Reference< XShapes > xNotesShapes( xNotesPage, UNO_QUERY_THROW );
- ImpCollectGraphicObjects( rxContext, xNotesShapes, rGraphicSettings, rGraphicList );
+ ImpCollectGraphicObjects( rxMSF, xNotesShapes, rGraphicSettings, rGraphicList );
}
Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW );
Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW );
for ( i = 0; i < xMasterPages->getCount(); i++ )
{
Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW );
- ImpCollectBackgroundGraphic( rxContext, xMasterPage, rGraphicSettings, rGraphicList );
+ ImpCollectBackgroundGraphic( rxMSF, xMasterPage, rGraphicSettings, rGraphicList );
Reference< XShapes > xMasterPageShapes( xMasterPage, UNO_QUERY_THROW );
- ImpCollectGraphicObjects( rxContext, xMasterPageShapes, rGraphicSettings, rGraphicList );
+ ImpCollectGraphicObjects( rxMSF, xMasterPageShapes, rGraphicSettings, rGraphicList );
}
std::vector< GraphicCollector::GraphicEntity >::iterator aGraphicIter( rGraphicList.begin() );
@@ -349,7 +348,7 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx
}
}
-void ImpCountGraphicObjects( const Reference< XComponentContext >& rxContext, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, sal_Int32& rnGraphics )
+void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, sal_Int32& rnGraphics )
{
for ( sal_Int32 i = 0; i < rxShapes->getCount(); i++ )
{
@@ -362,7 +361,7 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxContext, co
if ( sShapeType == sGroupShape )
{
Reference< XShapes > xShapes( xShape, UNO_QUERY_THROW );
- ImpCountGraphicObjects( rxContext, xShapes, rGraphicSettings, rnGraphics );
+ ImpCountGraphicObjects( rxMSF, xShapes, rGraphicSettings, rnGraphics );
continue;
}
@@ -391,7 +390,7 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxContext, co
}
}
-void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxContext */, const Reference< XDrawPage >& rxDrawPage,
+void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxMSF */, const Reference< XDrawPage >& rxDrawPage,
const GraphicSettings& /* rGraphicSettings */, sal_Int32& rnGraphics )
{
try
@@ -419,7 +418,7 @@ void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxConte
}
}
-void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel,
+void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel,
const GraphicSettings& rGraphicSettings, sal_Int32& rnGraphics )
{
try
@@ -430,24 +429,24 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxCo
for ( i = 0; i < xDrawPages->getCount(); i++ )
{
Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
- ImpCountBackgroundGraphic( rxContext, xDrawPage, rGraphicSettings, rnGraphics );
+ ImpCountBackgroundGraphic( rxMSF, xDrawPage, rGraphicSettings, rnGraphics );
Reference< XShapes > xDrawShapes( xDrawPage, UNO_QUERY_THROW );
- ImpCountGraphicObjects( rxContext, xDrawShapes, rGraphicSettings, rnGraphics );
+ ImpCountGraphicObjects( rxMSF, xDrawShapes, rGraphicSettings, rnGraphics );
Reference< XPresentationPage > xPresentationPage( xDrawPage, UNO_QUERY_THROW );
Reference< XDrawPage > xNotesPage( xPresentationPage->getNotesPage() );
- ImpCountBackgroundGraphic( rxContext, xNotesPage, rGraphicSettings, rnGraphics );
+ ImpCountBackgroundGraphic( rxMSF, xNotesPage, rGraphicSettings, rnGraphics );
Reference< XShapes > xNotesShapes( xNotesPage, UNO_QUERY_THROW );
- ImpCountGraphicObjects( rxContext, xNotesShapes, rGraphicSettings, rnGraphics );
+ ImpCountGraphicObjects( rxMSF, xNotesShapes, rGraphicSettings, rnGraphics );
}
Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW );
Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW );
for ( i = 0; i < xMasterPages->getCount(); i++ )
{
Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW );
- ImpCountBackgroundGraphic( rxContext, xMasterPage, rGraphicSettings, rnGraphics );
+ ImpCountBackgroundGraphic( rxMSF, xMasterPage, rGraphicSettings, rnGraphics );
Reference< XShapes > xMasterPageShapes( xMasterPage, UNO_QUERY_THROW );
- ImpCountGraphicObjects( rxContext, xMasterPageShapes, rGraphicSettings, rnGraphics );
+ ImpCountGraphicObjects( rxMSF, xMasterPageShapes, rGraphicSettings, rnGraphics );
}
}
catch ( Exception& )
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index 05be456..5314c7c 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -82,14 +82,14 @@ class GraphicCollector
};
static const com::sun::star::awt::DeviceInfo& GetDeviceInfo( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxFact );
- static com::sun::star::awt::Size GetOriginalSize( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
+ static com::sun::star::awt::Size GetOriginalSize( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF,
const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& rxGraphic );
// collecting graphic instances, the downside of this method is that every graphic is swapped in
- static void CollectGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
+ static void CollectGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
const GraphicSettings& rGraphicSettings, std::vector< GraphicEntity >& io_rGraphicList );
// counting graphics without swapping in graphics
- static void CountGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
+ static void CountGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
const GraphicSettings& rGraphicSettings, sal_Int32& rGraphics );
};
diff --git a/sdext/source/minimizer/help/component.txt b/sdext/source/minimizer/help/component.txt
new file mode 100644
index 0000000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/help/component.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed, and data that is no longer needed will be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations designed for screen or projector do not require the same high quality as presentations designed for print.
diff --git a/sdext/source/minimizer/help/help_de.odt b/sdext/source/minimizer/help/help_de.odt
new file mode 100644
index 0000000..bb9bc03
Binary files /dev/null and b/sdext/source/minimizer/help/help_de.odt differ
diff --git a/sdext/source/minimizer/help/help_en-US.odt b/sdext/source/minimizer/help/help_en-US.odt
new file mode 100644
index 0000000..bb9bc03
Binary files /dev/null and b/sdext/source/minimizer/help/help_en-US.odt differ
diff --git a/sdext/source/minimizer/helpid.hrc b/sdext/source/minimizer/helpid.hrc
deleted file mode 100644
index f8b9b00..0000000
--- a/sdext/source/minimizer/helpid.hrc
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-#define HID( helpid ) ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( helpid ) ) )
-
-#define HID_SDEXT_MINIMIZER_WIZ_DLG "sdext:Minimizer:Wizard:Dialog"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP1 "sdext:Minimizer:Wizard:Step1"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP1_LB_SETTINGS "sdext:Minimizer:Wizard:Step1:LBSettings"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP1_PB_DELSETTS "sdext:Minimizer:Wizard:Step1:PBDelSetts"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2 "sdext:Minimizer:Wizard:Step2"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_CUSTOMSHOW "sdext:Minimizer:Wizard:Step2:CBCustomShow"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_HIDDENSLIDES "sdext:Minimizer:Wizard:Step2:CBHiddenSlides"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_MASTERPAGES "sdext:Minimizer:Wizard:Step2:CBMasterPages"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2_CB_NOTES "sdext:Minimizer:Wizard:Step2:CBNotes"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP2_LB_CUSTOMSHOW "sdext:Minimizer:Wizard:Step2:LBCustomShow"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3 "sdext:Minimizer:Wizard:Step3"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_CROP "sdext:Minimizer:Wizard:Step3:CBCrop"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_LB_DPI "sdext:Minimizer:Wizard:Step3:LBDPI" // TODO change in help
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_CB_LINKS "sdext:Minimizer:Wizard:Step3:CBLinks"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_MF_QUALITY "sdext:Minimizer:Wizard:Step3:MFQuality"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_RB_JPEG "sdext:Minimizer:Wizard:Step3:RBJPEG"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP3_RB_LOSSLESS "sdext:Minimizer:Wizard:Step3:RBLossless"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP4 "sdext:Minimizer:Wizard:Step4"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP4_CB_OLE "sdext:Minimizer:Wizard:Step4:CBOLE"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP4_RB_ALLOLE "sdext:Minimizer:Wizard:Step4:RBAllOLE"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP4_RB_NOTODF "sdext:Minimizer:Wizard:Step4:RBNotODF"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP5 "sdext:Minimizer:Wizard:Step5"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP5_RB_CURDOC "sdext:Minimizer:Wizard:Step5:RBCurDoc"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP5_RB_NEWDOC "sdext:Minimizer:Wizard:Step5:RBNewDoc"
-#define HID_SDEXT_MINIMIZER_WIZ_STEP5_CB_SAVESETTINGS "sdext:Minimizer:Wizard:Step5:CBSaveSetts" // TODO ADD to help
-#define HID_SDEXT_MINIMIZER_WIZ_STEP5_LB_SETTINGSNAME "sdext:Minimizer:Wizard:Step5:LBSettsName" // TODO ADD to help
-#define HID_SDEXT_MINIMIZER_WIZ_PB_HELP "sdext:Minimizer:Wizard:PBHelp" // TODO ADD to help
-#define HID_SDEXT_MINIMIZER_WIZ_PB_BACK "sdext:Minimizer:Wizard:PBBack"
-#define HID_SDEXT_MINIMIZER_WIZ_PB_NEXT "sdext:Minimizer:Wizard:PBNext"
-#define HID_SDEXT_MINIMIZER_WIZ_PB_FINISH "sdext:Minimizer:Wizard:PBFinish"
-#define HID_SDEXT_MINIMIZER_WIZ_PB_CANCEL "sdext:Minimizer:Wizard:PBCancel"
-#define HID_SDEXT_MINIMIZER_INFOBOX_DLG "sdext:Minimizer:InfoBox:Dialog"
-#define HID_SDEXT_MINIMIZER_INFOBOX_CB_OPENNEW "sdext:Minimizer:InfoBox:CBOpenNew"
-
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index feabd71..1e43242 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -30,8 +30,8 @@
#include "pagecollector.hxx"
#include "informationdialog.hxx"
-#include "minimizer.hrc"
-
+#include <unotools/localfilehelper.hxx>
+#include <unotools/processfactory.hxx>
#include <vector>
#include "com/sun/star/util/URL.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
@@ -43,9 +43,12 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/frame/XStorable.hpp>
+#ifndef _COM_SUN_STAR_FRAME_FrameSearchFlag_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#endif
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <unotools/configmgr.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
@@ -58,7 +61,9 @@
#include <com/sun/star/presentation/XPresentationPage.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XExporter.hpp>
+#ifndef _COM_SUN_STAR_UNO_RUNTIME_EXCEPTION_HPP_
#include <com/sun/star/uno/RuntimeException.hpp>
+#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/graphic/GraphicType.hpp>
@@ -68,6 +73,7 @@
#include <com/sun/star/util/URL.hpp>
using namespace ::std;
+using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::awt;
@@ -82,8 +88,6 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::presentation;
-using ::rtl::OUString;
-
void ImpExtractCustomShow( const Reference< XModel >& rxModel, const OUString& rCustomShowName )
{
vector< Reference< XDrawPage > > vNonUsedPageList;
@@ -262,7 +266,7 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
}
}
-Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxContext,
+Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxMSF,
const Reference< XGraphic >& xGraphic, const awt::Size& aLogicalSize, const text::GraphicCrop& aGraphicCropLogic,
const GraphicSettings& rGraphicSettings )
{
@@ -297,7 +301,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
// cropping has to be removed from SourceSizePixel
if ( aGraphicCropLogic.Left || aGraphicCropLogic.Top || aGraphicCropLogic.Right || aGraphicCropLogic.Bottom )
{
- const awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
+ const awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
if ( bRemoveCropArea )
bNeedsOptimizing = sal_True;
@@ -346,9 +350,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
}
if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height )
{
- Reference< XStream > xTempFile( rxContext->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxContext ), UNO_QUERY_THROW );
+ Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW );
Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
- Reference< XGraphicProvider > xGraphicProvider( rxContext->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxContext ), UNO_QUERY_THROW );
+ Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW );
ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic );
Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
@@ -366,9 +370,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
else // this is a metafile
{
rtl::OUString aDestMimeType( aSourceMimeType );
- Reference< XStream > xTempFile( rxContext->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxContext ), UNO_QUERY_THROW );
+ Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW );
Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
- Reference< XGraphicProvider > xGraphicProvider( rxContext->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxContext ), UNO_QUERY_THROW );
+ Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW );
ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic );
Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
@@ -386,7 +390,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
return xNewGraphic;
}
-void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxContext, const GraphicSettings& rGraphicSettings,
+void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxMSF, const GraphicSettings& rGraphicSettings,
std::vector< GraphicCollector::GraphicEntity >& rGraphicList )
{
try
@@ -421,8 +425,8 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
if ( xGraphic.is() )
{
Reference< XPropertySet > xNewGraphicPropertySet( xGraphic, UNO_QUERY_THROW );
- awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
- Reference< XGraphic > xNewGraphic( ImpCompressGraphic( rxContext, xGraphic, aGraphicIter->maLogicalSize, aGraphicIter->maGraphicCropLogic, aGraphicSettings ) );
+ awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxMSF, xGraphic ) );
+ Reference< XGraphic > xNewGraphic( ImpCompressGraphic( rxMSF, xGraphic, aGraphicIter->maLogicalSize, aGraphicIter->maGraphicCropLogic, aGraphicSettings ) );
if ( xNewGraphic.is() )
{
// applying graphic to each user
@@ -442,7 +446,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
if ( !aGraphicSettings.mbRemoveCropArea )
{
- awt::Size aNewSize( GraphicCollector::GetOriginalSize( rxContext, xNewGraphic ) );
+ awt::Size aNewSize( GraphicCollector::GetOriginalSize( rxMSF, xNewGraphic ) );
aGraphicCropLogic.Left = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Left * ((double)aNewSize.Width / (double)aSize100thMM.Width));
aGraphicCropLogic.Top = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Top * ((double)aNewSize.Height / (double)aSize100thMM.Height));
aGraphicCropLogic.Right = (sal_Int32)((double)aGraphicUserIter->maGraphicCropLogic.Right * ((double)aNewSize.Width / (double)aSize100thMM.Width));
@@ -493,8 +497,8 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
// - ImpOptimizer -
// ----------------
-ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel ) :
- mxContext ( rxContext ),
+ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel ) :
+ mxMSF ( rxMSF ),
mxModel ( rxModel ),
mbJPEGCompression ( sal_False ),
mnJPEGQuality ( 90 ),
@@ -508,35 +512,30 @@ ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, con
mbDeleteNotesPages ( sal_False ),
mbOpenNewDocument ( sal_True )
{
- OSL_TRACE("ImpOptimizer::ImpOptimizer");
- Reference< XController > xController( mxModel->getCurrentController() );
- if (xController.is() )
- mxFrame.set( xController->getFrame() );
}
// -----------------------------------------------------------------------------
ImpOptimizer::~ImpOptimizer()
{
- OSL_TRACE("ImpOptimizer::~ImpOptimizer");
}
// -----------------------------------------------------------------------------
void ImpOptimizer::DispatchStatus()
{
- if ( mxStatusListener.is() )
+ if ( mxStatusDispatcher.is() )
{
- FeatureStateEvent aState;
- aState.IsEnabled = sal_True;
- aState.State <<= GetStatusSequence();
- mxStatusListener->statusChanged( aState );
+ URL aURL;
+ aURL.Protocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) );
+ aURL.Path = OUString( RTL_CONSTASCII_USTRINGPARAM( "statusupdate" ) );
+ mxStatusDispatcher->dispatch( aURL, GetStatusSequence() );
}
}
// -----------------------------------------------------------------------------
-sal_Bool ImpOptimizer::ImplOptimize()
+sal_Bool ImpOptimizer::Optimize()
{
if ( maCustomShowName.getLength() )
@@ -545,7 +544,7 @@ sal_Bool ImpOptimizer::ImplOptimize()
if ( mbDeleteUnusedMasterPages )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
DispatchStatus();
ImpDeleteUnusedMasterPages( mxModel );
}
@@ -553,14 +552,14 @@ sal_Bool ImpOptimizer::ImplOptimize()
if ( mbDeleteHiddenSlides )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
DispatchStatus();
ImpDeleteHiddenSlides( mxModel );
}
if ( mbDeleteNotesPages )
{
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_DELETING_SLIDES ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_DELETING_SLIDES ) ) );
DispatchStatus();
ImpDeleteNotesPages( mxModel );
}
@@ -568,7 +567,7 @@ sal_Bool ImpOptimizer::ImplOptimize()
if ( mbOLEOptimization )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_CREATING_OLE_REPLACEMENTS ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_CREATING_OLE_REPLACEMENTS ) ) );
DispatchStatus();
ImpConvertOLE( mxModel, mnOLEOptimizationType );
}
@@ -576,13 +575,13 @@ sal_Bool ImpOptimizer::ImplOptimize()
if ( mbJPEGCompression || mbRemoveCropArea || mnImageResolution )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 50 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_OPTIMIZING_GRAPHICS ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_OPTIMIZING_GRAPHICS ) ) );
DispatchStatus();
std::vector< GraphicCollector::GraphicEntity > aGraphicList;
GraphicSettings aGraphicSettings( mbJPEGCompression, mnJPEGQuality, mbRemoveCropArea, mnImageResolution, mbEmbedLinkedGraphics );
- GraphicCollector::CollectGraphics( mxContext, mxModel, aGraphicSettings, aGraphicList );
- CompressGraphics( *this, mxContext, aGraphicSettings, aGraphicList );
+ GraphicCollector::CollectGraphics( mxMSF, mxModel, aGraphicSettings, aGraphicList );
+ CompressGraphics( *this, mxMSF, aGraphicSettings, aGraphicList );
}
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 100 ) ) );
DispatchStatus();
@@ -613,12 +612,10 @@ static void DispatchURL( Reference< XComponentContext > xMSF, OUString sURL, Ref
sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
- OSL_TRACE("ImpOptimizer::Optimize");
sal_Bool bRet = sal_True;
if ( mxModel.is() )
{
- Reference< XWindowPeer > xParentWindow;
sal_Int64 nEstimatedFileSize = 0;
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 0 ) ) );
DispatchStatus();
@@ -628,8 +625,8 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
switch( TKGet( rArguments[ i ].Name ) )
{
- case TK_StatusListener : rArguments[ i ].Value >>= mxStatusListener; break;
- case TK_ParentWindow: rArguments[ i ].Value >>= xParentWindow; break;
+ case TK_StatusDispatcher : rArguments[ i ].Value >>= mxStatusDispatcher; break;
+ case TK_InformationDialog: rArguments[ i ].Value >>= mxInformationDialog; break;
case TK_Settings :
{
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aSettings;
@@ -671,7 +668,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_DUPLICATING_PRESENTATION ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
DispatchStatus();
Reference< XStorable >xStorable( mxModel, UNO_QUERY );
@@ -693,11 +690,11 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
nSourceSize = PPPOptimizer::GetFileSize( maSaveAsURL );
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 30 ) ) );
- SetStatusValue( TK_Status, Any( ConfigurationAccess::getString( STR_DUPLICATING_PRESENTATION ) ) );
+ SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
DispatchStatus();
- Reference< XDesktop > xDesktop( mxContext->getServiceManager()->createInstanceWithContext(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), mxContext ), UNO_QUERY );
+ Reference< XDesktop > xDesktop( mxMSF->getServiceManager()->createInstanceWithContext(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), mxMSF ), UNO_QUERY );
Reference< XFrame > xFrame( xDesktop, UNO_QUERY );
xSelf = xFrame->findFrame( TKGet( TK__blank ), FrameSearchFlag::CREATE );
Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY );
@@ -715,15 +712,15 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
if ( xStorable.is() && !xStorable->isReadonly() )
{
mxModel->lockControllers();
- bRet = ImplOptimize();
+ bRet = Optimize();
mxModel->unlockControllers();
// clearing undo stack:
- Reference< XFrame > xFrame( mxFrame );
+ Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog );
if ( xFrame.is() )
{
const OUString sSlot( RTL_CONSTASCII_USTRINGPARAM( "slot:27115" ) );
- DispatchURL( mxContext, sSlot, xFrame );
+ DispatchURL( mxMSF, sSlot, xFrame );
}
}
@@ -736,11 +733,9 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
}
}
- if ( xParentWindow.is() )
+ if ( mxInformationDialog.is() )
{
- InformationDialog aInformationDialog(
- mxContext, xParentWindow, maSaveAsURL, mbOpenNewDocument,
- nSourceSize, nDestSize, nEstimatedFileSize );
+ InformationDialog aInformationDialog( mxMSF, mxInformationDialog, maSaveAsURL, mbOpenNewDocument, nSourceSize, nDestSize, nEstimatedFileSize );
aInformationDialog.execute();
SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) );
DispatchStatus();
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 97e3152..b2606f1 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
class Point;
class Size;
@@ -48,9 +47,9 @@ class ImpOptimizer : public OptimizationStats
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF;
com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
- com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > mxStatusListener;
+ com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
sal_Bool mbJPEGCompression;
sal_Int32 mnJPEGQuality;
@@ -67,9 +66,9 @@ private:
rtl::OUString maFilterName;
sal_Bool mbOpenNewDocument;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
+ com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog;
- sal_Bool ImplOptimize();
+ sal_Bool Optimize();
public:
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 6a60a51..7074adf 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -26,19 +26,12 @@
#include "informationdialog.hxx"
#include "optimizationstats.hxx"
-#include "minimizer.hrc"
-#include "helpid.hrc"
-
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/awt/XUnitConversion.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/graphic/GraphicType.hpp>
#include <rtl/ustrbuf.hxx>
#include "com/sun/star/util/URL.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
-#include <com/sun/star/util/MeasureUnit.hpp>
-#include <com/sun/star/awt/PosSize.hpp>
#define DIALOG_WIDTH 240
#define DIALOG_HEIGHT 80
@@ -50,6 +43,7 @@
// - INFORMATIONDIALOG -
// ---------------------
+using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::ui;
@@ -62,19 +56,12 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::script;
using namespace ::com::sun::star::container;
-using ::rtl::OUString;
+
// -----------------------------------------------------------------------------
-Reference< XFixedText > InformationDialog::InsertFixedText(
- const rtl::OUString& rControlName,
- const OUString& rLabel,
- sal_Int32 nXPos,
- sal_Int32 nYPos,
- sal_Int32 nWidth,
- sal_Int32 nHeight,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list