INTEGRATION: CWS impress15 (1.36.8); FILE MERGED

2004/10/29 16:27:05 af 1.36.8.5: RESYNC: (1.36-1.37); FILE MERGED
2004/10/20 07:47:18 af 1.36.8.4: #i35557# Removed unused defines.
2004/10/18 12:03:21 af 1.36.8.3: #i32926# Do not show the scroll bars when in preview mode.
2004/10/15 13:08:03 af 1.36.8.2: #i35524# In Init the controller is no longer created.
2004/10/14 11:38:17 af 1.36.8.1: #i35524# Allow the synchronous creation of ViewShell and its controller.

1 files changed, 23 insertions, 34 deletions

diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index d732d92851e7..50abd023b0b4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewshel.cxx,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-10-28 13:36:16 $
+ *  last change: $Author: obo $ $Date: 2004-11-16 16:18:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -211,14 +211,6 @@ namespace sd {
 
 static const int DELTA_ZOOM = 10;
 
-// Use magenta as transparency color instead of the standard gray that is
-// imported from vcl/image.hxx
-#undef IMAGE_STDBTN_COLOR
-#undef IMAGE_STDBTN_COLOR_HC
-#define IMAGE_STDBTN_COLOR Color(0xff,0x00,0xff)
-#define IMAGE_STDBTN_COLOR_HC Color(0xff,0x00,0xff)
-
-
 SfxViewFrame* ViewShell::GetViewFrame (void) const
 {
     OSL_ASSERT (GetViewShell()!=NULL);
@@ -372,29 +364,27 @@ void ViewShell::Construct(void)
     mpContentWindow->SetViewShell(this);
     mpContentWindow->Show();
 
-    // Create scroll bars and the filler between the scroll bars.
-    mpHorizontalScrollBar.reset (new ScrollBar(
-        GetParentWindow(),
-        WinBits(WB_HSCROLL | WB_DRAG)));
-    mpHorizontalScrollBar->EnableRTL (FALSE);
-    mpHorizontalScrollBar->SetRange(Range(0, 32000));
-    mpHorizontalScrollBar->SetScrollHdl(LINK(this, ViewShell, HScrollHdl));
-    mpHorizontalScrollBar->Show();
-
-    mpVerticalScrollBar.reset (new ScrollBar(
-        GetParentWindow(),
-        WinBits(WB_VSCROLL | WB_DRAG)));
-    mpVerticalScrollBar->SetRange(Range(0, 32000));
-    mpVerticalScrollBar->SetScrollHdl(LINK(this, ViewShell, VScrollHdl));
-    mpVerticalScrollBar->Show();
-
-    aScrBarWH = Size(mpVerticalScrollBar->GetSizePixel().Width(),
-                     mpHorizontalScrollBar->GetSizePixel().Height());
-
-    mpScrollBarBox.reset(new ScrollBarBox(
-        GetParentWindow(),
-        WB_SIZEABLE));
-    mpScrollBarBox->Show();
+    if ( ! GetDocSh()->IsPreview())
+    {
+        // Create scroll bars and the filler between the scroll bars.
+        mpHorizontalScrollBar.reset (new ScrollBar(GetParentWindow(), WinBits(WB_HSCROLL | WB_DRAG)));
+        mpHorizontalScrollBar->EnableRTL (FALSE);
+        mpHorizontalScrollBar->SetRange(Range(0, 32000));
+        mpHorizontalScrollBar->SetScrollHdl(LINK(this, ViewShell, HScrollHdl));
+        mpHorizontalScrollBar->Show();
+
+        mpVerticalScrollBar.reset (new ScrollBar(GetParentWindow(), WinBits(WB_VSCROLL | WB_DRAG)));
+        mpVerticalScrollBar->SetRange(Range(0, 32000));
+        mpVerticalScrollBar->SetScrollHdl(LINK(this, ViewShell, VScrollHdl));
+        mpVerticalScrollBar->Show();
+
+        aScrBarWH = Size(
+            mpVerticalScrollBar->GetSizePixel().Width(),
+            mpHorizontalScrollBar->GetSizePixel().Height());
+
+        mpScrollBarBox.reset(new ScrollBarBox(GetParentWindow(), WB_SIZEABLE));
+        mpScrollBarBox->Show();
+    }
 
     String aName( RTL_CONSTASCII_USTRINGPARAM( "ViewShell" ));
     SetName (aName);
@@ -419,7 +409,6 @@ void ViewShell::Construct(void)
         ::std::auto_ptr<ObjectBarManager::ObjectBarFactory>(
             new ViewShellObjectBarFactory(*this)));
     GetObjectBarManager().Clear ();
-    GetObjectBarManager().EnableObjectBarSwitching();
 }