officecfg/registry/data/org/openoffice/Office/Impress.xcu | 12 +++++----- officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 10 ++++---- sd/source/ui/framework/factories/TaskPanelFactory.cxx | 2 - sd/source/ui/framework/tools/FrameworkHelper.cxx | 3 +- 4 files changed, 14 insertions(+), 13 deletions(-)
New commits: commit 7400758e1ced3014e8ca96c1c0944b82ef4d8923 Author: Michael Meeks <[email protected]> Date: Fri May 17 17:25:36 2013 +0100 finally get the taskpane rendering again NB. you need to re-build & install to sync. configuration after this. diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index 924d414..4d5ab3f 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 d5df8ff..5aa630a 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 750df6a..091c3f5 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 b2cbf1f..9ea22bf 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -200,7 +200,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 ... _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
