[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source

[Michael Meeks]

 sfx2/source/sidebar/ResourceManager.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 5adfa746fb176c00cefc5fa34c79214fe166855d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sun Jun 16 02:30:41 2013 +0100

    sidebar: disable listed but disabled toolpanel panes.
    
    Change-Id: I4c156629c1b7587c342743af47be73f5cda253aa

diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 96395eb..dc09419 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -33,8 +33,6 @@
 
 #include <map>
 
-
-
 using ::rtl::OUString;
 using namespace css;
 using namespace cssu;
@@ -50,7 +48,6 @@ public:
     }
 };
 
-
 ResourceManager& ResourceManager::Instance (void)
 {
     static ResourceManager maInstance;
@@ -530,6 +527,13 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame)
         if ( ! aChildNode.isValid())
             continue;
 
+        if ( rsNodeName == "private:resource/toolpanel/DrawingFramework/CustomAnimations" ||
+             rsNodeName == "private:resource/toolpanel/DrawingFramework/Layouts" ||
+             rsNodeName == "private:resource/toolpanel/DrawingFramework/MasterPages" ||
+             rsNodeName == "private:resource/toolpanel/DrawingFramework/SlideTransitions" ||
+             rsNodeName == "private:resource/toolpanel/DrawingFramework/TableDesign" )
+          continue;
+
         DeckDescriptor& rDeckDescriptor (maDecks[nDeckWriteIndex++]);
         rDeckDescriptor.msTitle = ::comphelper::getString(aChildNode.getNodeValue("UIName"));
         rDeckDescriptor.msId = rsNodeName;