improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

49 files changed, 42 insertions, 210 deletions

diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index aec961d68bb5..cad138eab137 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -55,7 +55,7 @@ public:
     SdCustomShow( const SdCustomShow& rShow );
 
     /** Provides a direct access to the collection of the SdPage objects. */
-    PageVec& PagesVector();
+    PageVec& PagesVector() { return maPages;}
     /**
      * Replaces all occurrences of pOldPage with pNewPage.
      * If pNewPage is 0 then removes all occurrences of pOldPage.
@@ -65,7 +65,7 @@ public:
     void RemovePage( const SdPage* pPage );
 
     void   SetName(const OUString& rName);
-    OUString GetName() const;
+    const OUString& GetName() const { return aName;}
 
     SdDrawDocument* GetDoc() const { return pDoc; }
 
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index a63df61427a4..82c2b767bbca 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -85,10 +85,6 @@ uno::Reference< uno::XInterface > SdCustomShow::getUnoCustomShow()
     return xShow;
 }
 
-SdCustomShow::PageVec& SdCustomShow::PagesVector()
-{
-    return maPages;
-}
 
 void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage )
 {
@@ -112,9 +108,5 @@ void   SdCustomShow::SetName(const OUString& rName)
     aName = rName;
 }
 
-OUString SdCustomShow::GetName() const
-{
-    return aName;
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index bc5f7ad8d1bd..9bf6662c6d0d 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -150,10 +150,6 @@ bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const
     return m_aAtom.nAfterEffect == 3;
 }
 #endif
-sal_uInt32 Ppt97Animation::GetSoundRef() const
-{
-    return m_aAtom.nSoundRef;
-}
 void Ppt97Animation::SetSoundFileUrl( const OUString& rSoundFileUrl )
 {
     m_aSoundFileUrl = rSoundFileUrl;
@@ -191,10 +187,6 @@ bool Ppt97Animation::GetSpecialTextIterationDelay( double& rfTextIterationDelay
     return bRet;
 }
 
-sal_Int32 Ppt97Animation::GetDimColor() const
-{
-    return static_cast<sal_Int32>(m_aAtom.nDimColor);
-}
 
 void Ppt97Animation::SetDimColor( sal_Int32 nDimColor )
 {
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index 28be9d386b08..672678196805 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -96,8 +96,8 @@ public: //public methods
     bool HasEffect() const;
     bool HasParagraphEffect() const;
     bool HasSoundEffect() const;
-    sal_Int32 GetDimColor() const;
-    sal_uInt32 GetSoundRef() const;
+    sal_Int32 GetDimColor() const { return static_cast<sal_Int32>(m_aAtom.nDimColor);}
+    sal_uInt32 GetSoundRef() const { return m_aAtom.nSoundRef;}
     /// @return true if the shape should be animated in addition to the text
     bool HasAnimateAssociatedShape() const;
 
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 5b8fe765c8ea..400fde151eff 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -428,10 +428,6 @@ void TemplateScanner::Scan (void)
 
 
 
-std::vector<TemplateDir*>& TemplateScanner::GetFolderList (void)
-{
-    return maFolderList;
-}
 
 
 
@@ -503,10 +499,6 @@ bool TemplateScanner::HasNextStep (void)
 
 
 
-const TemplateEntry* TemplateScanner::GetLastAddedEntry (void) const
-{
-    return mpLastAddedEntry;
-}
 
 }
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index cc0ac1b3cf71..83978f8f0540 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -153,10 +153,6 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
 
 
 
-::sd::DrawDocShell& SdPageObjsTLB::SdPageObjsTransferable::GetDocShell() const
-{
-    return mrDocShell;
-}
 
 
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index b8c0d757ee6c..855a6672bf72 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -58,25 +58,13 @@ bool ConfigurationClassifier::Partition (void)
 
 
 
-const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1minusC2 (void) const
-{
-    return maC1minusC2;
-}
 
 
 
 
-const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2minusC1 (void) const
-{
-    return maC2minusC1;
-}
 
 
 
-const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const
-{
-    return maC1andC2;
-}
 
 
 void ConfigurationClassifier::PartitionResources (
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 401498bf0928..d10093fa71f3 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -64,7 +64,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC1minusC2 (void) const;
+    const ResourceIdVector& GetC1minusC2 (void) const { return maC1minusC2;}
 
     /** Return the resources that belong to the configuration given as
         rxConfiguration2 to the constructor but that do not belong to
@@ -74,7 +74,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC2minusC1 (void) const;
+    const ResourceIdVector& GetC2minusC1 (void) const { return maC2minusC1;}
 
     /** Return the resources that belong to both the configurations that
         where given to the constructor.
@@ -83,7 +83,7 @@ public:
             returned.  This reference remains valid as long as the called
             ConfigurationClassifier object stays alive.
     */
-    const ResourceIdVector& GetC1andC2 (void) const;
+    const ResourceIdVector& GetC1andC2 (void) const { return maC1andC2;}
 
     void TraceResourceIdVector (
         const sal_Char* pMessage,
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 14cd1ad29e8c..a63a4da0d37e 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -138,10 +138,6 @@ void ConfigurationUpdater::RequestUpdate (
 
 
 
-Reference<XConfiguration> ConfigurationUpdater::GetCurrentConfiguration (void) const
-{
-    return mxCurrentConfiguration;
-}
 
 
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 076b498c5c39..feb6ad686efc 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -72,7 +72,7 @@ public:
         css::drawing::framework::XConfiguration>& rxRequestedConfiguration);
 
     css::uno::Reference<
-        css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const;
+        css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const { return mxCurrentConfiguration;}
 
     friend class ConfigurationUpdaterLock;
     /** Return a lock of the called ConfigurationUpdater.  While the
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 69842bd26c14..a67d146438d1 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -113,10 +113,6 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th
 
 
 
-::boost::shared_ptr<ViewShell> ViewShellWrapper::GetViewShell (void)
-{
-    return mpViewShell;
-}
 
 
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 8c6fd275ff04..a9b1e8cc2dd5 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -903,10 +903,6 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
 
 
 
-Reference<XConfigurationController> FrameworkHelper::GetConfigurationController (void) const
-{
-    return mxConfigurationController;
-}
 
 
 
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index fe2faa50ddc0..bf7462554f1f 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -347,7 +347,7 @@ public:
 
     /** Return a pointer to the tab control for pages.
     */
-    TabControl* GetPageTabControl (void);
+    TabControl* GetPageTabControl (void) { return &maTabControl;}
 
     /** Return a pointer to the tab control for layers.
     */
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 55934933d68a..106bfa22b954 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -124,21 +124,21 @@ public:
 
     /** Return the control of the vertical scroll bar.
     */
-    ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const;
+    ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const { return mpVerticalScrollBar;}
 
     /** Return the control of the horizontal scroll bar.
     */
-    ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const;
+    ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar;}
 
     /** Return the scroll bar filler that paints the little square that is
         enclosed by the two scroll bars.
     */
-    ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const;
+    ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;}
 
     /** Return the content window.  This is a sibling and is geometrically
         enclosed by the scroll bars.
     */
-    SharedSdWindow GetContentWindow (void) const;
+    SharedSdWindow GetContentWindow (void) const { return mpContentWindow;}
 
     model::SlideSorterModel& GetModel (void) const;
 
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 991d2efd7ff8..9bdbaae39e8f 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -133,7 +133,7 @@ public:
         them from the returned list.  All entries that remain until the
         destructor is called will be destroyed.
     */
-    std::vector<TemplateDir*>& GetFolderList (void);
+    std::vector<TemplateDir*>& GetFolderList (void) { return maFolderList;}
 
     /** Implementation of the AsynchronousTask interface method.
     */
@@ -149,7 +149,7 @@ public:
             <NULL/> is returned either before the template scanning is
             started or after it has ended.
     */
-    const TemplateEntry* GetLastAddedEntry (void) const;
+    const TemplateEntry* GetLastAddedEntry (void) const { return mpLastAddedEntry;}
 
     /** Set whether to sort the template entries inside the regions.
     */
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 8cb3266d67b9..a746b1701a07 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -70,7 +70,7 @@ public:
 
     virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
-    ::boost::shared_ptr< ::TabControl> GetTabControl (void) const;
+    ::boost::shared_ptr< ::TabControl> GetTabControl (void) const { return mpTabControl;}
 
     bool ActivatePage (void);
 
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 09ff31f89796..bca37326fafe 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -102,15 +102,15 @@ public:
     */
     void CalcMinZoom (void);
     void SetMinZoom (long int nMin);
-    long GetMinZoom (void) const;
+    long GetMinZoom (void) const { return mnMinZoom;}
     void SetMaxZoom (long int nMax);
-    long GetMaxZoom (void) const;
+    long GetMaxZoom (void) const { return mnMaxZoom;}
 
     long GetZoom (void) const;
 
-    Point GetWinViewPos (void) const;
-    Point GetViewOrigin (void) const;
-    Size GetViewSize (void) const;
+    Point GetWinViewPos (void) const { return maWinPos;}
+    Point GetViewOrigin (void) const { return maViewOrigin;}
+    Size GetViewSize (void) const { return maViewSize;}
     void SetWinViewPos(const Point& rPnt);
     void SetViewOrigin(const Point& rPnt);
     void SetViewSize(const Size& rSize);
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 5f90237117c3..434b6a3ab576 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -302,7 +302,7 @@ public:
                     cssdf::XResourceId>& rxAnchor);
 
     cssu::Reference<cssdf::XConfigurationController>
-        GetConfigurationController (void) const;
+        GetConfigurationController (void) const { return mxConfigurationController;}
 
 
 private:
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index dd8efc9c3087..95252e77e5e8 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -83,7 +83,7 @@ public:
         to obtain a pointer to the wrapped ViewShell object for a given
         XView object.
     */
-    ::boost::shared_ptr<ViewShell> GetViewShell (void);
+    ::boost::shared_ptr<ViewShell> GetViewShell (void) { return mpViewShell;}
 
     // XUnoTunnel
 
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 6a0ffca46a7b..be54329fdde6 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -75,7 +75,7 @@ public:
             ::sd::DrawDocShell& rDocShell,
             NavigatorDragType eDragType,
             const ::com::sun::star::uno::Any& rTreeListBoxData );
-        ::sd::DrawDocShell&     GetDocShell() const;
+        ::sd::DrawDocShell&     GetDocShell() const { return mrDocShell;}
         NavigatorDragType   GetDragType() const { return meDragType;}
 
         static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 8c96d83c9ae5..cc8004f88b89 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -297,10 +297,6 @@ void RequestQueue::Clear (void)
 
 
 
-::osl::Mutex& RequestQueue::GetMutex (void)
-{
-    return maMutex;
-}
 
 
 } } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 887c2cfc96d0..ef28bcd8d0a6 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -98,7 +98,7 @@ public:
 
     /** Return the mutex that guards the access to the priority queue.
     */
-    ::osl::Mutex& GetMutex (void);
+    ::osl::Mutex& GetMutex (void) { return maMutex;}
 
     /** Ensure we don't hand out a page deleted before anyone got a
         chance to process it
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 6a613d8fc27f..0d560b2fe043 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -1037,10 +1037,6 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex
 
 
 
-::boost::shared_ptr<Animator> SlideSorterController::GetAnimator (void) const
-{
-    return mpAnimator;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 512dbab4e670..e7a14b8ee2f5 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -263,10 +263,6 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript
 
 
 
-SharedPageDescriptor CurrentSlideManager::GetCurrentSlide (void)
-{
-    return mpCurrentSlide;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 5d40c03c21af..c90172c90df2 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -279,10 +279,6 @@ int PageSelector::GetPageCount (void) const
 
 
 
-SharedPageDescriptor PageSelector::GetSelectionAnchor (void) const
-{
-    return mpSelectionAnchor;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index cd70c1324d07..f32d577e8820 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -137,10 +137,6 @@ void Properties::SetSuspendPreviewUpdatesDuringFullScreenPresentation (const boo
 
 
 
-Color Properties::GetBackgroundColor (void) const
-{
-    return maBackgroundColor;
-}
 
 
 
@@ -152,10 +148,6 @@ void Properties::SetBackgroundColor (const Color& rColor)
 
 
 
-Color Properties::GetTextColor (void) const
-{
-    return maTextColor;
-}
 
 
 
@@ -168,10 +160,6 @@ void Properties::SetTextColor (const Color& rColor)
 
 
 
-Color Properties::GetSelectionColor (void) const
-{
-    return maSelectionColor;
-}
 
 
 
@@ -184,10 +172,6 @@ void Properties::SetSelectionColor (const Color& rColor)
 
 
 
-Color Properties::GetHighlightColor (void) const
-{
-    return maHighlightColor;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 5d0afac161bc..08c0a3009d87 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -342,10 +342,6 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition)
 
 
 
-::boost::shared_ptr<SelectionObserver> SelectionManager::GetSelectionObserver (void) const
-{
-    return mpSelectionObserver;
-}
 
 } } } // end of namespace ::sd::slidesorter
 
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index 3b055a0848be..ca5a6a7ef7e5 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -116,10 +116,6 @@ void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint)
 
 
 
-const ::std::vector<TransferableData::Representative>& TransferableData::GetRepresentatives (void) const
-{
-    return maRepresentatives;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index db234ea8f715..12ebbe2fd188 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -218,7 +218,7 @@ public:
 
     /** Return an Animator object.
     */
-    ::boost::shared_ptr<Animator> GetAnimator (void) const;
+    ::boost::shared_ptr<Animator> GetAnimator (void) const { return mpAnimator;}
 
     VisibleAreaManager& GetVisibleAreaManager (void) const;
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index fa71863877e5..3e73a45d3dc8 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -77,7 +77,7 @@ public:
     /** Return the page descriptor for the current slide.  Note, that when
         there is no current slide then the returned pointer is empty.
     */
-    model::SharedPageDescriptor GetCurrentSlide (void);
+    model::SharedPageDescriptor GetCurrentSlide (void) { return mpCurrentSlide;}
 
     /** Release all references to model data.
     */
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 0cb6486dd7c4..78be1d40a931 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -116,7 +116,7 @@ public:
         @return
             The returned anchor may be NULL.
     */
-    model::SharedPageDescriptor GetSelectionAnchor (void) const;
+    model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;}
 
 
     typedef ::std::vector<SdPage*> PageSelection;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 7d70c203fe9a..5aac260c2d61 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -81,22 +81,22 @@ public:
 
     /** Return the background color.
     */
-    Color GetBackgroundColor (void) const;
+    Color GetBackgroundColor (void) const { return maBackgroundColor;}
     void SetBackgroundColor (const Color& rColor);
 
     /** Return the text color.
     */
-    Color GetTextColor (void) const;
+    Color GetTextColor (void) const { return maTextColor;}
     void SetTextColor (const Color& rColor);
 
     /** Return the color in which selections are to be painted.
     */
-    Color GetSelectionColor (void) const;
+    Color GetSelectionColor (void) const { return maSelectionColor;}
     void SetSelectionColor (const Color& rColor);
 
     /** Return the color used for highlighting e.g. the current slide.
     */
-    Color GetHighlightColor (void) const;
+    Color GetHighlightColor (void) const { return maHighlightColor;}
     void SetHighlightColor (const Color& rColor);
 
     /** The UI can be set to be read only indepently from the model status.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 020673fa0a17..e546b205519e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -103,7 +103,7 @@ public:
     */
     void SetInsertionPosition (const sal_Int32 nInsertionPosition);
 
-    ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const;
+    ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const { return mpSelectionObserver;}
 
 private:
     SlideSorter& mrSlideSorter;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index ad67d7a09ef0..0075d3b9071b 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -71,7 +71,7 @@ public:
 
     virtual void DragFinished (sal_Int8 nDropAction);
 
-    const ::std::vector<Representative>& GetRepresentatives (void) const;
+    const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;}
 
     /** Return the view shell for which the transferable was created.
     */
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index f7cb2a4dabd7..120315122258 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -165,7 +165,7 @@ public:
     /** Return the mutex so that the caller can lock it and then safely
         access the model.
     */
-    ::osl::Mutex& GetMutex (void);
+    ::osl::Mutex& GetMutex (void) { return maMutex;}
 
     /** Set the XIndexAccess from which the called SlideSorterModel takes
         its pages.
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 196369a060e1..d8121cd6e2e5 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -73,7 +73,7 @@ public:
 
     /** Return the page that is represented by the descriptor as XDrawPage reference.
     */
-    css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const;
+    css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const { return mxPage;}
 
     /** 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
@@ -109,7 +109,7 @@ public:
     */
     void SetCoreSelection (void);
 
-    VisualState& GetVisualState (void);
+    VisualState& GetVisualState (void) { return maVisualState;}
 
     Rectangle GetBoundingBox (void) const;
     Point GetLocation (const bool bIgnoreLocation = false) const;
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index d6712e24b0e3..0cae8ba72f65 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -49,7 +49,7 @@ public:
 
     void UpdateVisualState (const PageDescriptor& rDescriptor);
 
-    Point GetLocationOffset (void) const;
+    Point GetLocationOffset (void) const { return maLocationOffset;}
     bool SetLocationOffset (const Point& rPoint);
 
     sal_Int32 mnPageId; // For debugging
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index a94a598e5b43..85d9c109cdb8 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -215,7 +215,7 @@ public:
     void UpdateOrientation (void);
 
     ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void);
-    ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const;
+    ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const { return mpLayeredDevice;}
 
     class DrawLock
     {
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 20384e38adf0..729788e888be 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -111,8 +111,8 @@ public:
         const Part ePart,
         const CoordinateSystem eCoordinateSystem);
 
-    Image GetTransitionEffectIcon (void) const;
-    Image GetCustomAnimationEffectIcon (void) const;
+    Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;}
+    Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;}
 
 private:
     SharedSdWindow mpWindow;
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 75201f4cb8fd..27dbdd71e8c3 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -424,10 +424,6 @@ void SlideSorterModel::SynchronizeModelSelection (void)
 
 
 
-::osl::Mutex& SlideSorterModel::GetMutex (void)
-{
-    return maMutex;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
index 58ba11158ba4..bbe6488f1a25 100644
--- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
@@ -77,10 +77,6 @@ PageDescriptor::~PageDescriptor (void)
 
 
 
-Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const
-{
-    return mxPage;
-}
 
 
 
@@ -227,10 +223,6 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue)
 
 
 
-VisualState& PageDescriptor::GetVisualState (void)
-{
-    return maVisualState;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
index b097eda592cc..28c85d0a6920 100644
--- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx
+++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
@@ -64,10 +64,6 @@ void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor)
         SetVisualState(VS_None);
 }
 
-Point VisualState::GetLocationOffset (void) const
-{
-    return maLocationOffset;
-}
 
 
 bool VisualState::SetLocationOffset (const Point& rOffset)
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index b2c604d38703..bad61abed479 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -252,27 +252,15 @@ SlideSorter::~SlideSorter (void)
 
 
 
-::boost::shared_ptr<ScrollBar> SlideSorter::GetVerticalScrollBar (void) const
-{
-    return mpVerticalScrollBar;
-}
 
 
 
 
 
-::boost::shared_ptr<ScrollBar> SlideSorter::GetHorizontalScrollBar (void) const
-{
-    return mpHorizontalScrollBar;
-}
 
 
 
 
-::boost::shared_ptr<ScrollBarBox> SlideSorter::GetScrollBarFiller (void) const
-{
-    return mpScrollBarBox;
-}
 
 
 
@@ -323,10 +311,6 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea)
 
 
 
-::SharedSdWindow SlideSorter::GetContentWindow (void) const
-{
-    return mpContentWindow;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 35f40cb5e553..d1d908459460 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -986,10 +986,6 @@ bool SlideSorterView::SetState (
 
 
 
-::boost::shared_ptr<LayeredDevice> SlideSorterView::GetLayeredDevice (void) const
-{
-    return mpLayeredDevice;
-}
 
 
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index eaea90f2cea6..a5f2b5a73fba 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -276,15 +276,7 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount)
 
 
 
-Image PageObjectLayouter::GetTransitionEffectIcon (void) const
-{
-    return maTransitionEffectIcon;
-}
 
-Image PageObjectLayouter::GetCustomAnimationEffectIcon (void) const
-{
-    return maCustomAnimationEffectIcon;
-}
 
 
 } } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index e249a2494aeb..e8d196f26862 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -306,7 +306,7 @@ public:
     void LockUpdate (void);
     void UnlockUpdate (void);
 
-    ToolBarRules& GetToolBarRules (void);
+    ToolBarRules& GetToolBarRules (void) { return maToolBarRules;}
 
 private:
     const static OUString msToolBarResourcePrefix;
@@ -968,10 +968,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
 
-ToolBarRules& ToolBarManager::Implementation::GetToolBarRules (void)
-{
-    return maToolBarRules;
-}
 
 
 
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index d93f5833e717..45f728ced453 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -184,10 +184,6 @@ void ViewTabBar::disposing (void)
 
 
 
-::boost::shared_ptr< ::TabControl> ViewTabBar::GetTabControl (void) const
-{
-    return mpTabControl;
-}
 
 
 
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 372a931895f9..d8a94dfd6c29 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -632,10 +632,6 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex)
 
 
 
-TabControl* DrawViewShell::GetPageTabControl (void)
-{
-    return &maTabControl;
-}
 
 
 
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 3f0dca33cc0e..4247b6a4e946 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -185,10 +185,6 @@ void Window::SetMinZoom (long int nMin)
 
 
 
-long Window::GetMinZoom (void) const
-{
-    return mnMinZoom;
-}
 
 
 
@@ -201,10 +197,6 @@ void Window::SetMaxZoom (long int nMax)
 
 
 
-long Window::GetMaxZoom (void) const
-{
-    return mnMaxZoom;
-}
 
 
 
@@ -324,26 +316,14 @@ void Window::RequestHelp(const HelpEvent& rEvt)
 
 
 
-Point Window::GetWinViewPos (void) const
-{
-    return maWinPos;
-}
 
 
 
 
-Point Window::GetViewOrigin (void) const
-{
-    return maViewOrigin;
-}
 
 
 
 
-Size Window::GetViewSize (void) const
-{
-    return maViewSize;
-}