slidecopy: add SID_TASKPANE support to Calc, Writer/Web, Writer/Global, Math, Writer/Form, Writer/Report, XMLForm

6 files changed, 32 insertions, 9 deletions

diff --git a/sfx2/workben/custompanel/CalcWindowState.xcu b/sfx2/workben/custompanel/CalcWindowState.xcu
new file mode 100644
index 000000000000..9dd981d9c973
--- /dev/null
+++ b/sfx2/workben/custompanel/CalcWindowState.xcu
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="CalcWindowState" oor:package="org.openoffice.Office.UI" 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">
+  <node oor:name="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/0000FF" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Blue</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/Factories.xcu b/sfx2/workben/custompanel/Factories.xcu
index 88e6a4df14f8..1d277a86a222 100644
--- a/sfx2/workben/custompanel/Factories.xcu
+++ b/sfx2/workben/custompanel/Factories.xcu
@@ -7,7 +7,7 @@
           <value>toolpanel</value>
         </prop>
         <prop oor:name="Name">
-          <value>org.openoffice.example.custompanel</value>
+          <value>org.openoffice.example.colorpanel</value>
         </prop>
         <prop oor:name="Module">
           <value/>
diff --git a/sfx2/workben/custompanel/WriterWindowState.xcu b/sfx2/workben/custompanel/WriterWindowState.xcu
index 527a3c89d8ac..9376e34308b9 100644
--- a/sfx2/workben/custompanel/WriterWindowState.xcu
+++ b/sfx2/workben/custompanel/WriterWindowState.xcu
@@ -2,7 +2,7 @@
 <oor:component-data oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI" 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">
   <node oor:name="UIElements">
     <node oor:name="States">
-      <node oor:name="private:resource/toolpanel/org.openoffice.example.custompanel/green" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/00FF00" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Soylent Green</value>
         </prop>
@@ -13,7 +13,7 @@
           <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolpanel/org.openoffice.example.custompanel/red" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FF0000" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Soylent Red</value>
         </prop>
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
index 1b630a7c1440..54880cc5fcc7 100644
--- a/sfx2/workben/custompanel/ctp_factory.cxx
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
@@ -82,14 +82,11 @@ namespace sd { namespace colortoolpanel
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.custompanel/" ) ) )
+        if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) ) )
             throw NoSuchElementException( i_rResourceURL, *this );
 
         const ::rtl::OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) );
-        const bool bRed = sColor.equalsAscii( "red" );
-        const bool bGreen = sColor.equalsAscii( "green" );
-        if ( !bRed && !bGreen )
-            throw NoSuchElementException( i_rResourceURL, *this );
+        const sal_Int32 nPanelColor = sColor.toInt32( 16 );
 
         // retrieve the parent window
         Reference< XWindow > xParentWindow;
@@ -114,7 +111,7 @@ namespace sd { namespace colortoolpanel
         }
 
         /// create the panel
-        Reference< XUIElement > xUIElement( new PanelUIElement( m_xContext, xParentWindow, i_rResourceURL, bGreen ? 0x80 << 8 : 0x80 << 16 ) );
+        Reference< XUIElement > xUIElement( new PanelUIElement( m_xContext, xParentWindow, i_rResourceURL, nPanelColor ) );
         return xUIElement;
     }
 
diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk
index c90fcc6cf444..27a0123ace58 100644
--- a/sfx2/workben/custompanel/makefile.mk
+++ b/sfx2/workben/custompanel/makefile.mk
@@ -79,6 +79,7 @@ COMPONENT_CONFIGDEST=.
 
 COMPONENT_XCU = \
     $(EXTENSIONDIR)/WriterWindowState.xcu \
+    $(EXTENSIONDIR)/CalcWindowState.xcu \
     $(EXTENSIONDIR)/Factories.xcu
 
 COMPONENT_LIBRARIES = \
@@ -102,3 +103,8 @@ $(EXTENSIONDIR)/%.png : ./%.png
 $(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu
     @@-$(MKDIRHIER) $(@:d)
     $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu
+
+$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu
+
diff --git a/sfx2/workben/custompanel/manifest.xml b/sfx2/workben/custompanel/manifest.xml
index 1089f8b6fd59..dfb09a1a8f7d 100644
--- a/sfx2/workben/custompanel/manifest.xml
+++ b/sfx2/workben/custompanel/manifest.xml
@@ -6,6 +6,8 @@
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
                        manifest:full-path="WriterWindowState.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="CalcWindowState.xcu"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
                        manifest:full-path="Factories.xcu"/>
   <!-- <manifest:file-entry manifest:media-type="image/png"
                        manifest:full-path="panel.png"/>-->