From 557cf105963a9dfb52ded1a73c770339f60c0e08 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 6 Jul 2004 13:44:34 +0000
Subject: [PATCH] INTEGRATION: CWS docking1 (1.2.72); FILE MERGED 2004/07/06
 09:59:06 cd 1.2.72.2: RESYNC manually 2004/06/23 15:17:14 mba 1.2.72.1:
 Provide document border size before resizing (needed for InPlace mode)

---
 sd/source/ui/inc/ViewShell.hxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 3ffbd556acf6..9647d657b334 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ViewShell.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 11:55:22 $
+ *  last change: $Author: obo $ $Date: 2004-07-06 14:44:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -387,6 +387,7 @@ protected:
         This is usually the one of the document.  Only the outline
         view has its own (the one of its Outliner object.)
     */
+    void CreateBorder();
     SfxUndoManager* ImpGetUndoManager (void) const;
     void ImpGetUndoStrings(SfxItemSet &rSet) const;
     void ImpGetRedoStrings(SfxItemSet &rSet) const;
@@ -440,6 +441,10 @@ protected:
     // Bereich aller Fenster, wenn Splitter aktiv sind
     Rectangle   aAllWindowRect;
 
+    /// The sub-controller.  Returned by GetSubController.  Owned by
+    /// this base class once it has been created.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
+        mxSubController;
     /// The controller.  Returned by GetController().
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
         mxController;