summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-05-17 17:25:36 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:38 +0100
commit228bb7ffe0d404ba1225f7b4d26ca71e098577d9 (patch)
tree569f9794b73476586bc69a5d786248cdb024f0c8
parent645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4 (diff)
finally get the taskpane rendering again
NB. you need to re-build & install to sync. configuration after this.
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Impress.xcu12
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu10
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx2
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx3
4 files changed, 14 insertions, 13 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 924d41449d0b..4d5ab3f43e2a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -164,28 +164,28 @@
</prop>
</node>
<node oor:name="R0c" oor:op="replace">
- <prop oor:name="URL">
- <value>private:resource/toolpanel/UsedMasterPages</value>
+ <prop oor:name="URL"> <!-- MMeeks renamed from UsedMasterPages -->
+ <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
</prop>
</node>
<node oor:name="R1" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/Layouts</value>
+ <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
</prop>
</node>
<node oor:name="R2" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/TableDesign</value>
+ <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
</prop>
</node>
<node oor:name="R3" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/CustomAnimations</value>
+ <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
</prop>
</node>
<node oor:name="R4" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/SlideTransitions</value>
+ <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
</prop>
</node>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index d5df8ff6f3e1..5aa630a4d618 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -825,7 +825,7 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/MasterPages" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -836,7 +836,7 @@
<value>private:commandimage/PresentationLayout</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/Layouts" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -847,7 +847,7 @@
<value>private:commandimage/ModifyPage</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/TableDesign" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -858,7 +858,7 @@
<value>private:commandimage/InsertTable</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/CustomAnimations" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -869,7 +869,7 @@
<value>private:commandimage/CustomAnimation</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/SlideTransitions" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 750df6a9e5df..091c3f5c5aff 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -151,7 +151,7 @@ void SAL_CALL TaskPanelFactory::initialize(
catch(RuntimeException&)
{}
-
+ SAL_DEBUG( "TaskPanelFactory::initialize !" );
Reference<XControllerManager> xCM (xController, UNO_QUERY_THROW);
Reference<XConfigurationController> xCC (
xCM->getConfigurationController(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 8964304b9b3e..00667d231e38 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -198,7 +198,8 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
-const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
+const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); // MMeeks - checkout uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) to get somewhere here ...
+// const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
// these three appear to be unused ...