fdo#61950 De-extensionize presentation minimizer

Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
author: David Ostrovsky <david@ostrovsky.org> 2013-10-05 23:07:24 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2013-10-14 12:21:39 +0200
commit: 2aa5d13ed09c1cbad9f1da315442edfa6f9f3b60 (patch)
tree: 58a3d348f244247434c21eb9606b8a38726dad2c
parent: a979956012a277c9cb85147605b9671ace12aa0a (diff)
45 files changed, 177 insertions, 401 deletions
diff --git a/README.cross b/README.cross
index 6b68fde1713c..5c565a34dea3 100644
--- a/README.cross
+++ b/README.cross
@@ -145,11 +145,9 @@ CXX_FOR_BUILD=ccache g++
 --disable-activex
 --disable-directx
 --disable-ext-nlpsolver
---disable-ext-presenter-minimizer
---disable-ext-report-builder
---disable-ext-scripting-beanshell
---disable-ext-scripting-javascript
---disable-ext-wiki-publisher
+--disable-report-builder
+--disable-scripting-beanshell
+--disable-scripting-javascript
 --disable-ext-wiki-publisher
 --disable-pdfimport
 --enable-python=system
diff --git a/Repository.mk b/Repository.mk
index e43db47f46ee..0c60145a31d7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -174,6 +174,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
 	animcore \
 	placeware \
 	PresenterScreen \
+	PresentationMinimizer \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
@@ -645,7 +646,6 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
-	SunPresentationMinimizer \
 	mysqlc \
 	passive_native \
 ))
diff --git a/config_host.mk.in b/config_host.mk.in
index 8aceea30a7fc..820cb6a78ee9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -139,7 +139,6 @@ export ENABLE_LWP=@ENABLE_LWP@
 export ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=@ENABLE_MACOSX_MACLIKE_APP_STRUCTURE@
 export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
 export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
-export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
 export ENABLE_MARIADBC=@ENABLE_MARIADBC@
 export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
 export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@
diff --git a/configure.ac b/configure.ac
index 5960eb71649d..b7258d034532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -753,11 +753,6 @@ AC_ARG_ENABLE(ext-mariadb-connector,
         [Enable the build of the MariaDB/MySQL Connector extension.])
 )
 
-AC_ARG_ENABLE(ext-presenter-minimizer,
-    AS_HELP_STRING([--disable-ext-presenter-minimizer],
-        [Disable the Presentation Minimizer extension.])
-)
-
 AC_ARG_ENABLE(report-builder,
     AS_HELP_STRING([--disable-report-builder],
         [Disable the Report Builder.])
@@ -10368,18 +10363,6 @@ fi
 
 AC_SUBST(ENABLE_OPENCL)
 
-# presenter minimizer extension?
-AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then
-    AC_MSG_RESULT([yes])
-    ENABLE_MINIMIZER=TRUE
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MINIMIZER"
-else
-    AC_MSG_RESULT([no])
-    ENABLE_MINIMIZER=
-fi
-AC_SUBST(ENABLE_MINIMIZER)
-
 # pdf import?
 AC_MSG_CHECKING([whether to build the PDF import feature])
 ENABLE_PDFIMPORT=
@@ -10458,7 +10441,7 @@ fi
 AC_SUBST(SYSTEM_SERVLETAPI)
 AC_SUBST(SERVLETAPI_JAR)
 
-AC_MSG_CHECKING([whether to build the Report Builder extension])
+AC_MSG_CHECKING([whether to build the Report Builder])
 if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
     AC_MSG_RESULT([yes])
     ENABLE_REPORTBUILDER=TRUE
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index b503095b62ac..1f6a94d22291 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,7 +1,6 @@
 --host=arm-linux-androideabi
 --disable-cairo-canvas
 --disable-cups
---disable-ext-presenter-minimizer
 --disable-gconf
 --disable-gnome-vfs
 --disable-gstreamer-0-10
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index db6c37eb4f85..3c0482119a78 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -1,7 +1,6 @@
 --host=i686-linux-androideabi
 --disable-cairo-canvas
 --disable-cups
---disable-ext-presenter-minimizer
 --disable-gconf
 --disable-gnome-vfs
 --disable-gstreamer-0-10
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index d9cd2d7f4da7..d0f2b6dbbf4b 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -31,7 +31,6 @@
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
---enable-ext-presenter-minimizer
 --enable-ext-nlpsolver
 --enable-epm
 --enable-python=internal
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 367d4c80fe95..81b626c106a5 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -2,7 +2,6 @@
 --enable-epm
 --enable-scripting-beanshell
 --enable-scripting-javascript
---enable-ext-presenter-minimizer
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-extension-integration
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 9967da547f36..64e69c75fdcb 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -9,7 +9,6 @@
 --disable-randr-link
 --enable-gstreamer-0-10
 --enable-lockdown
---enable-ext-presenter-minimizer
 --enable-ext-wiki-publisher
 --enable-python=system
 --with-alloc=system
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 3e99f7416506..532fc313baa0 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -8,7 +8,6 @@
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
---enable-ext-presenter-minimizer
 --enable-ext-nlpsolver
 --enable-online-update
 --enable-win-mozab-driver
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 7a3da9c073fc..fecce8093e0b 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -32,7 +32,6 @@
 --enable-extensions
 --enable-extension-integration
 --enable-ext-wiki-publisher
---enable-ext-presenter-minimizer
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-google-docs
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index dafe593c6af2..98802c2b025e 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -13,7 +13,6 @@
 --with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
 --enable-extension-integration
 --enable-ext-wiki-publisher
---enable-ext-presenter-minimizer
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-google-docs
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index cb27ffcc0a52..5f0d725477cd 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d
 	org/openoffice/Office/Addons.xcu \
 	org/openoffice/Office/Common.xcu \
 	org/openoffice/Office/DataAccess.xcu \
+	org/openoffice/Office/PresentationMinimizer.xcu \
 	org/openoffice/Office/PresenterScreen.xcu \
 	org/openoffice/Office/TableWizard.xcu \
 	org/openoffice/Office/UI.xcu \
diff --git a/officecfg/files.mk b/officecfg/files.mk
index 3110805deeab..904f4b70a250 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -41,6 +41,7 @@ officecfg_XCSFILES := \
     Office/OOoImprovement/Settings \
     Office/OptionsDialog \
     Office/Paths \
+    Office/PresentationMinimizer \
     Office/PresenterScreen \
     Office/ProtocolHandler \
     Office/Recovery \
diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
index cecba99e6f20..b0caea26dcaf 100644
--- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
@@ -8,8 +8,8 @@
  *
 -->
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Addons" oor:package="org.openoffice.Office">
-  <node oor:name="AddonUI" install:module="librelogo">
-    <node oor:name="OfficeToolBar">
+  <node oor:name="AddonUI">
+    <node oor:name="OfficeToolBar" install:module="librelogo">
       <node oor:name="LibreLogo.OfficeToolBar" oor:op="replace">
         <node oor:name="m01" oor:op="replace">
           <prop oor:name="Context" oor:type="xs:string">
@@ -159,8 +159,47 @@
         </node>
       </node>
     </node>
+    <node oor:name="OfficeMenuBarMerging">
+      <node oor:name="PresentationMinimizer" oor:op="replace" install:module="impress">
+        <node oor:name="Command1" oor:op="replace">
+          <prop oor:name="MergePoint">
+            <value>.uno:ToolsMenu\.uno:AVMediaPlayer</value>
+          </prop>
+          <prop oor:name="MergeCommand">
+            <value>AddAfter</value>
+          </prop>
+          <prop oor:name="MergeFallback">
+            <value>AddPath</value>
+          </prop>
+          <prop oor:name="MergeContext">
+            <value>com.sun.star.presentation.PresentationDocument</value>
+          </prop>
+          <node oor:name="MenuItems">
+            <node oor:name="PresentationMinimizerExecute1" oor:op="replace">
+              <prop oor:name="URL" oor:type="xs:string">
+                <value>private:separator</value>
+              </prop>
+            </node>
+            <node oor:name="PresentationMinimizerExecute2" oor:op="replace">
+              <prop oor:name="URL" oor:type="xs:string">
+                <value>vnd.com.sun.star.comp.PresentationMinimizer:execute</value>
+              </prop>
+                <prop oor:name="Title" oor:type="xs:string">
+                  <value xml:lang="en-US">~Minimize Presentation...</value>
+                </prop>
+                <prop oor:name="Target" oor:type="xs:string">
+                  <value>_self</value>
+                </prop>
+              <prop oor:name="Context" oor:type="xs:string">
+                <value>com.sun.star.presentation.PresentationDocument</value>
+              </prop>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node oor:name="Images">
-      <node oor:name="logo-forward" oor:op="replace">
+      <node oor:name="logo-forward" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$goforward?language=Python&amp;location=share</value>
         </prop>
@@ -173,7 +212,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-backward" oor:op="replace">
+      <node oor:name="logo-backward" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$gobackward?language=Python&amp;location=share</value>
         </prop>
@@ -186,7 +225,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-left" oor:op="replace">
+      <node oor:name="logo-left" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$left?language=Python&amp;location=share</value>
         </prop>
@@ -199,7 +238,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-right" oor:op="replace">
+      <node oor:name="logo-right" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$right?language=Python&amp;location=share</value>
         </prop>
@@ -212,7 +251,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-run" oor:op="replace">
+      <node oor:name="logo-run" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$run?language=Python&amp;location=share</value>
         </prop>
@@ -225,7 +264,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-stop" oor:op="replace">
+      <node oor:name="logo-stop" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$stop?language=Python&amp;location=share</value>
         </prop>
@@ -238,7 +277,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-home" oor:op="replace">
+      <node oor:name="logo-home" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$home?language=Python&amp;location=share</value>
         </prop>
@@ -251,7 +290,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-clearscreen" oor:op="replace">
+      <node oor:name="logo-clearscreen" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$clearscreen?language=Python&amp;location=share</value>
         </prop>
@@ -264,7 +303,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-translate" oor:op="replace">
+      <node oor:name="logo-translate" oor:op="replace" install:module="librelogo">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$__translate__?language=Python&amp;location=share</value>
         </prop>
@@ -277,6 +316,25 @@
           </prop>
         </node>
       </node>
+      <node oor:name="opt-image" oor:op="replace" install:module="impress">
+        <prop oor:name="URL">
+          <value>vnd.com.sun.star.comp.PresentationMinimizer:execute</value>
+        </prop>
+        <node oor:name="UserDefinedImages">
+          <prop oor:name="ImageSmallURL" oor:type="xs:string">
+            <value>bitmaps/opt_16.png</value>
+          </prop>
+          <prop oor:name="ImageBigURL" oor:type="xs:string">
+            <value>bitmaps/opt_26.png</value>
+          </prop>
+          <prop oor:name="ImageSmallHCURL" oor:type="xs:string">
+            <value>bitmaps/opt_16_h.png</value>
+          </prop>
+          <prop oor:name="ImageBigHCURL" oor:type="xs:string">
+            <value>bitmaps/opt_26_h.png</value>
+          </prop>
+        </node>
+      </node>
     </node>
   </node>
 </oor:component-data>
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 8477159121f5..2780c7df5472 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="SunPresentationMinimizer" oor:package="org.openoffice.Office.extension">
-
+<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office" oor:name="PresentationMinimizer">
     <prop oor:name="BitmapPath" oor:type="xs:string">
-        <value>%origin%/../../../../../../bitmaps</value>
+        <value>bitmaps</value>
     </prop>
 
     <node oor:name="Strings">
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 5da3552c4404..8bb848aebd10 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -64,5 +64,11 @@
         <value>vnd.org.libreoffice.presenterscreen:*</value>
       </prop>
     </node>
+    <node oor:name="com.sun.star.comp.PresentationMinimizerImp"
+          oor:op="replace" install:module="impress">
+      <prop oor:name="Protocols" oor:type="oor:string-list">
+        <value>vnd.com.sun.star.comp.PresentationMinimizer:*</value>
+      </prop>
+    </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 824eb6291347..cd60399be07f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1858,6 +1858,11 @@
           <value xml:lang="en-US">Insert Slide</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>
+      </node>
     </node>
   </node>
 </oor:component-data>
diff --git a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
index a80c249def94..947a15e9c274 100644
--- a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
@@ -16,7 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<oor:component-schema oor:name="SunPresentationMinimizer" oor:package="org.openoffice.Office.extension" xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-US" oor:package="org.openoffice.Office" oor:name="PresentationMinimizer">
+ <info>
+    <desc>Configuration of the Presentation Minimizer.</desc>
+ </info>
+ <import oor:component="org.openoffice.Office.Impress"/>
 	<templates>
 		<group oor:name="OptimizerSettings">
             <info>
@@ -69,7 +73,7 @@
 					<desc>Specifies if linked graphics are to be embedded</desc>
 				</info>
 				<value>true</value>
-			</prop>	
+			</prop>
 			<prop oor:name="OLEOptimization" oor:type="xs:boolean">
 				<info>
 					<desc>Specifies if OLE Objects are converted to Graphic objects at all</desc>
@@ -213,7 +217,7 @@
 			<prop oor:name="STR_EMBED_LINKED_GRAPHICS" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_EMBED_LINKED_GRAPHICS.</desc></info>
 				<value>~Break links to external graphics</value>
-			</prop>		
+			</prop>
 			<prop oor:name="STR_OLE_OBJECTS" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_OLE_OBJECTS.</desc></info>
 				<value>OLE Objects</value>
@@ -347,7 +351,7 @@ The current presentation contains no OLE objects.</value>
 			<prop oor:name="STR_YES" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_YES.</desc></info>
 				<value>~Yes</value>
-			</prop>			
+			</prop>
             <prop oor:name="STR_OK" oor:type="xs:string" oor:localized="true">
 		<info><desc>String STR_OK.</desc></info>
                 <value>OK</value>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 4b04f9c66449..80400515edb5 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -92,9 +92,11 @@ postprocess_FILES_graphicfilter := \
 
 postprocess_DEPS_impress := main
 postprocess_FILES_impress := \
+	$(postprocess_XCS)/Office/PresentationMinimizer.xcs \
 	$(postprocess_XCS)/Office/PresenterScreen.xcs \
 	$(postprocess_XCS)/Office/UI/Effects.xcs \
 	$(postprocess_XCS)/Office/UI/ImpressWindowState.xcs \
+	$(postprocess_XCU)/Office/PresentationMinimizer.xcu \
 	$(postprocess_XCU)/Office/PresenterScreen.xcu \
 	$(postprocess_XCU)/Office/UI/Effects.xcu \
 	$(postprocess_XCU)/Office/UI/ImpressWindowState.xcu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 98bff53282ee..42ebcd1108f1 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	sd/util/sdd \
 	sd/util/sdfilt \
 	sdext/source/presenter/presenter \
+	sdext/source/minimizer/minimizer \
 	sfx2/util/sfx \
 	slideshow/util/slideshow \
 	sot/util/sot \
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index ebad203e6567..84d65a5088fd 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -22,17 +22,6 @@
 
 #ifdef WITH_EXTENSION_INTEGRATION
 
-/* ** Presentation Minimizer ** */
-
-#ifdef WITH_EXTENSION_MINIMIZER
-
-Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "presentation-minimizer";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 272328e289d4..77b99b1329a3 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -22,19 +22,6 @@
 
 #ifdef WITH_EXTENSION_INTEGRATION
 
-/* ** Presentation Minimizer ** */
-
-#ifdef WITH_EXTENSION_MINIMIZER
-
-File gid_File_Oxt_Presentation_Minimizer
-    TXT_FILE_BODY;
-    Styles = (PACKED, FILELIST);
-    Dir = FILELIST_DIR;
-    Name = "Extension/presentation-minimizer.filelist";
-End
-
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index c024341676b6..b088131f9ca4 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -31,21 +31,6 @@ End
 
 #ifdef WITH_EXTENSION_INTEGRATION
 
-/* ** Presentation Minimizer ** */
-
-#ifdef WITH_EXTENSION_MINIMIZER
-Module gid_Module_Optional_Extensions_MINIMIZER
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Presentation_Minimizer );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
 /* ** MediaWiki Publisher** */
 
 #ifndef WITHOUT_EXTENSION_MEDIAWIKI
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index b2aab9860a40..6d538035ca40 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -22,12 +22,6 @@ en-US = "Extensions"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
 en-US = "Useful %PRODUCTNAME extensions."
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-en-US = "Presentation Minimizer"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-en-US = "Presentation Minimizer"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
 en-US = "MediaWiki Publisher"
 
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index f82d11e38fdf..1c63092e1788 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -455,6 +455,8 @@
 #define SID_ADD_MOTION_PATH                 (SID_SD_START+442)
 #define SID_TABLE_TOOLBOX                   (SID_SD_START+443)
 
+// free
+#define SID_PRESENTATION_MINIMIZER         (SID_SD_START+450)
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index abd03ce5a4e4..d30139294edb 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -118,6 +118,7 @@
 #define CMD_SID_TP_EDIT_MASTER                      ".uno:TaskPaneEditMaster"
 #define CMD_SID_INSERTPAGE_LAYOUT_MENU              ".uno:TaskPaneInsertPage"
 #define CMD_SID_PHOTOALBUM                          ".uno:PhotoAlbumDialog"
+#define CMD_SID_PRESENTATION_MINIMIZER              ".uno:PresentationMinimizer"
 
 #endif
 
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index b06113e33dcd..857b30e7d30c 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2739,4 +2739,8 @@ interface DrawView
         ExecMethod = ExecutePropPanelAttr ;
         StateMethod = GetStatePropPanelAttr ;
     ]
+    SID_PRESENTATION_MINIMIZER
+    [
+        ExecMethod = FuTemporary ;
+    ]
 }
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 4fee33c88f4e..19e03d757c26 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -7251,3 +7251,28 @@ SfxVoidItem PhotoAlbumDialog SID_PHOTOALBUM
     ToolBoxConfig = TRUE,
     GroupId = GID_OPTIONS;
 ]
+
+//--------------------------------------------------------------------------
+SfxVoidItem PresentationMinimizer SID_PRESENTATION_MINIMIZER
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerItem;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_OPTIONS;
+]
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 969a17b55245..003835e1feec 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -26,6 +26,9 @@
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 
 #include <comphelper/processfactory.hxx>
 
@@ -167,6 +170,8 @@
 #include "unmodpg.hxx"
 #include <sfx2/sidebar/Sidebar.hxx>
 
+#include "ViewShellBase.hxx"
+
 namespace {
     const char CustomAnimationPanelId[] = "CustomAnimationPanel";
     const char SlideTransitionPanelId[] = "SlideTransitionPanel";
@@ -2799,6 +2804,27 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
+        case SID_PRESENTATION_MINIMIZER:
+        {
+            Reference<XComponentContext> xContext(::comphelper::getProcessComponentContext());
+            Reference<util::XURLTransformer> xParser(util::URLTransformer::create(xContext));
+            Reference<frame::XDispatchProvider> xProvider(GetViewShellBase().GetController()->getFrame(), UNO_QUERY);
+            if (xProvider.is())
+            {
+                util::URL aURL;
+                aURL.Complete = "vnd.com.sun.star.comp.PresentationMinimizer:execute";
+                xParser->parseStrict(aURL);
+                uno::Reference<frame::XDispatch> xDispatch(xProvider->queryDispatch(aURL, OUString(), 0));
+                if (xDispatch.is())
+                {
+                    xDispatch->dispatch(aURL, uno::Sequence< beans::PropertyValue >());
+                }
+            }
+            Cancel();
+            rReq.Ignore();
+        }
+        break;
+
         case SID_LAYER_DIALOG_WIN:
         {
             if ( rReq.GetArgs() )
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index a9ef76a12b06..b2d5ae6459d6 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -286,6 +286,8 @@
             <menu:menuitem menu:id=".uno:BmpMask"/>
             <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:PresentationMinimizer"/>
+            <menu:menuseparator/>
             <menu:menu menu:id=".uno:MacrosMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:MacroRecorder"/>
diff --git a/sdext/Configuration_minimizer.mk b/sdext/Configuration_minimizer.mk
deleted file mode 100644
index 31bfec218776..000000000000
--- a/sdext/Configuration_minimizer.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Configuration_Configuration,presentation-minimizer,nodeliver))
-
-$(eval $(call gb_Configuration_add_schemas,presentation-minimizer,sdext/source/minimizer/registry/schema,\
-    org/openoffice/Office/extension/SunPresentationMinimizer.xcs \
-))
-
-$(eval $(call gb_Configuration_add_datas,presentation-minimizer,sdext/source/minimizer/registry/data,\
-    org/openoffice/Office/ProtocolHandler.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,presentation-minimizer,sdext/source/minimizer/registry/data,\
-    org/openoffice/Office/Addons.xcu \
-    org/openoffice/Office/extension/SunPresentationMinimizer.xcu \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
deleted file mode 100644
index 70bce1607168..000000000000
--- a/sdext/Extension_minimizer.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer))
-
-$(eval $(call gb_Extension_use_default_description,presentation-minimizer))
-$(eval $(call gb_Extension_use_default_license,presentation-minimizer))
-
-$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\
-    SunPresentationMinimizer \
-))
-
-$(eval $(call gb_Extension_add_file,presentation-minimizer,components.rdb,$(call gb_Rdb_get_target,minimizer)))
-
-$(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
-    $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
-    $(SRCDIR)/icon-themes/galaxy/minimizer/minimizepresi_80.png \
-    $(SRCDIR)/icon-themes/galaxy/minimizer/opt_16.png \
-    $(SRCDIR)/icon-themes/galaxy/minimizer/opt_26.png \
-))
-
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
-
-$(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\
-    $(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
-    $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
-))
-
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
-
-# vim:set noet sw=4 ts=4:
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_PresentationMinimizer.mk
index 8210f71dfa37..e97f8dd072ad 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_PresentationMinimizer.mk
@@ -7,28 +7,28 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Library_Library,SunPresentationMinimizer))
+$(eval $(call gb_Library_Library,PresentationMinimizer))
 
-$(eval $(call gb_Library_set_componentfile,SunPresentationMinimizer,sdext/source/minimizer/minimizer))
+$(eval $(call gb_Library_set_componentfile,PresentationMinimizer,sdext/source/minimizer/minimizer))
 
-$(eval $(call gb_Library_use_externals,SunPresentationMinimizer,\
+$(eval $(call gb_Library_use_externals,PresentationMinimizer,\
 	boost_headers \
 ))
 
-$(eval $(call gb_Library_use_sdk_api,SunPresentationMinimizer))
+$(eval $(call gb_Library_use_sdk_api,PresentationMinimizer))
 
-$(eval $(call gb_Library_use_api,SunPresentationMinimizer,\
+$(eval $(call gb_Library_use_api,PresentationMinimizer,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\
+$(eval $(call gb_Library_use_libraries,PresentationMinimizer,\
     cppu \
     cppuhelper \
     sal \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,SunPresentationMinimizer,\
+$(eval $(call gb_Library_add_exception_objects,PresentationMinimizer,\
     sdext/source/minimizer/configurationaccess \
     sdext/source/minimizer/fileopendialog \
     sdext/source/minimizer/graphiccollector \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 506bb1a4103b..5299cd861889 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -13,14 +13,9 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Library_PresenterScreen \
 ))
 
-ifeq ($(ENABLE_MINIMIZER),TRUE)
 $(eval $(call gb_Module_add_targets,sdext,\
-    Configuration_minimizer \
-    Extension_minimizer \
-    Library_minimizer \
-    Rdb_minimizer \
+    Library_PresentationMinimizer \
 ))
-endif
 
 ifeq ($(ENABLE_PDFIMPORT),TRUE)
 $(eval $(call gb_Module_add_targets,sdext,\
diff --git a/sdext/Rdb_minimizer.mk b/sdext/Rdb_minimizer.mk
deleted file mode 100644
index a443d9abaecf..000000000000
--- a/sdext/Rdb_minimizer.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Rdb_Rdb,minimizer))
-
-$(eval $(call gb_Rdb_add_components,minimizer,\
-    sdext/source/minimizer/minimizer \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/sdext/source/minimizer/META-INF/manifest.xml b/sdext/source/minimizer/META-INF/manifest.xml
deleted file mode 100644
index a70fe27e848c..000000000000
--- a/sdext/source/minimizer/META-INF/manifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
-                       manifest:full-path="components.rdb"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-                       manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
-</manifest:manifest>
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 9d0bbbbf3759..2c0e38d52c79 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::container;
 
 static const OUString& GetPathToConfigurationRoot (void)
 {
-    static const OUString sPathToConfigurationRoot ("org.openoffice.Office.extension.SunPresentationMinimizer");
+    static const OUString sPathToConfigurationRoot ("org.openoffice.Office.PresentationMinimizer");
     return sPathToConfigurationRoot;
 }
 
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
deleted file mode 100644
index 879044b4b8fe..000000000000
--- a/sdext/source/minimizer/description.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- -->
-<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="com.sun.star.PresentationMinimizer-@PLATFORM@"/>
-
-    <dependencies>
-        <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
-    </dependencies>
-
-    <version value="1.0.4"/>
-
-    <platform value="@PLATFORM@"/>
-
-    <publisher>
-        <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
-    </publisher>
-
-    <display-name>
-        <name lang="en-US">Presentation Minimizer</name>
-    </display-name>
-
-    <icon>
-      <default xlink:href="bitmaps/extension_32.png" />
-    </icon>
-
-    <extension-description>
-      <src xlink:href="description-en-US.txt" lang="en-US" />
-    </extension-description>
-
-</description>
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 82ed6fe45031..86828a46148f 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -516,7 +516,7 @@ void ImpOptimizer::DispatchStatus()
     if ( mxStatusDispatcher.is() )
     {
         URL aURL;
-        aURL.Protocol = OUString( "vnd.com.sun.star.comp.SunPresentationMinimizer:"  );
+        aURL.Protocol = OUString( "vnd.com.sun.star.comp.PresentationMinimizer:"  );
         aURL.Path = OUString( "statusupdate"  );
         mxStatusDispatcher->dispatch( aURL, GetStatusSequence() );
     }
diff --git a/sdext/source/minimizer/minimizer.component b/sdext/source/minimizer/minimizer.component
index 02d467606bca..3c7b77402a85 100644
--- a/sdext/source/minimizer/minimizer.component
+++ b/sdext/source/minimizer/minimizer.component
@@ -13,7 +13,7 @@
     <implementation name="com.sun.star.comp.PPPOptimizerImp">
         <service name="com.sun.star.comp.PPPOptimizer"/>
     </implementation>
-    <implementation name="com.sun.star.comp.SunPresentationMinimizerImp">
-        <service name="com.sun.star.comp.SunPresentationMinimizer"/>
+    <implementation name="com.sun.star.comp.PresentationMinimizerImp">
+        <service name="com.sun.star.comp.PresentationMinimizer"/>
     </implementation>
 </component>
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 516c69a293af..0ff0ed30aaa5 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 
-#define SERVICE_NAME "com.sun.star.comp.SunPresentationMinimizer"
+#define SERVICE_NAME "com.sun.star.comp.PresentationMinimizer"
 #include <rtl/ustrbuf.hxx>
 
 // ----------------------
@@ -92,7 +92,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::query
     const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException )
 {
     Reference < XDispatch > xRet;
-    if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 )
+    if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) == 0 )
         xRet = this;
 
     return xRet;
@@ -122,7 +122,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
     throw( RuntimeException )
 {
 
-    if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 ) )
+    if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) == 0 ) )
     {
         if ( rURL.Path.compareToAscii( "execute" ) == 0 )
         {
@@ -185,7 +185,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatus
 
 OUString PPPOptimizerDialog_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.SunPresentationMinimizerImp" );
+    return OUString( "com.sun.star.comp.PresentationMinimizerImp" );
 }
 
 Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
deleted file mode 100644
index 574ed6e9cd4e..000000000000
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-    <node oor:name="AddonUI">
-        <node oor:name="Images">
-            <node oor:name="opt-image" oor:op="replace">
-                <prop oor:name="URL">
-                    <value>vnd.com.sun.star.comp.SunPresentationMinimizer:execute</value>
-                </prop>
-                <node oor:name="UserDefinedImages">
-                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
-                        <value>%origin%/../../../../../bitmaps/opt_16.png</value>
-                    </prop>
-                    <prop oor:name="ImageBigURL" oor:type="xs:string">
-                        <value>%origin%/../../../../../bitmaps/opt_26.png</value>
-                    </prop>
-                    <prop oor:name="ImageSmallHCURL" oor:type="xs:string">
-                        <value>%origin%/../../../../../bitmaps/opt_16_h.png</value>
-                    </prop>
-                    <prop oor:name="ImageBigHCURL" oor:type="xs:string">
-                        <value>%origin%/../../../../../bitmaps/opt_26_h.png</value>
-                    </prop>
-                </node>
-            </node>
-        </node>
-        <node oor:name="OfficeMenuBarMerging">
-            <node oor:name="SunPresentationMinimizer" oor:op="replace">
-                <node oor:name="Command1" oor:op="replace">
-                    <prop oor:name="MergePoint">
-                        <value>.uno:ToolsMenu\.uno:AVMediaPlayer</value>
-                    </prop>
-                    <prop oor:name="MergeCommand">
-                        <value>AddAfter</value>
-                    </prop>
-                    <prop oor:name="MergeFallback">
-                        <value>AddPath</value>
-                    </prop>
-                    <prop oor:name="MergeContext">
-                        <value>com.sun.star.presentation.PresentationDocument</value>
-                    </prop>
-                    <node oor:name="MenuItems">
-                        <node oor:name="SunPresentationMinimizerExecute1" oor:op="replace">
-                            <prop oor:name="URL" oor:type="xs:string">
-                                <value>private:separator</value>
-                            </prop>
-                        </node>
-                        <node oor:name="SunPresentationMinimizerExecute2" oor:op="replace">
-                            <prop oor:name="URL" oor:type="xs:string">
-                                <value>vnd.com.sun.star.comp.SunPresentationMinimizer:execute</value>
-                            </prop>
-                            <prop oor:name="Title" oor:type="xs:string">
-                                <value xml:lang="en-US">~Minimize Presentation...</value>
-                            </prop>
-                            <prop oor:name="Target" oor:type="xs:string">
-                                <value>_self</value>
-                            </prop>
-                            <prop oor:name="Context" oor:type="xs:string">
-                                <value>com.sun.star.presentation.PresentationDocument</value>
-                            </prop>
-                        </node>
-                    </node>
-                </node>
-            </node>
-        </node>
-    </node>
-</oor:component-data>
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu
deleted file mode 100644
index 661ecd23ff8e..000000000000
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ProtocolHandler" oor:package="org.openoffice.Office">
-    <node oor:name="HandlerSet">
-        <node oor:name="com.sun.star.comp.SunPresentationMinimizerImp" oor:op="replace">
-            <prop oor:name="Protocols" oor:type="oor:string-list">
-                <value>vnd.com.sun.star.comp.SunPresentationMinimizer:*</value>
-            </prop>
-        </node>
-    </node>
-</oor:component-data>
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 7392b6eafeae..2c6cfe1bc206 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -35,21 +35,6 @@
 # End
 
 Start
-module = "gid_Module_Optional_Extensions_MINIMIZER"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-presentation-minimizer"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-presentation-minimizer"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07 %PACKAGEVERSION %PACKAGEVERSION"
-linuxpatchrequires = ""
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Optional_Extensions_MEDIAWIKI"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mediawiki-publisher"
 solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
author	David Ostrovsky <david@ostrovsky.org>	2013-10-05 23:07:24 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2013-10-14 12:21:39 +0200
commit	2aa5d13ed09c1cbad9f1da315442edfa6f9f3b60 (patch)
tree	58a3d348f244247434c21eb9606b8a38726dad2c
parent	a979956012a277c9cb85147605b9671ace12aa0a (diff)