renaissance1: merge with DEV300_m84

8 files changed, 2 insertions, 54 deletions

diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 48da4faf02e3..bd2b542c5d87 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -68,18 +68,11 @@ class RequestData;
     bitmaps and throw.</li>
     </p>
 
-    <p>There are three somewhat similar methods for requesting new previews:
-    a) GetPreviewBitmap() schedules a re-rendering (when necessary) and
+    <p>There is another somewhat similar methods for requesting new previews:
+    GetPreviewBitmap() schedules a re-rendering (when necessary) and
     returns the preview what is currently available, either as a preview of
     the preview or, when nothing has changed since the last call, as the
     final thing.
-    b) RequestPreviewBitmap() schedules, like GetPreviewBitmap(), a
-    re-rendering when the currently available preview is not up-to-date.  It
-    does not, however, return anything.  Use this if you can wait for the
-    preview.
-    c) InvalidatePreviewBitmap() does not schedule a re-rendering, but
-    remembers that one is necessary when one of the other two methods is
-    called.
     </p>
 */
 class PageCache
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index a8c8deac2de2..b6309f80d0b4 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -109,8 +109,6 @@ public:
     */
     Rectangle Rearrange (bool bForce = false);
 
-    SlideSorter& GetSlideSorter (void) const;
-
     /** Return the descriptor of the page that is rendered under the
         given position.  This takes the IsOnlyPreviewTriggersMouseOver
         property into account.
@@ -184,14 +182,6 @@ public:
     */
     void UpdateAllPages (void);
 
-    /** Set the zoom factor.  The given value is clipped against an upper
-        bound.
-        @param nZoom
-            An integer percent value, i.e. nZoom/100 is the actual zoom
-            factor.
-        */
-    void SetZoom (long int nZoom);
-
     /** This factory method creates a selection function.
     */
     virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index a8152d1789a8..fa2aae6111fb 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -276,13 +276,6 @@ private:
     void PlaceHorizontalScrollBar (const Rectangle& aArea);
     void PlaceVerticalScrollBar (const Rectangle& aArea);
     void PlaceFiller (const Rectangle& aArea);
-
-    /** Make the height of the content window larger or smaller, so that the
-
-        content size fits exactly in.  This is achieved by changing the size
-        of the parent window and rely on the resulting resize.
-    */
-    void AdaptWindowSize (const Rectangle& rArea);
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
index 843e6e82b45c..5b8c7d9a08b6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
@@ -50,8 +50,6 @@ class SlideFunction
 public:
     TYPEINFO();
 
-    static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
-
     virtual BOOL MouseMove (const MouseEvent& rMEvt);
     virtual BOOL MouseButtonUp (const MouseEvent& rMEvt);
     virtual BOOL MouseButtonDown (const MouseEvent& rMEvt);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index 7c9e38c3288b..d2c9f7481624 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -64,7 +64,6 @@ public:
     void FuTemporary (SfxRequest& rRequest);
     void FuPermanent (SfxRequest& rRequest);
     void FuSupport (SfxRequest& rRequest);
-    void GetCtrlState (SfxItemSet &rSet);
     void GetMenuState (SfxItemSet &rSet);
     void GetClipboardState (SfxItemSet &rSet);
     void GetStatusBarState (SfxItemSet& rSet);
@@ -112,8 +111,6 @@ private:
 
     void DuplicateSelectedSlides (SfxRequest& rRequest);
 
-    void AssignTransitionEffect (void);
-
     /** Use one of several ways to determine where to insert a new page.
         This can be the current selection or the insertion indicator.
     */
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 276f1a7c10a7..705a438ba13a 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -90,14 +90,7 @@ public:
     */
     css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const;
 
-    /** Returns the index of the page as it is displayed in the view as page
-        number.  The value may differ from the index returned by the
-        XDrawPage when there are hidden slides and the XIndexAccess used to
-        access the model filters them out.
-    */
-    sal_Int32 GetPageIndex (void) const;
     void SetPageIndex (const sal_Int32 nIndex);
-
     bool UpdateMasterPage (void);
 
     enum State { ST_Visible, ST_Selected, ST_WasSelected,
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index a250688dd2e2..4d19e41e881b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -82,7 +82,6 @@ public:
     ~Layouter (void);
 
     ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const;
-
     /** Set the horizontal and vertical borders in pixel coordinates between
         the enclosing window and page objects.  The borders may be painted
         larger then the given values when the space for the insertion marker
@@ -103,13 +102,6 @@ public:
     void SetBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder,
         sal_Int32 nTopBorder, sal_Int32 nBottomBorder);
 
-    /** Set the horizontal and vertical gaps between adjacent page objects.
-        These gaps are only relevant when there is more than one column or
-        more than one row.  Negative values indicate that the respective gap
-        is not set.
-    */
-    void SetGaps (sal_Int32 nHorizontalGap, sal_Int32 nVerticalGap);
-
     /** Set the interval of valid column counts.  When nMinimalColumnCount
         <= nMaximalColumnCount is not fullfilled then the call is ignored.
         @param nMinimalColumnCount
@@ -164,12 +156,6 @@ public:
 
     sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const;
 
-    /** Returns whether the column count is fixed (<TRUE/>) or variable
-        (<FALSE/>).  It is fixed if SetColumnCount() was called with the
-        same value for minimal and maximal column count.
-    */
-    bool IsColumnCountFixed (void) const;
-
     /** Return the scale factor that can be set at the map mode of the
         output window.
     */
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
index c0083ff92d73..31899d3b3e44 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
@@ -69,8 +69,6 @@ public:
 
     SdrPageObj& GetPageObject (void) const;
 
-    Rectangle GetPageObjectBoundingBox (void) const;
-
     virtual void ActionChanged (void);
 
 protected: