summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-05-17 14:16:52 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:38 +0100
commit55f49970f4085e3a1498961edabd5303bd6bea6c (patch)
tree10ac2c2a373b364995d8e230c9b77332722e6e2e
parent052ac10a6f9b28b9b06884dd3ed41879722be6c9 (diff)
update to the right service name for new URLs.
-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
-rw-r--r--sd/util/sd.component3
4 files changed, 11 insertions, 7 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 5aa630a4d618..d5df8ff6f3e1 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 b8e7e79cfb7e..750df6a9e5df 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!");
}
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index c820476dc698..8964304b9b3e 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -20,6 +20,7 @@
#include <osl/time.h>
#include "sfx2/viewfrm.hxx"
+
#include "framework/FrameworkHelper.hxx"
#include "framework/ConfigurationController.hxx"
@@ -645,7 +646,7 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
mxConfigurationController->requestResourceActivation(
CreateResourceId(aViewURL, aPaneURL),
ResourceActivationMode_REPLACE);
- Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, aViewURL, aPanelURL));
+ Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, aViewURL, aPaneURL));
mxConfigurationController->requestResourceActivation(
xPanelId,
ResourceActivationMode_REPLACE);
diff --git a/sd/util/sd.component b/sd/util/sd.component
index ff6d79c2f123..552e2d56a987 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>