CWS-TOOLING: integrate CWS dba33iooo/OOO330_m9ooo/OOO330_m8ooo/OOO330_m17ooo/OOO330_m16ooo/OOO330_m15ooo/OOO330_m14ooo/OOO330_m13ooo/OOO330_m12ooo/OOO330_m11ooo/OOO330_m10

10 files changed, 33 insertions, 13 deletions

diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx
index d3e38e385..65ff1c925 100644..100755
--- a/sd/inc/FactoryIds.hxx
+++ b/sd/inc/FactoryIds.hxx
@@ -42,8 +42,7 @@ enum ViewShellFactoryIds
     DRAW_FACTORY_ID = 1,
     SLIDE_SORTER_FACTORY_ID = 2,
     OUTLINE_FACTORY_ID = 3,
-    PRESENTATION_FACTORY_ID = 4,
-    PREVIEW_FACTORY_ID = 5
+    PRESENTATION_FACTORY_ID = 4
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 969a6738a..1ba0df667 100755
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -86,10 +86,6 @@ String RID_APPTITLE
 {
     Text = "StarImpress 4.0" ;
 };
-String STR_DEFAULTVIEW
-{
-    Text [ en-US ] = "Default" ;
-};
 String STR_NULL
 {
     Text [ en-US ] = "None" ;
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 83c8178ce..38115321d 100755
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -37,6 +37,9 @@
 #include "strings.hrc"
 #include "sdresid.hxx"
 
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
+#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
+
 #include <sfx2/app.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/bindings.hxx>
@@ -47,6 +50,9 @@ namespace sd {
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::drawing::framework::XResourceId;
+using ::com::sun::star::drawing::framework::XConfigurationController;
+using ::com::sun::star::drawing::framework::ResourceActivationMode_ADD;
+using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE;
 
 SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
 SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
@@ -151,6 +157,26 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_
     :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo,
         FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT )
 {
+    // just in case this window has been created by SFX, instead our resource framework: Ensure that the resource framework
+    // activates the task pane, so it is really filled with content (in opposite to the other SFX applications, the
+    // child window registered for SID_TASKPANE is not responsible for its content, but here in SD, it's the ToolPanelViewShell
+    // which has this responsibility. And this view shell is created implicitly via the resource framework.)
+    // #i113788# / 2010-09-03 / frank.schoenheit@oracle.com
+    SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
+    ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
+    ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ToolPanelChildWindow: no view shell access!" );
+
+    const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
+    ENSURE_OR_RETURN_VOID( pFrameworkHelper.get(), "ToolPanelChildWindow::ToolPanelChildWindow: no framework helper for the view shell!" );
+    Reference<XConfigurationController> xConfigController( pFrameworkHelper->GetConfigurationController() );
+    ENSURE_OR_RETURN_VOID( xConfigController.is(), "ToolPanelChildWindow::ToolPanelChildWindow: no config controller!" );
+    xConfigController->requestResourceActivation(
+        framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msRightPaneURL ),
+        ResourceActivationMode_ADD );
+    xConfigController->requestResourceActivation(
+        framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ),
+        ResourceActivationMode_REPLACE
+    );
 }
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 41b27b4b8..f46f85fc9 100755
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -28,7 +28,6 @@
 #ifndef _SD_CFGID_HXX
 #include "cfgids.hxx"
 #endif
-#define STR_DEFAULTVIEW 		(RID_APP_START)
 #define STR_NULL				(RID_APP_START+3)
 #define STR_INSERTPAGE			(RID_APP_START+35)
 #define STR_INSERTLAYER 		(RID_APP_START+37)
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 8026c942c..88e7d42c9 100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -62,7 +62,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
 void GraphicViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"Default");
     InitFactory();
 }
 void GraphicViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index c7742e538..50b8145bd 100644..100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -62,7 +62,7 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
 void ImpressViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"Default");
     InitFactory();
 }
 void ImpressViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 178661f00..b0699d7ab 100644..100755
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -60,7 +60,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
 void OutlineViewShellBase::RegisterFactory( USHORT nPrio )
 { 
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"Outline");
     InitFactory();
 }
 void OutlineViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 96ffefdb4..603510df5 100644..100755
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -70,7 +70,7 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
 void PresentationViewShellBase::RegisterFactory( USHORT nPrio )
 { 
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation");
     InitFactory();
 }
 void PresentationViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 5be1a913f..15405d2e0 100644..100755
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -64,7 +64,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
 void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio )
 { 
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"SlideSorter");
     InitFactory();
 }
 
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 15f7b2652..130ca8dfd 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -258,7 +258,7 @@ SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
 void ViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+        &CreateInstance,&InitFactory,nPrio,"Default");
     InitFactory();
 }
 void ViewShellBase::InitFactory()