INTEGRATION: CWS impress30 (1.9.60); FILE MERGED

2005/01/20 10:55:32 cl 1.9.60.1: #i38629# use correct client area for presentation in window

1 files changed, 17 insertions, 3 deletions

diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index be7b3d846efa..9ca210a3fab5 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ViewShellBase.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 20:15:28 $
+ *  last change: $Author: rt $ $Date: 2005-01-28 15:41:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -264,8 +264,11 @@ public:
     /** Update the border that is set with SfxViewShell::SetBorderPixel().
         This is done by adding the border used by the ViewShellBase itself
         with the border used by the main view shell.
+
+        @param bForce   if true the borders are also updated if old border
+                        and new border are same.
     */
-    void UpdateBorder (void);
+    void UpdateBorder ( bool bForce = false );
 
     /** With this method the UI controls can be turned on or off.  It is
         used by the FuSlideShow to hide the UI controls while showing a
@@ -287,6 +290,9 @@ public:
     */
     tools::EventMultiplexer& GetEventMultiplexer (void);
 
+    /* returns the complete area of the current view relative to the frame window */
+    inline const Rectangle& getClientRectangle() const;
+
 protected:
     osl::Mutex maMutex;
     /** The view tab bar is the control for switching between different
@@ -311,6 +317,9 @@ private:
 
     ::std::auto_ptr<tools::EventMultiplexer> mpEventMultiplexer;
 
+    // contains the complete area of the current view relative to the frame window
+    Rectangle maClientArea;
+
     /** Common code of OuterResizePixel() and InnerResizePixel().
     */
     void ResizePixel (
@@ -333,6 +342,11 @@ private:
 };
 
 
+inline const Rectangle& ViewShellBase::getClientRectangle() const
+{
+    return maClientArea;
+}
+
 } // end of namespace sd
 
 #endif