summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-06-16 02:30:41 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-06-16 02:57:04 +0100
commit35e17fa2b3440b831eeaf37b9c6db6b6574ae4d8 (patch)
tree8a620113da8fb7295a47b25cef8826ca9aee7030 /sfx2
parentTranslate German comments (diff)
downloadcore-35e17fa2b3440b831eeaf37b9c6db6b6574ae4d8.tar.gz
core-35e17fa2b3440b831eeaf37b9c6db6b6574ae4d8.zip
sidebar: disable listed but disabled toolpanel panes.
Change-Id: I4c156629c1b7587c342743af47be73f5cda253aa
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 90c035bc66c1..39cc27ffd6f7 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -32,8 +32,6 @@
#include <map>
-
-
using ::rtl::OUString;
using namespace css;
using namespace cssu;
@@ -49,7 +47,6 @@ public:
}
};
-
ResourceManager& ResourceManager::Instance (void)
{
static ResourceManager maInstance;
@@ -529,6 +526,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;