fdo#61950 De-extensionize presentation minimizer: post clean

Change-Id: I7d21f1d67b13fcd83792503e8c72ccf16fbda1ec
Reviewed-on: https://gerrit.libreoffice.org/6247
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

10 files changed, 25 insertions, 80 deletions

diff --git a/icon-themes/galaxy/minimizer/minimizepresi_80.png b/icon-themes/galaxy/sd/res/minimize_presi_80.png
index eac8d5d61403..eac8d5d61403 100644
--- a/icon-themes/galaxy/minimizer/minimizepresi_80.png
+++ b/icon-themes/galaxy/sd/res/minimize_presi_80.png
diff --git a/icon-themes/hicontrast/minimizer/opt_26.png b/icon-themes/hicontrast/cmd/lc_presentationminimizer.png
index 924ad50b71ee..924ad50b71ee 100644
--- a/icon-themes/hicontrast/minimizer/opt_26.png
+++ b/icon-themes/hicontrast/cmd/lc_presentationminimizer.png
diff --git a/icon-themes/hicontrast/minimizer/opt_16.png b/icon-themes/hicontrast/cmd/sc_presentationminimizer.png
index 7b7e85083c19..7b7e85083c19 100644
--- a/icon-themes/hicontrast/minimizer/opt_16.png
+++ b/icon-themes/hicontrast/cmd/sc_presentationminimizer.png
diff --git a/icon-themes/hicontrast/minimizer/minimizepresi_80.png b/icon-themes/hicontrast/sd/res/minimize_presi_80.png
index fecc7fa5e6c2..fecc7fa5e6c2 100644
--- a/icon-themes/hicontrast/minimizer/minimizepresi_80.png
+++ b/icon-themes/hicontrast/sd/res/minimize_presi_80.png
diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
index b0caea26dcaf..cecba99e6f20 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">
-    <node oor:name="OfficeToolBar" install:module="librelogo">
+  <node oor:name="AddonUI" install:module="librelogo">
+    <node oor:name="OfficeToolBar">
       <node oor:name="LibreLogo.OfficeToolBar" oor:op="replace">
         <node oor:name="m01" oor:op="replace">
           <prop oor:name="Context" oor:type="xs:string">
@@ -159,47 +159,8 @@
         </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" install:module="librelogo">
+      <node oor:name="logo-forward" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$goforward?language=Python&amp;location=share</value>
         </prop>
@@ -212,7 +173,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-backward" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-backward" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$gobackward?language=Python&amp;location=share</value>
         </prop>
@@ -225,7 +186,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-left" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-left" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$left?language=Python&amp;location=share</value>
         </prop>
@@ -238,7 +199,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-right" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-right" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$right?language=Python&amp;location=share</value>
         </prop>
@@ -251,7 +212,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-run" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-run" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$run?language=Python&amp;location=share</value>
         </prop>
@@ -264,7 +225,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-stop" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-stop" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$stop?language=Python&amp;location=share</value>
         </prop>
@@ -277,7 +238,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-home" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-home" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$home?language=Python&amp;location=share</value>
         </prop>
@@ -290,7 +251,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-clearscreen" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-clearscreen" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$clearscreen?language=Python&amp;location=share</value>
         </prop>
@@ -303,7 +264,7 @@
           </prop>
         </node>
       </node>
-      <node oor:name="logo-translate" oor:op="replace" install:module="librelogo">
+      <node oor:name="logo-translate" oor:op="replace">
         <prop oor:name="URL" oor:type="xs:string">
           <value>vnd.sun.star.script:LibreLogo|LibreLogo.py$__translate__?language=Python&amp;location=share</value>
         </prop>
@@ -316,25 +277,6 @@
           </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/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 2780c7df5472..84f9fa5aaf0b 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -18,10 +18,6 @@
  -->
 <!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>bitmaps</value>
-    </prop>
-
     <node oor:name="Strings">
         <prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2">
             <value xml:lang="en-US">Presentation Minimizer</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
index 947a15e9c274..63df4c5645a1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs
@@ -123,9 +123,6 @@
 		</group>
 	</templates>
 	<component>
-        <prop oor:name="BitmapPath" oor:type="xs:string">
-            <info><desc>Bitmap path.</desc></info>
-        </prop>
 		<group oor:name="Strings">
                     <info><desc>UI strings.</desc></info>
 			<prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2" oor:type="xs:string" oor:localized="true">
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 00f7a275ed42..7db1d017946c 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -820,4 +820,12 @@ Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED
     File = "presenterscreen-ButtonPlusDisabled.png";
 };
 
+// This definition is not used directly.
+// It is only here to be shipped in images.zip.
+// The bitmap itself is used from sdext/source/minimizer.
+Bitmap BMP_PRESENTATION_MINIMIZER
+{
+    File = "minimize_presi_80.png";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 46cb52a52e08..79896d165fc2 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -188,6 +188,7 @@
 #define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590)
 #define BMP_PRESENTERSCREEN_ANIMATION (RID_SD_START+591)
 #define BMP_PRESENTERSCREEN_TRANSITION (RID_SD_START+592)
+#define BMP_PRESENTATION_MINIMIZER (RID_SD_START+593)
 
 // ResourceIDs for Popup-Menus do not need a dummy string!!!
 
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index b104de7209e4..47605277b12f 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -104,7 +104,7 @@ void OptimizerDialog::InitRoadmap()
         sal_Int32 nCount = SAL_N_ELEMENTS( pNames );
 
         Sequence< OUString >   aNames( pNames, nCount );
-        Sequence< Any >             aValues( pValues, nCount );
+        Sequence< Any >        aValues( pValues, nCount );
 
         mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel"  ),
                                                               "rdmNavi", aNames, aValues  );
@@ -118,9 +118,10 @@ void OptimizerDialog::InitRoadmap()
         InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
         InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
 
-        OUString sBitmapPath( getPath( "BitmapPath" ) );
-        OUString sBitmap( "/minimizepresi_80.png" );
-        OUString sURL( sBitmapPath += sBitmap );
+        // Well, that's messy, but the
+        // BMP_PRESENTATION_MINIMIZER from sd module cannot be used here directly
+        // that UNO wizard dialog should be converted to ui
+        OUString sURL( "private:graphicrepository/sd/res/minimize_presi_80.png" );
 
         xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) );
         xPropertySet->setPropertyValue( "Activated", Any( (sal_Bool)sal_True ) );