INTEGRATION: CWS presenterview (1.11.54); FILE MERGED

2008/03/03 17:08:31 af 1.11.54.4: #i18486# Reinserted TYPEINFO declaration.
2007/07/25 12:24:14 af 1.11.54.3: #i18486# Added AddSdrObject() method.
2007/07/10 14:31:28 af 1.11.54.2: #i18486# Added SlideSorter member.
2007/03/12 15:35:35 af 1.11.54.1: #i75317# Remove dependecy of slide sorter on SlideSorterViewShell.

1 files changed, 18 insertions, 8 deletions

diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 414021c45a4b..29436edcb891 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: SlideSorterView.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2008-04-02 09:48:04 $
+ *  last change: $Author: kz $ $Date: 2008-04-03 14:38:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,7 +59,7 @@ class ObjectContact;
 } }
 
 namespace sd { namespace slidesorter {
-class SlideSorterViewShell;
+class SlideSorter;
 } }
 
 namespace sd { namespace slidesorter { namespace controller {
@@ -84,18 +84,22 @@ class SlideSorterView
     : public View
 {
 public:
+    TYPEINFO();
+
     /** Create a new view for the slide sorter.
         @param rViewShell
             This reference is simply passed to the base class and not used
             by this class.
 
     */
-    SlideSorterView (
-        SlideSorterViewShell& rViewShell,
-        model::SlideSorterModel& rModel);
+    SlideSorterView (SlideSorter& rSlideSorter);
 
     virtual ~SlideSorterView (void);
 
+    enum Orientation { HORIZONTAL, VERTICAL };
+    void SetOrientation (const Orientation eOrientation);
+    Orientation GetOrientation (void) const;
+
     void RequestRepaint (void);
     void RequestRepaint (const model::SharedPageDescriptor& rDescriptor);
 
@@ -241,10 +245,16 @@ public:
     */
     SvBorder GetModelBorder (void) const;
 
+    /** Add a shape to the page.  Typically used from inside
+        PostModelChange().
+    */
+    void AddSdrObject (SdrObject& rObject);
+
 protected:
     virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint);
 
 private:
+    SlideSorter& mrSlideSorter;
     model::SlideSorterModel& mrModel;
     /// This model is used for the maPage object.
     SdrModel maPageModel;
@@ -271,6 +281,8 @@ private:
     Size maPageNumberAreaModelSize;
     SvBorder maModelBorder;
 
+    Orientation meOrientation;
+
     /** Adapt the coordinates of the given bounding box according to the
         other parameters.
         @param rModelPageObjectBoundingBox
@@ -292,8 +304,6 @@ private:
     */
     void DeterminePageObjectVisibilities (void);
 
-    controller::SlideSorterController& GetController (void);
-
     /** Update the page borders used by the layouter by using those returned
         by the first page.  Call this function when the model changes,
         especially when the number of pages changes, or when the window is