INTEGRATION: CWS components1 (1.6.96); FILE MERGED

2007/01/25 15:33:50 af 1.6.96.5: RESYNC: (1.8-1.9); FILE MERGED
2006/09/25 17:40:25 af 1.6.96.4: RESYNC: (1.6-1.8); FILE MERGED
2006/09/07 14:51:54 af 1.6.96.3: #i68075# Transition from URL to ResourceId.
2006/08/28 14:32:32 af 1.6.96.2: #i68075# Fixed compiler problems.
2006/08/22 12:39:06 af 1.6.96.1: #i68075# Transition to new drawing framework.

1 files changed, 18 insertions, 20 deletions

diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 49c464ddd254..476466b70d8a 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: GraphicViewShellBase.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-12 19:04:47 $
+ *  last change: $Author: rt $ $Date: 2007-04-03 16:26:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,15 +38,14 @@
 
 #include "GraphicViewShellBase.hxx"
 
-#include "ViewTabBar.hxx"
+#include "GraphicDocShell.hxx"
 #ifndef SD_RESID_HXX
 #include "sdresid.hxx"
 #endif
-#ifndef SD_GRAPHIC_DOC_SHELL_HXX
-#include "GraphicDocShell.hxx"
-#endif
 #include "strings.hrc"
 #include "app.hrc"
+#include "framework/DrawModule.hxx"
+#include "framework/FrameworkHelper.hxx"
 
 #ifndef _SFXREQUEST_HXX
 #include <sfx2/request.hxx>
@@ -54,8 +53,6 @@
 
 namespace sd {
 
-class DrawDocShell;
-
 TYPEINIT1(GraphicViewShellBase, ViewShellBase);
 
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
@@ -72,7 +69,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     GraphicViewShellBase* pBase = new GraphicViewShellBase(pFrame, pOldView);
-    pBase->LateInit();
+    pBase->LateInit(framework::FrameworkHelper::msDrawViewURL);
     return pBase;
 }
 void GraphicViewShellBase::RegisterFactory( USHORT nPrio )
@@ -96,17 +93,8 @@ void GraphicViewShellBase::InitFactory()
 GraphicViewShellBase::GraphicViewShellBase (
     SfxViewFrame* _pFrame,
     SfxViewShell* pOldShell)
-    : ViewShellBase (_pFrame, pOldShell, ViewShell::ST_DRAW)
-{
-}
-
-
-
-
-ViewTabBar* GraphicViewShellBase::CreateViewTabBar (void)
+    : ViewShellBase (_pFrame, pOldShell)
 {
-    // The ViewTabBar is not supported.
-    return NULL;
 }
 
 
@@ -141,7 +129,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest)
         case SID_LEFT_PANE_DRAW:
         case SID_LEFT_PANE_IMPRESS:
         default:
-            // The remaining requests are forwarded to out base class.
+            // The remaining requests are forwarded to our base class.
             ViewShellBase::Execute (rRequest);
             break;
     }
@@ -149,5 +137,15 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest)
 }
 
 
+
+
+void GraphicViewShellBase::InitializeFramework (void)
+{
+    com::sun::star::uno::Reference<com::sun::star::frame::XController>
+        xController (GetController());
+    sd::framework::DrawModule::Initialize(xController);
+}
+
+
 } // end of namespace sd