Kaydet (Commit) 228bb7ff authored tarafından Michael Meeks's avatar Michael Meeks

finally get the taskpane rendering again

NB. you need to re-build & install to sync. configuration after this.
üst 645db9a2
...@@ -164,28 +164,28 @@ ...@@ -164,28 +164,28 @@
</prop> </prop>
</node> </node>
<node oor:name="R0c" oor:op="replace"> <node oor:name="R0c" oor:op="replace">
<prop oor:name="URL"> <prop oor:name="URL"> <!-- MMeeks renamed from UsedMasterPages -->
<value>private:resource/toolpanel/UsedMasterPages</value> <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
</prop> </prop>
</node> </node>
<node oor:name="R1" oor:op="replace"> <node oor:name="R1" oor:op="replace">
<prop oor:name="URL"> <prop oor:name="URL">
<value>private:resource/toolpanel/Layouts</value> <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
</prop> </prop>
</node> </node>
<node oor:name="R2" oor:op="replace"> <node oor:name="R2" oor:op="replace">
<prop oor:name="URL"> <prop oor:name="URL">
<value>private:resource/toolpanel/TableDesign</value> <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
</prop> </prop>
</node> </node>
<node oor:name="R3" oor:op="replace"> <node oor:name="R3" oor:op="replace">
<prop oor:name="URL"> <prop oor:name="URL">
<value>private:resource/toolpanel/CustomAnimations</value> <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
</prop> </prop>
</node> </node>
<node oor:name="R4" oor:op="replace"> <node oor:name="R4" oor:op="replace">
<prop oor:name="URL"> <prop oor:name="URL">
<value>private:resource/toolpanel/SlideTransitions</value> <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
</prop> </prop>
</node> </node>
</node> </node>
......
...@@ -825,7 +825,7 @@ ...@@ -825,7 +825,7 @@
<value>true</value> <value>true</value>
</prop> </prop>
</node> </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"> <prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value> <value>false</value>
</prop> </prop>
...@@ -836,7 +836,7 @@ ...@@ -836,7 +836,7 @@
<value>private:commandimage/PresentationLayout</value> <value>private:commandimage/PresentationLayout</value>
</prop> </prop>
</node> </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"> <prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value> <value>false</value>
</prop> </prop>
...@@ -847,7 +847,7 @@ ...@@ -847,7 +847,7 @@
<value>private:commandimage/ModifyPage</value> <value>private:commandimage/ModifyPage</value>
</prop> </prop>
</node> </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"> <prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value> <value>false</value>
</prop> </prop>
...@@ -858,7 +858,7 @@ ...@@ -858,7 +858,7 @@
<value>private:commandimage/InsertTable</value> <value>private:commandimage/InsertTable</value>
</prop> </prop>
</node> </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"> <prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value> <value>false</value>
</prop> </prop>
...@@ -869,7 +869,7 @@ ...@@ -869,7 +869,7 @@
<value>private:commandimage/CustomAnimation</value> <value>private:commandimage/CustomAnimation</value>
</prop> </prop>
</node> </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"> <prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value> <value>false</value>
</prop> </prop>
......
...@@ -151,7 +151,7 @@ void SAL_CALL TaskPanelFactory::initialize( ...@@ -151,7 +151,7 @@ void SAL_CALL TaskPanelFactory::initialize(
catch(RuntimeException&) catch(RuntimeException&)
{} {}
SAL_DEBUG( "TaskPanelFactory::initialize !" );
Reference<XControllerManager> xCM (xController, UNO_QUERY_THROW); Reference<XControllerManager> xCM (xController, UNO_QUERY_THROW);
Reference<XConfigurationController> xCC ( Reference<XConfigurationController> xCC (
xCM->getConfigurationController(), UNO_QUERY_THROW); xCM->getConfigurationController(), UNO_QUERY_THROW);
......
...@@ -198,7 +198,8 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa ...@@ -198,7 +198,8 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs. // 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"); const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
// these three appear to be unused ... // these three appear to be unused ...
......
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