Kaydet (Commit) 55f49970 authored tarafından Michael Meeks's avatar Michael Meeks

update to the right service name for new URLs.

üst 052ac10a
......@@ -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>
......
......@@ -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!");
}
}
......
......@@ -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);
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment