summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slidesorter/inc')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx23
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx2
12 files changed, 2 insertions, 122 deletions
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 9a3256a07d86..4a5c2b51ac28 100644..100755
--- 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
@@ -120,24 +113,6 @@ public:
CacheKey aKey,
const Size& rSize);
- /** When the requested preview bitmap does not yet exist or is not
- up-to-date then the rendering of one is scheduled. Otherwise this
- method does nothing.
- */
- void RequestPreviewBitmap (
- CacheKey aKey,
- const Size& rSize);
-
- /** Tell the cache that the bitmap associated with the given request
- data is not up-to-date anymore. Unlike the RequestPreviewBitmap()
- method this does not trigger the rendering itself. It just
- remembers to render it when the preview is requested the next time.
- @param rRequestData
- It is safe to pass a (barly) living object. It will called only
- once to obtain its page object.
- */
- void InvalidatePreviewBitmap (CacheKey aKey);
-
/** Call this method when a view-object-contact object is being deleted
and does not need (a) its current bitmap in the cache and (b) a
requested new bitmap.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index af90b60932b9..667aa768ee8f 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -105,8 +105,6 @@ public:
*/
Rectangle Rearrange (bool bForce = false);
- SlideSorter& GetSlideSorter (void) const;
-
/** Return the descriptor of the page that is rendered under the
given position.
@return
@@ -116,14 +114,6 @@ public:
*/
model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition);
- /** Return the descriptor of the page that is associated to the page
- visible fade symbol at the given position.
- @return
- When the given position is not over a visible page fade symbol
- then NULL is returned.
- */
- model::SharedPageDescriptor GetFadePageAt (const Point& rPixelPosition);
-
PageSelector& GetPageSelector (void);
FocusManager& GetFocusManager (void);
controller::Clipboard& GetClipboard (void);
@@ -189,14 +179,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/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 24420160b8cd..57aaf9293301 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -91,7 +91,6 @@ public:
/** Deselect the descriptor that is associated with the given page.
*/
void DeselectPage (int nPageIndex);
- void DeselectPage (const SdPage* pPage);
void DeselectPage (const model::SharedPageDescriptor& rpDescriptor);
/** This convenience method returns the same number of pages that
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 9d4c5a9329e2..c93ed7708650 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -242,13 +242,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/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index ef2bcd7b5617..79b8a1ff5d44 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -99,7 +99,6 @@ protected:
private:
class SubstitutionHandler;
class EventDescriptor;
- class InsertionIndicatorHandler;
/// Set in MouseButtonDown this flag indicates that a page has been hit.
bool mbPageHit;
@@ -121,8 +120,6 @@ private:
::std::auto_ptr<SubstitutionHandler> mpSubstitutionHandler;
- ::std::auto_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
-
DECL_LINK( DragSlideHdl, Timer* );
void StartDrag (void);
@@ -182,11 +179,6 @@ private:
*/
void ProcessRectangleSelection (bool bToggleSelection);
- /** Hide and clear the insertion indiciator, substitution display and
- selection rectangle.
- */
- void ClearOverlays (void);
-
/** Compute a numerical code that describes a mouse event and that can
be used for fast look up of the appropriate reaction.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
index 843e6e82b45c..5b8c7d9a08b6 100644..100755
--- 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 d7b7a0e06831..0e58d5d3b411 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -63,7 +63,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);
@@ -94,8 +93,6 @@ private:
*/
void InsertSlide (SfxRequest& rRequest);
- void AssignTransitionEffect (void);
-
DECL_LINK(UserEventCallback, void*);
};
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 42bc6c2140f7..4ade19087304 100644..100755
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -83,9 +83,6 @@ public:
*/
bool SetEditMode (EditMode eEditMode);
- /** Set the edit mode to that currently used by the controller.
- */
- bool SetEditModeFromController (void);
EditMode GetEditMode (void) const;
PageKind GetPageType (void) const;
@@ -147,10 +144,6 @@ public:
*/
void SynchronizeDocumentSelection (void);
- /** Set the selection of the called model to exactly that of the document.
- */
- void SynchronizeModelSelection (void);
-
/** Replace the factory for the creation of the page objects and
contacts with the given object. The old factory is destroyed.
*/
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 0854ad5e678a..81877ce7465c 100644..100755
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -100,13 +100,6 @@ 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;
-
/** Return the page shape that is used for visualizing the page.
*/
view::PageObject* GetPageObject (void);
@@ -176,10 +169,6 @@ public:
void SetPageNumberAreaModelSize (const Size& rSize);
Size GetPageNumberAreaModelSize (void) const;
- /** Returns <TRUE/> when the slide is the current slide.
- */
- bool IsCurrentPage (void) const;
-
/** Set or revoke the state of this slide being the current slide.
*/
void SetIsCurrentPage (const bool bIsCurrent);
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index d5c8dd4bf241..6c16a154ecfd 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -134,7 +134,6 @@ public:
given position.
*/
sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const;
- sal_Int32 GetFadePageIndexAtPoint (const Point& rPosition) const;
view::Layouter& GetLayouter (void);
@@ -206,8 +205,6 @@ public:
*/
void SetSelectionRectangleVisibility (bool bVisible);
- ::sdr::contact::ObjectContact& GetObjectContact (void) const;
-
typedef ::std::pair<sal_Int32,sal_Int32> PageRange;
/** Return the range of currently visible page objects including the
first and last one in that range.
@@ -217,16 +214,6 @@ public:
*/
PageRange GetVisiblePageRange (void);
- /** Return the size of the area where the page numbers are displayed.
- @return
- The returned size is given in model coordinates.
- */
- Size GetPageNumberAreaModelSize (void) const;
-
- /** Return the size of the border around the original SdrPageObj.
- */
- SvBorder GetModelBorder (void) const;
-
/** Add a shape to the page. Typically used from inside
PostModelChange().
*/
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 246dcbc05ee7..9b1fd996e9c0 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -69,14 +69,6 @@ public:
Layouter (void);
~Layouter (void);
- /** Set the minimal, the maximal, and the desired width of the page
- objects. The three parameters have to fullfill the constraint
- nMinimalWidth <= nPreferredWidth <= nMaximalWidth or the call is
- ignored.
- */
- void SetObjectWidth (sal_Int32 nMinimalWidth, sal_Int32 nMaximalWidth,
- sal_Int32 nPreferredWidth);
-
/** 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
@@ -114,13 +106,6 @@ public:
void SetPageBorders (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
@@ -160,19 +145,12 @@ public:
/** Change the zoom factor. This does not change the general layout
(number of columns).
*/
- void SetZoom (double nZoomFactor, OutputDevice* pDevice);
void SetZoom (Fraction nZoomFactor, OutputDevice* pDevice);
/** Return the number of columns.
*/
sal_Int32 GetColumnCount (void) 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.
*/
@@ -289,7 +267,6 @@ public:
const DoublePoint&rLayouterPoint) const;
typedef ::std::vector<Rectangle> BackgroundRectangleList;
- const BackgroundRectangleList& GetBackgroundRectangleList (void) const;
private:
class ScreenAndModelValue {public:
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
index c0083ff92d73..31899d3b3e44 100644..100755
--- 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:
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 18:06:27 +0000