diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
25 files changed, 23 insertions, 127 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index f0d23099ddad..1229588cc911 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -165,18 +165,10 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsFull (void) const -{ - return mbIsFull; -} -sal_Int32 BitmapCache::GetSize (void) -{ - return mnNormalCacheSize; -} diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 1ceae6b69997..0b892be83943 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -79,12 +79,12 @@ public: /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const; + bool IsFull (void) const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void); + sal_Int32 GetSize (void) { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 7b28c7d6ab53..cab9f9244d53 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -51,7 +51,7 @@ public: animation is marked as expired to prevent another run. */ void Expire (void); - bool IsExpired (void); + bool IsExpired (void) { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -342,10 +342,6 @@ void Animator::Animation::Expire (void) -bool Animator::Animation::IsExpired (void) -{ - return mbIsExpired; -} diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 597f3ec6a251..1d1f295f4752 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -211,10 +211,6 @@ model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const -sal_Int32 FocusManager::GetFocusedPageIndex (void) const -{ - return mnPageIndex; -} void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescriptor) diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index b2c66b284ec0..c047be13a4c2 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -161,10 +161,6 @@ void InsertionIndicatorHandler::UpdatePosition ( -bool InsertionIndicatorHandler::IsActive (void) const -{ - return mbIsActive; -} diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 1484159df697..5d40c03c21af 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -275,10 +275,6 @@ int PageSelector::GetPageCount (void) const -int PageSelector::GetSelectedPageCount (void) const -{ - return mnSelectedPageCount; -} diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 091249582316..cd70c1324d07 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -65,10 +65,6 @@ void Properties::HandleDataChangeEvent (void) -bool Properties::IsHighlightCurrentSlide (void) const -{ - return mbIsHighlightCurrentSlide; -} @@ -81,10 +77,6 @@ void Properties::SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide) -bool Properties::IsShowSelection (void) const -{ - return mbIsShowSelection; -} @@ -97,10 +89,6 @@ void Properties::SetShowSelection (const bool bIsShowSelection) -bool Properties::IsShowFocus (void) const -{ - return mbIsShowFocus; -} @@ -113,10 +101,6 @@ void Properties::SetShowFocus (const bool bIsShowFocus) -bool Properties::IsCenterSelection (void) const -{ - return mbIsCenterSelection; -} @@ -129,10 +113,6 @@ void Properties::SetCenterSelection (const bool bIsCenterSelection) -bool Properties::IsSmoothSelectionScrolling (void) const -{ - return mbIsSmoothSelectionScrolling; -} @@ -145,10 +125,6 @@ void Properties::SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrol -bool Properties::IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const -{ - return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -} @@ -224,10 +200,6 @@ void Properties::SetHighlightColor (const Color& rColor) -bool Properties::IsUIReadOnly (void) const -{ - return mbIsUIReadOnly; -} @@ -240,10 +212,6 @@ void Properties::SetUIReadOnly (const bool bIsUIReadOnly) -bool Properties::IsOnlyPreviewTriggersMouseOver (void) const -{ - return mbIsOnlyPreviewTriggersMouseOver; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 5024a7d5b304..62963579a93d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -174,7 +174,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const; + bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -1173,10 +1173,6 @@ void SelectionFunction::ModeHandler::StartDrag ( -bool SelectionFunction::ModeHandler::IsMouseOverIndicatorAllowed (void) const -{ - return mbIsMouseOverIndicatorAllowed; -} diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index c1d55ca1a998..3b055a0848be 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -124,10 +124,6 @@ const ::std::vector<TransferableData::Representative>& TransferableData::GetRepr -SlideSorterViewShell* TransferableData::GetSourceViewShell (void) const -{ - return mpViewShell; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index c6a4f1e5df28..e4135045f369 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -88,10 +88,6 @@ void VisibleAreaManager::DeactivateCurrentSlideTracking (void) -bool VisibleAreaManager::IsCurrentSlideTrackingActive (void) const -{ - return mbIsCurrentSlideTrackingActive; -} diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index ebf2fe97dc74..881567e87868 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -110,7 +110,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const; + sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index dbe7709aec34..75953a49046d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -87,7 +87,7 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const; + bool IsActive (void) const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 0ef877f96d39..0cb6486dd7c4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -109,7 +109,7 @@ public: deselect them. */ int GetPageCount (void) const; - int GetSelectedPageCount (void) const; + int GetSelectedPageCount (void) const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 46c8b61fdaf2..7d70c203fe9a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -40,21 +40,21 @@ public: /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const; + bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const; + bool IsShowSelection (void) const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const; + bool IsShowFocus (void) const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,21 +62,21 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const; + bool IsCenterSelection (void) const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const; + bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const; + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. @@ -102,14 +102,14 @@ public: /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const; + bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const; + bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} private: diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index ed756d864d2b..ad67d7a09ef0 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -75,7 +75,7 @@ public: /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const; + SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index 5e8de169c779..62c1ea3b14e2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -39,7 +39,7 @@ public: void ActivateCurrentSlideTracking (void); void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const; + bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 09fc74c5ea82..f7cb2a4dabd7 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -78,8 +78,8 @@ public: /** Set the edit mode to that currently used by the controller. */ bool SetEditModeFromController (void); - EditMode GetEditMode (void) const; - PageKind GetPageType (void) const; + EditMode GetEditMode (void) const { return meEditMode;} + PageKind GetPageType (void) const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3949be34f42d..196369a060e1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -69,7 +69,7 @@ public: /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const; + SdPage* GetPage (void) const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ @@ -80,7 +80,7 @@ public: XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const; + sal_Int32 GetPageIndex (void) const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); bool UpdateMasterPage (void); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b44bfa987cb9..a94a598e5b43 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -84,7 +84,7 @@ public: method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const; + Layouter::Orientation GetOrientation (void) const { return meOrientation;} void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 1e50f741502d..15262e33e014 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -72,7 +72,7 @@ public: OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const; + bool IsVisible (void) const { return mbIsVisible;} void Hide (void); void Show (void); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 1c21d0e3215a..75201f4cb8fd 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -166,18 +166,10 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -EditMode SlideSorterModel::GetEditMode (void) const -{ - return meEditMode; -} -PageKind SlideSorterModel::GetPageType (void) const -{ - return mePageKind; -} diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index ecaf10c4b6c9..58ba11158ba4 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -73,10 +73,6 @@ PageDescriptor::~PageDescriptor (void) -SdPage* PageDescriptor::GetPage (void) const -{ - return mpPage; -} @@ -89,10 +85,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 8182f0a868f8..b2c604d38703 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -248,10 +248,6 @@ SlideSorter::~SlideSorter (void) -bool SlideSorter::IsValid (void) const -{ - return mbIsValid; -} @@ -335,18 +331,10 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) -ViewShellBase* SlideSorter::GetViewShellBase (void) const -{ - return mpViewShellBase; -} -ViewShell* SlideSorter::GetViewShell (void) const -{ - return mpViewShell; -} diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index fba8dd6ec84a..35f40cb5e553 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -621,10 +621,6 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) -Layouter::Orientation SlideSorterView::GetOrientation (void) const -{ - return meOrientation; -} diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 3755352cc3b3..eb5ceeb41d76 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -354,10 +354,6 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat -bool InsertionIndicatorOverlay::IsVisible (void) const -{ - return mbIsVisible; -} |