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>

3 files changed, 11 insertions, 76 deletions

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">