diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /sd | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/epptbase.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/View.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 8925ff2073c7..ad9becab80bc 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -180,7 +180,7 @@ public: sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); - inline sal_uInt32 GetCount() const { return maFonts.size(); }; + sal_uInt32 GetCount() const { return maFonts.size(); }; const FontCollectionEntry* GetById( sal_uInt32 nId ); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f6f84c0fea22..20c8798fafc6 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -118,9 +118,9 @@ public: void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh() const { return mpDocSh; } + DrawDocShell* GetDocSh() const { return mpDocSh; } inline SdDrawDocument& GetDoc() const; - inline ViewShell* GetViewShell() const { return mpViewSh; } + ViewShell* GetViewShell() const { return mpViewSh; } SfxViewShell* GetSfxViewShell() const override; virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = nullptr, vcl::Window* pWin = nullptr, bool bIsNewObj = false, diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index fa1a6962cece..68df8b54640d 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -140,11 +140,11 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline vcl::Window* GetParentWindow() const { return mpParentWindow; } + vcl::Window* GetParentWindow() const { return mpParentWindow; } sd::Window* GetContentWindow() const; - inline ::sd::View* GetView() const { return mpView; } + ::sd::View* GetView() const { return mpView; } inline SdrView* GetDrawView() const; SD_DLLPUBLIC DrawDocShell* GetDocSh() const; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 810e0709b288..1aa927160b20 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -266,7 +266,7 @@ private: void displaySlideNumber( sal_Int32 nSlide ); void displaySlideIndex( sal_Int32 nIndex ); sal_Int32 getCurrentSlideNumber(); - inline bool isInputFreezed() const { return mbInputFreeze; } + bool isInputFreezed() const { return mbInputFreeze; } void jumpToBookmark( const OUString& sBookmark ); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 5e20423e1bd9..c1f7efcdad24 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -166,7 +166,7 @@ public: void ShowViewTabBar (bool bShow); void SetUserWantsTabBar(bool inValue); - inline bool GetUserWantsTabBar() { return mbUserWantsTabBar; } + bool GetUserWantsTabBar() { return mbUserWantsTabBar; } /** Common code of ViewShellBase::OuterResizePixel() and ViewShellBase::InnerResizePixel(). |