[Libreoffice-commits] core.git: Branch 'feature/sidebaropt' - officecfg/registry sd/source sd/util

[Michael Meeks]

 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |   10 +++++-----
 sd/source/ui/framework/factories/TaskPanelFactory.cxx                   |    2 +-
 sd/util/sd.component                                                    |    3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 4890d321c028800c532fbc254a112b7378a837c8
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri May 17 14:16:52 2013 +0100

    update to names of new URLs.

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 5aa630a..d5df8ff 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/DrawingFramework/MasterPages" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/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/DrawingFramework/Layouts" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/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/DrawingFramework/TableDesign" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/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/DrawingFramework/CustomAnimations" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/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/DrawingFramework/SlideTransitions" oor:op="replace">
+      <node oor:name="private:resource/toolpanel/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 b8e7e79..af80933 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -218,7 +218,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource (
             if ( pToolPanel != NULL )
                 xResource = new TaskPanelResource( rxResourceId );
 
-            OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" );
+            OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource: '" << sPaneURL << "'" );
         }
     }
 
diff --git a/sd/util/sd.component b/sd/util/sd.component
index ff6d79c..552e2d5 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -81,6 +81,9 @@
   <implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog">
     <service name="com.sun.star.ui.dialog.FilterOptionsDialog"/>
   </implementation>
+  <implementation name="com.sun.star.comp.drawing.ToolPanelFactory">
+    <service name="com.sun.star.drawing.DefaultToolPanelFactory"/>
+  </implementation>
   <implementation name="com.sun.star.comp.sd.InsertSlideController">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>