From 184a00b96235f6432294ded63ce4a4a318effdb5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 9 Jun 2014 10:09:42 +0200 Subject: loplugin: inlinesimplememberfunctions Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b --- sdext/source/presenter/PresenterController.cxx | 4 ---- sdext/source/presenter/PresenterController.hxx | 2 +- sdext/source/presenter/PresenterScrollBar.cxx | 12 ------------ sdext/source/presenter/PresenterScrollBar.hxx | 6 +++--- sdext/source/presenter/PresenterTextView.cxx | 12 ------------ sdext/source/presenter/PresenterTextView.hxx | 6 +++--- sdext/source/presenter/PresenterToolBar.cxx | 6 +----- 7 files changed, 8 insertions(+), 40 deletions(-) (limited to 'sdext') diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index fa77685bf8ee..43d60acdb25a 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -628,10 +628,6 @@ void PresenterController::SetAccessibilityActiveState (const bool bIsActive) } } -bool PresenterController::IsAccessibilityActive (void) const -{ - return mbIsAccessibilityActive; -} void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent) { diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index aaadbba3dca3..44e943d29542 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -121,7 +121,7 @@ public: bool HasTransition (css::uno::Reference& rxPage); bool HasCustomAnimation (css::uno::Reference& rxPage); void SetAccessibilityActiveState (const bool bIsActive); - bool IsAccessibilityActive (void) const; + bool IsAccessibilityActive (void) const { return mbIsAccessibilityActive;} void HandleMouseClick (const css::awt::MouseEvent& rEvent); void UpdatePaneTitles (void); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 0aa33f2f3571..b6e440c2e8dd 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -210,10 +210,6 @@ void PresenterScrollBar::SetThumbPosition ( } } -double PresenterScrollBar::GetThumbPosition (void) const -{ - return mnThumbPosition; -} void PresenterScrollBar::SetTotalSize (const double nTotalSize) { @@ -236,20 +232,12 @@ void PresenterScrollBar::SetThumbSize (const double nThumbSize) } } -double PresenterScrollBar::GetThumbSize (void) const -{ - return mnThumbSize; -} void PresenterScrollBar::SetLineHeight (const double nLineHeight) { mnLineHeight = nLineHeight; } -double PresenterScrollBar::GetLineHeight (void) const -{ - return mnLineHeight; -} void PresenterScrollBar::SetCanvas (const Reference& rxCanvas) { diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 593b1f52f399..19331e98e89f 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -75,7 +75,7 @@ public: double nPosition, const bool bAsynchronousRepaint); - double GetThumbPosition (void) const; + double GetThumbPosition (void) const { return mnThumbPosition;} /** Set the upper border of the slider range. */ @@ -86,10 +86,10 @@ public: A value not larger than the last value given to SetTotalSize(). */ void SetThumbSize (const double nThumbSize); - double GetThumbSize (void) const; + double GetThumbSize (void) const { return mnThumbSize;} void SetLineHeight (const double nLineHeight); - double GetLineHeight (void) const; + double GetLineHeight (void) const { return mnLineHeight;} /** Set the canvas that is used for painting the scroll bar. */ diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 8073190a39d3..7a6ab95fe78f 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -1133,15 +1133,7 @@ void PresenterTextCaret::HideCaret (void) mnCharacterIndex = -1; } -sal_Int32 PresenterTextCaret::GetParagraphIndex (void) const -{ - return mnParagraphIndex; -} -sal_Int32 PresenterTextCaret::GetCharacterIndex (void) const -{ - return mnCharacterIndex; -} void PresenterTextCaret::SetPosition ( const sal_Int32 nParagraphIndex, @@ -1176,10 +1168,6 @@ void PresenterTextCaret::SetPosition ( } } -bool PresenterTextCaret::IsVisible (void) const -{ - return mbIsCaretVisible; -} void PresenterTextCaret::SetCaretMotionBroadcaster ( const ::boost::function& rBroadcaster) diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 3d404216f9f0..4f67b5724a25 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -52,13 +52,13 @@ public: void ShowCaret (void); void HideCaret (void); - sal_Int32 GetParagraphIndex (void) const; - sal_Int32 GetCharacterIndex (void) const; + sal_Int32 GetParagraphIndex (void) const { return mnParagraphIndex;} + sal_Int32 GetCharacterIndex (void) const { return mnCharacterIndex;} void SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex); - bool IsVisible (void) const; + bool IsVisible (void) const { return mbIsCaretVisible;} /** Set a (possibly empty) functor that broadcasts changes of the caret position. This is used when a PresenterTextView object is set at diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 4c825edce7f5..0b4a2452779a 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -187,7 +187,7 @@ namespace { virtual awt::Size CreateBoundingSize ( const Reference& rxCanvas) = 0; - bool IsEnabled (void) const; + bool IsEnabled (void) const { return mbIsEnabled;} private: bool mbIsEnabled; }; @@ -1343,10 +1343,6 @@ bool Element::IsOutside (const awt::Rectangle& rBox) return false; } -bool Element::IsEnabled (void) const -{ - return mbIsEnabled; -} bool Element::IsFilling (void) const { -- cgit