You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/03/26 13:56:58 UTC
svn commit: r1461102 [1/4] - in /openoffice/trunk/main: ./
default_images/minimizer/ default_images/res/commandimagelist/
helpcontent2/prj/ helpcontent2/source/text/simpress/
helpcontent2/source/text/simpress/minimizer/ helpcontent2/util/simpress/
offi...
Author: arielch
Date: Tue Mar 26 12:56:56 2013
New Revision: 1461102
URL: http://svn.apache.org/r1461102
Log:
i1457158 - Revert revision 1457160 and revision 1457158
Added:
openoffice/trunk/main/default_images/minimizer/opt_16.png
- copied unchanged from r1457157, openoffice/trunk/main/default_images/minimizer/opt_16.png
openoffice/trunk/main/default_images/minimizer/opt_16_h.png
- copied unchanged from r1457157, openoffice/trunk/main/default_images/minimizer/opt_16_h.png
openoffice/trunk/main/default_images/minimizer/opt_26.png
- copied unchanged from r1457157, openoffice/trunk/main/default_images/minimizer/opt_26.png
openoffice/trunk/main/default_images/minimizer/opt_26_h.png
- copied unchanged from r1457157, openoffice/trunk/main/default_images/minimizer/opt_26_h.png
openoffice/trunk/main/sdext/source/minimizer/delzip
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/delzip
openoffice/trunk/main/sdext/source/minimizer/description.xml
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/description.xml
openoffice/trunk/main/sdext/source/minimizer/help/
- copied from r1457159, openoffice/trunk/main/sdext/source/minimizer/help/
openoffice/trunk/main/sdext/source/minimizer/help/component.txt
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/help/component.txt
openoffice/trunk/main/sdext/source/minimizer/help/help_de.odt
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/help/help_de.odt
openoffice/trunk/main/sdext/source/minimizer/help/help_en-US.odt
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/help/help_en-US.odt
openoffice/trunk/main/sdext/source/minimizer/manifest.xml
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/manifest.xml
openoffice/trunk/main/sdext/source/minimizer/minimizer.pmk
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/minimizer.pmk
openoffice/trunk/main/sdext/source/minimizer/registry/
- copied from r1457159, openoffice/trunk/main/sdext/source/minimizer/registry/
openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu
openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/makefile.mk
openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/data/org/openoffice/Office/makefile.mk
openoffice/trunk/main/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
- copied unchanged from r1457157, openoffice/trunk/main/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
Removed:
openoffice/trunk/main/default_images/res/commandimagelist/lc_presentationminimizer.png
openoffice/trunk/main/default_images/res/commandimagelist/lch_presentationminimizer.png
openoffice/trunk/main/default_images/res/commandimagelist/sc_presentationminimizer.png
openoffice/trunk/main/default_images/res/commandimagelist/sch_presentationminimizer.png
openoffice/trunk/main/helpcontent2/source/text/simpress/minimizer/
openoffice/trunk/main/sdext/source/minimizer/PresentationMinimizer.component
openoffice/trunk/main/sdext/source/minimizer/helpid.hrc
openoffice/trunk/main/sdext/source/minimizer/minimizer.hrc
openoffice/trunk/main/sdext/source/minimizer/minimizer.src
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/extensions.lst
openoffice/trunk/main/helpcontent2/prj/build.lst
openoffice/trunk/main/helpcontent2/source/text/simpress/makefile.mk
openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/postprocess/prj/build.lst
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_lang_template.scp
openoffice/trunk/main/sd/inc/app.hrc
openoffice/trunk/main/sd/sdi/drviewsh.sdi
openoffice/trunk/main/sd/sdi/sdraw.sdi
openoffice/trunk/main/sd/source/ui/view/drviewse.cxx
openoffice/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml
openoffice/trunk/main/sdext/prj/build.lst
openoffice/trunk/main/sdext/prj/d.lst
openoffice/trunk/main/sdext/source/minimizer/configurationaccess.cxx
openoffice/trunk/main/sdext/source/minimizer/configurationaccess.hxx
openoffice/trunk/main/sdext/source/minimizer/fileopendialog.cxx
openoffice/trunk/main/sdext/source/minimizer/fileopendialog.hxx
openoffice/trunk/main/sdext/source/minimizer/graphiccollector.cxx
openoffice/trunk/main/sdext/source/minimizer/graphiccollector.hxx
openoffice/trunk/main/sdext/source/minimizer/impoptimizer.cxx
openoffice/trunk/main/sdext/source/minimizer/impoptimizer.hxx
openoffice/trunk/main/sdext/source/minimizer/informationdialog.cxx
openoffice/trunk/main/sdext/source/minimizer/informationdialog.hxx
openoffice/trunk/main/sdext/source/minimizer/makefile.mk
openoffice/trunk/main/sdext/source/minimizer/optimizationstats.cxx
openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.cxx
openoffice/trunk/main/sdext/source/minimizer/optimizerdialog.hxx
openoffice/trunk/main/sdext/source/minimizer/optimizerdialogcontrols.cxx
openoffice/trunk/main/sdext/source/minimizer/pagecollector.cxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.cxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizer.hxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizerdialog.cxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizerdialog.hxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizertoken.cxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizertoken.hxx
openoffice/trunk/main/sdext/source/minimizer/pppoptimizeruno.cxx
openoffice/trunk/main/sdext/source/minimizer/unodialog.cxx
openoffice/trunk/main/sdext/source/minimizer/unodialog.hxx
openoffice/trunk/main/set_soenv.in
Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Tue Mar 26 12:56:56 2013
@@ -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])
Modified: openoffice/trunk/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions.lst?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/extensions.lst (original)
+++ openoffice/trunk/main/extensions.lst Tue Mar 26 12:56:56 2013
@@ -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
Modified: openoffice/trunk/main/helpcontent2/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/prj/build.lst?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/prj/build.lst (original)
+++ openoffice/trunk/main/helpcontent2/prj/build.lst Tue Mar 26 12:56:56 2013
@@ -40,7 +40,6 @@ h2 helpcontent2\source\text\simpress\01
h2 helpcontent2\source\text\simpress\02 nmake - all helpcontent2_simp_02 helpcontent2_aux NULL
h2 helpcontent2\source\text\simpress\04 nmake - all helpcontent2_simp_04 helpcontent2_aux NULL
h2 helpcontent2\source\text\simpress\guide nmake - all helpcontent2_simp_guid helpcontent2_aux NULL
-h2 helpcontent2\source\text\simpress\minimizer nmake - all helpcontent2_simp_mini helpcontent2_aux NULL
h2 helpcontent2\source\text\smath nmake - all helpcontent2_smat helpcontent2_aux NULL
h2 helpcontent2\source\text\smath\00 nmake - all helpcontent2_smat_00 helpcontent2_aux NULL
h2 helpcontent2\source\text\smath\01 nmake - all helpcontent2_smat_01 helpcontent2_aux NULL
@@ -53,13 +52,13 @@ h2 helpcontent2\source\text\swriter\01
h2 helpcontent2\source\text\swriter\02 nmake - all helpcontent2_swri_02 helpcontent2_aux NULL
h2 helpcontent2\source\text\swriter\04 nmake - all helpcontent2_swri_04 helpcontent2_aux NULL
h2 helpcontent2\source\text\swriter\guide nmake - all helpcontent2_swri_guid helpcontent2_aux NULL
-h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\scalc nmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\sdraw nmake - all helpcontent2_ut_sdra helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\sdatabase nmake - all helpcontent2_ut_sdat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\shared nmake - all helpcontent2_ut_shar helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\simpress nmake - all helpcontent2_ut_simp helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\smath nmake - all helpcontent2_ut_smat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\swriter nmake - all helpcontent2_ut_swri helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\scalc nmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sdraw nmake - all helpcontent2_ut_sdra helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sdatabase nmake - all helpcontent2_ut_sdat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\shared nmake - all helpcontent2_ut_shar helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\simpress nmake - all helpcontent2_ut_simp helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\smath nmake - all helpcontent2_ut_smat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\swriter nmake - all helpcontent2_ut_swri helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
h2 helpcontent2\source\auxiliary nmake - all helpcontent2_aux NULL
Modified: openoffice/trunk/main/helpcontent2/source/text/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/simpress/makefile.mk?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/simpress/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/source/text/simpress/makefile.mk Tue Mar 26 12:56:56 2013
@@ -62,7 +62,7 @@ XHPFILES = \
main0212.xhp \
main0213.xhp \
main0214.xhp \
- main0503.xhp
+ main0503.xhp
# --- Targets ------------------------------------------------------
Modified: openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk (original)
+++ openoffice/trunk/main/helpcontent2/util/simpress/makefile.mk Tue Mar 26 12:56:56 2013
@@ -269,13 +269,6 @@ LINKLINKFILES= \
text$/simpress$/guide$/table_insert.xhp \
text$/simpress$/guide$/text2curve.xhp \
text$/simpress$/guide$/vectorize.xhp \
- text$/simpress$/minimizer$/main.xhp \
- text$/simpress$/minimizer$/step1.xhp \
- text$/simpress$/minimizer$/step2.xhp \
- text$/simpress$/minimizer$/step3.xhp \
- text$/simpress$/minimizer$/step4.xhp \
- text$/simpress$/minimizer$/step5.xhp \
- text$/simpress$/minimizer$/infobox.xhp \
text$/simpress$/main0000.xhp \
text$/simpress$/main0100.xhp \
text$/simpress$/main0101.xhp \
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu Tue Mar 26 12:56:56 2013
@@ -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>
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu Tue Mar 26 12:56:56 2013
@@ -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>
Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs Tue Mar 26 12:56:56 2013
@@ -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>
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Mar 26 12:56:56 2013
@@ -174,8 +174,7 @@ my_components = \
xmlfd \
xmx \
xsltdlg \
- xstor \
- PresentationMinimizer
+ xstor
.IF "$(OS)" == "MACOSX"
my_components += component/vcl/vcl.macosx
Modified: openoffice/trunk/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/prj/build.lst?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/prj/build.lst (original)
+++ openoffice/trunk/main/postprocess/prj/build.lst Tue Mar 26 12:56:56 2013
@@ -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
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Mar 26 12:56:56 2013
@@ -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);
Modified: openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp Tue Mar 26 12:56:56 2013
@@ -126,5 +126,3 @@ STD_RES_FILE( gid_File_Res_T602Filter, t
STD_RES_FILE( gid_File_Res_Forui, forui )
STD_RES_FILE( gid_File_Res_For, for )
-STD_RES_FILE( gid_File_Res_PresentationMinimizer, minimizer )
-
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Tue Mar 26 12:56:56 2013
@@ -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,
Modified: openoffice/trunk/main/scp2/source/ooo/module_lang_template.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_lang_template.scp?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_lang_template.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_lang_template.scp Tue Mar 26 12:56:56 2013
@@ -102,8 +102,7 @@ Module gid_Module_Langpack_Resource_Temp
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
Modified: openoffice/trunk/main/sd/inc/app.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/inc/app.hrc?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sd/inc/app.hrc (original)
+++ openoffice/trunk/main/sd/inc/app.hrc Tue Mar 26 12:56:56 2013
@@ -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
Modified: openoffice/trunk/main/sd/sdi/drviewsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/sdi/drviewsh.sdi?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sd/sdi/drviewsh.sdi (original)
+++ openoffice/trunk/main/sd/sdi/drviewsh.sdi Tue Mar 26 12:56:56 2013
@@ -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 ;
Modified: openoffice/trunk/main/sd/sdi/sdraw.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/sdi/sdraw.sdi?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sd/sdi/sdraw.sdi (original)
+++ openoffice/trunk/main/sd/sdi/sdraw.sdi Tue Mar 26 12:56:56 2013
@@ -5385,31 +5385,6 @@ SfxVoidItem PresentationDialog SID_PRESE
]
//--------------------------------------------------------------------------
-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
()
[
Modified: openoffice/trunk/main/sd/source/ui/view/drviewse.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviewse.cxx?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviewse.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviewse.cxx Tue Mar 26 12:56:56 2013
@@ -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
}
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;
}
Modified: openoffice/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml (original)
+++ openoffice/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml Tue Mar 26 12:56:56 2013
@@ -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>
Modified: openoffice/trunk/main/sdext/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/build.lst?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/build.lst (original)
+++ openoffice/trunk/main/sdext/prj/build.lst Tue Mar 26 12:56:56 2013
@@ -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
Modified: openoffice/trunk/main/sdext/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/d.lst?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/d.lst (original)
+++ openoffice/trunk/main/sdext/prj/d.lst Tue Mar 26 12:56:56 2013
@@ -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%
Modified: openoffice/trunk/main/sdext/source/minimizer/configurationaccess.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/configurationaccess.cxx?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/configurationaccess.cxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/configurationaccess.cxx Tue Mar 26 12:56:56 2013
@@ -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& GetConfigurationP
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==(
}
-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::~ConfigurationAcces
{
}
-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 > ConfigurationAcc
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 );
Modified: openoffice/trunk/main/sdext/source/minimizer/configurationaccess.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/configurationaccess.hxx?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/configurationaccess.hxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/configurationaccess.hxx Tue Mar 26 12:56:56 2013
@@ -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 );
Modified: openoffice/trunk/main/sdext/source/minimizer/fileopendialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/fileopendialog.cxx?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/fileopendialog.cxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/fileopendialog.cxx Tue Mar 26 12:56:56 2013
@@ -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::contai
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>"
Modified: openoffice/trunk/main/sdext/source/minimizer/fileopendialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/fileopendialog.hxx?rev=1461102&r1=1461101&r2=1461102&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/fileopendialog.hxx (original)
+++ openoffice/trunk/main/sdext/source/minimizer/fileopendialog.hxx Tue Mar 26 12:56:56 2013
@@ -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();