From ff4d73f155f97b544dd15a4e769253498e562537 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 8 Apr 2010 11:58:20 +0200 Subject: slidecopy: add SID_TASKPANE support to Calc, Writer/Web, Writer/Global, Math, Writer/Form, Writer/Report, XMLForm --- sfx2/workben/custompanel/CalcWindowState.xcu | 18 ++++++++++++++++++ sfx2/workben/custompanel/Factories.xcu | 2 +- sfx2/workben/custompanel/WriterWindowState.xcu | 4 ++-- sfx2/workben/custompanel/ctp_factory.cxx | 9 +++------ sfx2/workben/custompanel/makefile.mk | 6 ++++++ sfx2/workben/custompanel/manifest.xml | 2 ++ 6 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 sfx2/workben/custompanel/CalcWindowState.xcu (limited to 'sfx2/workben') 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 @@ + + + + + + + Soylent Blue + + + false + + + vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png + + + + + 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 @@ toolpanel - org.openoffice.example.custompanel + org.openoffice.example.colorpanel 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 @@ - + Soylent Green @@ -13,7 +13,7 @@ vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png - + Soylent Red 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 @@ -5,6 +5,8 @@ manifest:full-path="custompanel.unoSHARED_EXTENSION"/> +