improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

74 files changed, 102 insertions, 99 deletions

diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index f5148dbe7718..4b95987ddc89 100644
--- a/include/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
@@ -141,7 +141,7 @@ namespace basegfx
             @return
             The Scalar value of the two involved 2D Vectors
         */
-        double scalar( const B2DVector& rVec ) const;
+        double scalar( const B2DVector& rVec ) const { return((mfX * rVec.mfX) + (mfY * rVec.mfY)); }
 
         /** Calculate the length of the cross product with another 2D Vector
 
@@ -158,7 +158,7 @@ namespace basegfx
             @return
             The length of the cross product of the two involved 2D Vectors
         */
-        double cross( const B2DVector& rVec ) const;
+        double cross( const B2DVector& rVec ) const { return(mfX * rVec.getY() - mfY * rVec.getX()); }
 
         /** Calculate the Angle with another 2D Vector
 
diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index 23eb811becd1..1fdeeb4ea13a 100644
--- a/include/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
@@ -121,7 +121,7 @@ namespace basegfx
             @return
             The Scalar value of the two involved 2D Vectors
         */
-        double scalar( const B2IVector& rVec ) const;
+        double scalar( const B2IVector& rVec ) const { return((mnX * rVec.mnX) + (mnY * rVec.mnY)); }
 
         /** Transform vector by given transformation matrix.
 
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 06c67cd75dd3..2f5ef0126ef2 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -188,7 +188,7 @@ public:
     // Modify-Flag will be reset only during save.
     bool            IsBasicModified() const;
 
-    std::vector<BasicError>& GetErrors();
+    std::vector<BasicError>& GetErrors() { return aErrors;}
 
     /** sets a global constant in the basic library, referring to some UNO object, to a new value.
 
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index e245840f193a..3c60c668e386 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -24,6 +24,7 @@
 #include <basic/sbdef.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxdef.hxx>
+#include <basic/sbx.hxx>
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <deque>
@@ -102,7 +103,7 @@ public:
     virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
 
     virtual const OUString& GetSource() const;
-    const OUString&  GetSource32() const;
+    const OUString&  GetSource32() const { return aOUSource;}
     const OUString&  GetComment() const { return aComment; }
     virtual void     SetSource( const OUString& r );
     void             SetSource32( const OUString& r );
@@ -135,7 +136,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > GetUnoModule();
     bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject );
     void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache);
-    SbxArrayRef GetMethods();
+    SbxArrayRef GetMethods() { return pMethods;}
     OUString GetKeywordCase( const OUString& sKeyword ) const;
 };
 
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index ec133d8bbd06..1c84f11ba805 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -137,7 +137,7 @@ public:
 
     virtual SbxClassType GetClass() const SAL_OVERRIDE;
     virtual SbxDataType GetType() const SAL_OVERRIDE;
-    SbxDataType GetFullType() const;
+    SbxDataType GetFullType() const { return aData.eType;}
     bool SetType( SbxDataType );
 
     virtual bool Get( SbxValues& ) const;
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index 04c215295c09..b43beb9f58af 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -89,8 +89,8 @@ namespace canvas
 
         // Sprite
         bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const;
-        ::basegfx::B2DPoint  getPosPixel() const;
-        ::basegfx::B2DVector getSizePixel() const;
+        ::basegfx::B2DPoint  getPosPixel() const { return maPosition; }
+        ::basegfx::B2DVector getSizePixel() const { return maSize; }
         ::basegfx::B2DRange  getUpdateArea() const;
         double               getPriority() const { return mfPriority; }
 
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index 369f8818e77b..0c71b7537142 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -52,7 +52,7 @@ public:
 
     virtual ::rtl::OString  prepareHelp() = 0;
 
-    const ::rtl::OString&   getProgramName() const;
+    const ::rtl::OString&   getProgramName() const { return m_program;}
     bool                isValid(const ::rtl::OString& option) const;
     const ::rtl::OString    getOption(const ::rtl::OString& option) const
         throw( IllegalArgument );
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index 0143faab4ed1..c4efd3aa4f7f 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -43,7 +43,7 @@ public:
 
     void resetInterceptions();
     void resetErrorStates();
-    bool wasWriteError();
+    bool wasWriteError() { return (m_bUsed && m_bHandledByMySelf);}
 
 private:
     virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest&                         aRequest,
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 331b2f895447..4daa11558a3f 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -315,7 +315,7 @@ namespace accessibility
         /// Do we have children? This is the case for image bullets
         bool HaveChildren();
 
-        const Point& GetEEOffset() const;
+        const Point& GetEEOffset() const { return maEEOffset; }
 
         // Get text from forwarder
         OUString GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex );
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index d13ed7bab820..02cbc75843ba 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -186,7 +186,7 @@ namespace accessibility
          */
         SvxViewForwarder&   GetViewForwarder() const;
 
-        const Point& GetEEOffset() const;
+        const Point& GetEEOffset() const { return maEEOffset; }
 
         // the paragraph index in the edit engine (guarded by solar mutex)
         sal_Int32   mnParagraphIndex;
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 586f65592ca5..58af3c4d665f 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -54,7 +54,7 @@ public:
 
     void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); }
     css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager();
-    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager();
+    css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager() { return m_xAppCfgMgr;}
 
 
     css::uno::Any createCommandFromMacro( const OUString& sCmd );
@@ -166,7 +166,8 @@ public:
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) SAL_OVERRIDE;
 #endif
-    Bitmap& getBitMap();
+   // #FIXME Const-ness
+    Bitmap& getBitMap() { return mBitMap;}
 };
 
 class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx
index 6ba969a22e1e..323cad717738 100644
--- a/include/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
@@ -74,7 +74,7 @@ public:
         @return
         The Java virtual machine wrapper.  Will never be null.
      */
-    rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const;
+    rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const { return m_virtualMachine;}
 
     /** Get the UNO class loader.
 
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index e2cda6e4f88c..cdd614063161 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -57,7 +57,7 @@ public:
     AgileEngine();
     virtual ~AgileEngine();
 
-    AgileEncryptionInfo& getInfo();
+    AgileEncryptionInfo& getInfo() { return mInfo;}
 
     virtual bool writeEncryptionInfo(
                     const OUString& rPassword,
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index 366eabc690cd..2d76bee8942c 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -90,7 +90,7 @@ public:
     Standard2007Engine();
     virtual ~Standard2007Engine();
 
-    StandardEncryptionInfo& getInfo();
+    StandardEncryptionInfo& getInfo() { return mInfo;}
 
     virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE;
 
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index e3522e54ea03..54318fa21fc9 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -97,7 +97,7 @@ public:
     /** Returns the scheme name from the a:schemeClr element for interoperability purposes */
     OUString            getSchemeName() const { return msSchemeName; }
     /** Returns the unaltered list of transformations for interoperability purposes */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
 
     /** Translates between color transformation tokens and their names */
     static OUString     getColorTransformationName( sal_Int32 nElement );
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 390086bca369..5882dadde540 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -139,7 +139,7 @@ public:
     void                            setTableType();
 
     void                setTextBody(const TextBodyPtr & pTextBody);
-    TextBodyPtr         getTextBody();
+    TextBodyPtr         getTextBody() { return mpTextBody;}
     void                setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle );
     TextListStylePtr    getMasterTextListStyle() const { return mpMasterTextListStyle; }
 
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index 0ff0360eded4..7b81f030e8a0 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -37,7 +37,7 @@ public:
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
 
-    ShapePtr getShape();
+    ShapePtr getShape() { return mpShapePtr;}
 
 protected:
 
diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx
index 619964eb666d..10bc99627936 100644
--- a/include/oox/helper/grabbagstack.hxx
+++ b/include/oox/helper/grabbagstack.hxx
@@ -38,7 +38,7 @@ public:
 
     virtual ~GrabBagStack();
 
-    OUString getCurrentName();
+    OUString getCurrentName() { return mCurrentElement.maName;}
 
     css::beans::PropertyValue getRootProperty();
 
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index f74963cad8b1..feb062973ce5 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -78,7 +78,7 @@ public:
     // Device info and device dependent unit conversion -----------------------
 
     /** Returns information about the output device. */
-    const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const;
+    const ::com::sun::star::awt::DeviceInfo& getDeviceInfo() const { return maDeviceInfo;}
 
     /** Converts the passed value from horizontal screen pixels to 1/100 mm. */
     sal_Int32           convertScreenPixelXToHmm( double fPixelX ) const;
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index 878037e68d72..b46929e57b46 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -73,7 +73,7 @@ public:
                         getXStorage() const;
 
     /** Returns the element name of this storage. */
-    const OUString& getName() const;
+    const OUString& getName() const { return maStorageName;}
 
     /** Returns the full path of this storage. */
     OUString     getPath() const;
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 945fcd05d320..d433cb458735 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -167,7 +167,7 @@ public:
                                     const com::sun::star::uno::Any& rValue );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
-                        GetCmisProperties() const;
+                        GetCmisProperties() const { return m_aCmisProperties;}
 
     void        SetCmisProperties(const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >& cmisProps );
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE;
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index e746946f55bd..f4fb63e62fa2 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -106,7 +106,7 @@ public:
     OUString GetSuffixes() const;
     OUString GetDefaultExtension() const;
     const OUString& GetServiceName() const { return aServiceName; }
-    const OUString& GetProviderName() const;
+    const OUString& GetProviderName() const { return maProvider;}
 
     static const SfxFilter* GetDefaultFilter( const OUString& rName );
     static const SfxFilter* GetFilterByName( const OUString& rName );
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index d626455f3a92..d8e5cab0dda3 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -126,7 +126,7 @@ public:
     static SfxFrame*    Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden );
 
     SvCompatWeakHdl*    GetHdl();
-    Window&             GetWindow() const;
+    Window&             GetWindow() const { return *pWindow;}
     void                CancelTransfers( bool bCancelLoadEnv = true );
     bool                DoClose();
     sal_uInt16          GetChildFrameCount() const;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index cd97ee341a88..d57b10533e4e 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -121,7 +121,7 @@ public:
     SvLinkSource*   GetObj() const  { return xObj; }
 
     void            SetLinkSourceName( const OUString & rName );
-    OUString        GetLinkSourceName() const;
+    OUString        GetLinkSourceName() const { return aLinkName;}
 
     enum UpdateResult {
         SUCCESS = 0,
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 003d9ac36e00..cd51d2bf67cd 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -109,10 +109,10 @@ public:
 
     sal_uInt16 getCurRegionId () const { return mnCurRegionId;}
 
-    const OUString& getCurRegionName () const;
+    const OUString& getCurRegionName () const { return maCurRegionName;}
 
     // Check if the root region is visible or not.
-    bool isNonRootRegionVisible () const;
+    bool isNonRootRegionVisible () const { return mnCurRegionId;}
 
     void setOpenRegionHdl(const Link &rLink);
 
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 8a31d7f4eb0a..d1bdab7d470a 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -146,7 +146,7 @@ public:
 
     virtual bool        Validate();
 
-    const OString&      GetKey() const;
+    const OString&      GetKey() const { return m_aKey;}
 
     void                SetVersion( long nVers )
                         {
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index a77ebdbc2819..62e343fe9e99 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -56,7 +56,7 @@ public:
 
     void                    Broadcast( const SfxHint &rHint );
 
-    ListenersType& GetAllListeners();
+    ListenersType& GetAllListeners() { return maListeners;}
 
     bool HasListeners() const;
 
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index d7606199fc4f..9ba6868de599 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -30,7 +30,7 @@ public:
     SfxGrabBagItem(const SfxGrabBagItem& rItem);
     virtual ~SfxGrabBagItem();
 
-    const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const;
+    const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const { return m_aMap;}
 
     virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx
index ddb63f14e8d8..aac16df2e006 100644
--- a/include/svl/sharedstring.hxx
+++ b/include/svl/sharedstring.hxx
@@ -34,18 +34,18 @@ public:
     bool operator== ( const SharedString& r ) const;
     bool operator!= ( const SharedString& r ) const;
 
-    OUString getString() const;
+    OUString getString() const { return mpData ? OUString(mpData) : OUString();}
 
     rtl_uString* getData() { return mpData;}
-    const rtl_uString* getData() const;
+    const rtl_uString* getData() const { return mpData;}
 
     rtl_uString* getDataIgnoreCase() { return mpDataIgnoreCase;}
-    const rtl_uString* getDataIgnoreCase() const;
+    const rtl_uString* getDataIgnoreCase() const { return mpDataIgnoreCase;}
 
-    bool isValid() const;
-    bool isEmpty() const;
+    bool isValid() const { return mpData != NULL;}
+    bool isEmpty() const { return mpData == NULL || mpData->length == 0;}
 
-    sal_Int32 getLength() const;
+    sal_Int32 getLength() const { return mpData ? mpData->length : 0;}
 };
 
 }
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 3b936763886b..cabd150756bb 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -229,7 +229,7 @@ public:
 
     const OUString&             GetAppName() const { return aAppName;   }
 
-    SfxItemPool&                GetPool();
+    SfxItemPool&                GetPool() { return rPool;}
     const SfxItemPool&          GetPool() const { return rPool;}
 
     virtual SfxStyleSheetIteratorPtr CreateIterator(SfxStyleFamily, sal_uInt16 nMask);
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index 834150fe0f19..37bfc6d1799f 100644
--- a/include/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~SvColorDialog();
 
     void            SetColor( const Color& rColor );
-    const Color&    GetColor() const;
+    const Color&    GetColor() const { return maColor;}
 
     void            SetMode( sal_Int16 eMode );
 
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 1d3ab7c735c1..4a0d10780851 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -112,7 +112,7 @@ public:
     sal_uInt16      GetSortedCol(){ return nSortCol;}
     SvLBoxItem*     GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const;
 
-    CommandEvent    GetCommandEvent()const;
+    CommandEvent    GetCommandEvent()const { return aCEvt;}
     inline bool     IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
 
     void            SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; }
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index a8a6e657bc4b..352a645ed0e1 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -163,9 +163,9 @@ class SVT_DLLPUBLIC ToolboxController :
         void unbindListener();
         bool isBound() const;
         // TODO remove
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const { return m_xUrlTransformer;}
         // TODO remove
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const { return m_xParentWindow;}
 
         bool                                                                                m_bInitialized : 1,
                                                                                             m_bDisposed : 1;
diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx
index 0f74d9757f8b..71ff072b3fef 100644
--- a/include/svtools/treelistentry.hxx
+++ b/include/svtools/treelistentry.hxx
@@ -73,8 +73,8 @@ public:
     bool HasChildListPos() const;
     sal_uLong GetChildListPos() const;
 
-    SvTreeListEntries& GetChildEntries();
-    const SvTreeListEntries& GetChildEntries() const;
+    SvTreeListEntries& GetChildEntries() { return maChildren;}
+    const SvTreeListEntries& GetChildEntries() const { return maChildren;}
 
     void Clone(SvTreeListEntry* pSource);
 
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index cc1aa035ac8a..ab79abb3eaba 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -385,7 +385,7 @@ public:
     //===== Misc ========================================================
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-        GetXShape();
+        GetXShape() { return( mxShape );}
 
     /** set the index _nIndex at the accessible shape
         @param  _nIndex
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index 0527caf7022d..d56663384819 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -74,7 +74,7 @@ public:
     */
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessibleComponent>
-        GetDocumentWindow (void) const;
+        GetDocumentWindow (void) const { return mxDocumentWindow;}
 
     /** Deprecated.   Use the correctly named SetModelBroadcaster method
         instead.
@@ -86,7 +86,7 @@ public:
     */
     ::com::sun::star::uno::Reference<
         ::com::sun::star::document::XEventBroadcaster>
-        GetControllerBroadcaster (void) const;
+        GetControllerBroadcaster (void) const { return mxModelBroadcaster;}
 
     /** Set a new broadcaster that sends events indicating shape changes.
         The broadcaster usually is or belongs to a document model.
@@ -104,7 +104,7 @@ public:
     */
     ::com::sun::star::uno::Reference<
         ::com::sun::star::document::XEventBroadcaster>
-        GetModelBroadcaster (void) const;
+        GetModelBroadcaster (void) const { return mxModelBroadcaster;}
 
     /** Set the view that will be used to construct SvxTextEditSources which
         in turn are used to create accessible edit engines.
@@ -135,7 +135,7 @@ public:
     */
     ::com::sun::star::uno::Reference<
         ::com::sun::star::frame::XController>
-        GetController (void) const;
+        GetController (void) const { return mxController;}
 
     /** Set the window that is used to construct SvxTextEditSources which in
         turn is used to create accessible edit engines.
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 0b62071789bb..53d78124c30a 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -72,7 +72,7 @@ public:
     sal_uInt16                  GetRowPos(sal_uInt16 _nPos) const;
     sal_uInt16                  GetColumnPos(sal_uInt16 _nPos) const;
 
-    ScrollBar*                  getScrollBar();
+    ScrollBar*                  getScrollBar() { return &aVscrollSB;}
     void                        ReleaseAccessible();
     sal_Int32                   getMaxCharCount() const;
 
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 0580d7164647..4e007dfe9da0 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -114,7 +114,7 @@ public:
     virtual Size        GetOptimalSize() const SAL_OVERRIDE;
 
     void                Reset();
-    RECT_POINT          GetActualRP() const;
+    RECT_POINT          GetActualRP() const { return eRP;}
     void                SetActualRP( RECT_POINT eNewRP );
 
     void                SetState( CTL_STATE nState );
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index d32b8efd47cf..79d257360ad0 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -230,7 +230,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
         // store the attributes passed from pSet
         void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
     protected:
-        OUString GetBulCharFmtName();
+        OUString GetBulCharFmtName() { return aNumCharFmtName;}
         SfxMapUnit GetMapUnit() { return eCoreUnit;}
     protected:
         bool    bIsLoading;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 259f4f4dbda5..24b0c9cf74e4 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -170,7 +170,7 @@ public:
     const basegfx::B3DHomMatrix& GetFullTransform() const;
 
     // get and (re)set transformation matrix
-    const basegfx::B3DHomMatrix& GetTransform() const;
+    const basegfx::B3DHomMatrix& GetTransform() const { return maTransformation;}
     virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix);
     virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix);
 
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 3fd8bd3cb4f6..101b461380ab 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -92,7 +92,7 @@ private:
             virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
             virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-            const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
+            const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const { return aPropSeq;}
 
             com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName );
             com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 );
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index b94e5a97d3be..89c3bb24eb7a 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -139,7 +139,7 @@ namespace sdr
             virtual bool AreGluePointsVisible() const;
 
             // method to get the primitiveAnimator
-            sdr::animation::primitiveAnimator& getPrimitiveAnimator();
+            sdr::animation::primitiveAnimator& getPrimitiveAnimator() {  return maPrimitiveAnimator; }
 
             // method to get the EventHandler. It will
             // return a existing one or create a new one using CreateEventHandler().
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 9e507ad1be86..abdbcc016d72 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -136,7 +136,7 @@ public:
     SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; }
 
     // RedrawRegion
-    const Region& GetRedrawRegion() const;
+    const Region& GetRedrawRegion() const { return maRedrawRegion;}
     void SetRedrawRegion(const Region& rNew);
 
     // #i72889# read/write access to TempoparyTarget
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index a97bf5d8934b..350ad963deba 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
 #include <tools/link.hxx>
@@ -623,7 +624,7 @@ public:
     void setLock( bool bLock );
 
     void            SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
-    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
+    rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;}
 
     void SetCharCompressType( sal_uInt16 nType );
     sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 84ebec038420..82ee2fbf6768 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -900,7 +900,7 @@ public:
     void SetResizeProtect(bool bProt);
     bool IsResizeProtect() const { return bSizProt;}
     void SetPrintable(bool bPrn);
-    bool IsPrintable() const;
+    bool IsPrintable() const { return !bNoPrint;}
     void SetVisible(bool bVisible);
     bool IsVisible() const { return mbVisible;}
     void SetEmptyPresObj(bool bEpt);
@@ -984,7 +984,7 @@ public:
     // the following methods are used to control it;
     // usually this data makes no sense after the import is finished, since the object
     // might be resized
-    Rectangle GetBLIPSizeRectangle() const;
+    Rectangle GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;}
     void SetBLIPSizeRectangle( const Rectangle& aRect );
 
     /// @see mbDoNotInsertIntoPageAutomatically
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 6a529c26c0e7..e60060968fae 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -142,8 +142,8 @@ public:
     void                    ReleaseGraphicLink();
     bool IsLinkedGraphic() const;
 
-    const OUString& GetFileName() const;
-    const OUString& GetFilterName() const;
+    const OUString& GetFileName() const { return aFileName;}
+    const OUString& GetFilterName() const { return aFilterName;}
 
     void                    StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L);
 
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 9dc74bbb7bdb..a3c4f78086a7 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -396,7 +396,7 @@ public:
     virtual bool isUsedByModel() const SAL_OVERRIDE;
 
     // data read/write
-    const SfxItemSet& GetItemSet() const;
+    const SfxItemSet& GetItemSet() const { return *mpProperties;}
     void PutItemSet(const SfxItemSet& rSet);
     void PutItem(const SfxPoolItem& rItem);
     void ClearItem(const sal_uInt16 nWhich = 0);
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 0785eded905b..2450e409617e 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -255,11 +255,11 @@ public:
     void SetApplicationBackgroundColor(Color aBackgroundColor);
 
     // #109585#
-    Color GetApplicationBackgroundColor() const;
+    Color GetApplicationBackgroundColor() const { return maBackgroundColor;}
 
     // #103911# Set/Get document color for svx at SdrPageViews
     void SetApplicationDocumentColor(Color aDocumentColor);
-    Color GetApplicationDocumentColor() const;
+    Color GetApplicationDocumentColor() const { return maDocumentColor;}
 };
 
 
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 645c35383a41..061e983b7e46 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -405,7 +405,7 @@ public:
     bool IsHlplVisible() const { return bHlplVisible; }             // Hilfslinien der Seiten malen oder nicht
     bool IsHlplFront() const { return bHlplFront  ; }               // Hilfslinie ueber die Objekte druebermalen oder dahinter
     bool IsGlueVisible() const { return bGlueVisible; }             // Konnektoren der objekte sichtbar oder nicht
-    Color GetGridColor() const;
+    Color GetGridColor() const { return maGridColor;}
     void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
     void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
     void SetBordVisible(bool bOn = true) { bBordVisible=bOn; InvalidateAllWin(); }
@@ -532,7 +532,7 @@ public:
     bool IsPrintPreview() const { return bPrintPreview; }
     void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
 
-    const svtools::ColorConfig& getColorConfig() const;
+    const svtools::ColorConfig& getColorConfig() const { return maColorConfig;}
 
     virtual void onChangeColorConfig();
 
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index a237bc23f8cb..81debfd248df 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -247,7 +247,7 @@ public:
     // und mehr...
     OUString GetStatusText();
 
-    SvtAccessibilityOptions& getAccessibilityOptions();
+    SvtAccessibilityOptions& getAccessibilityOptions() { return maAccessibilityOptions;}
 
     virtual void onAccessibilityOptionsChanged();
 };
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index a5ebc6d62a9e..686d3b6361ef 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -63,7 +63,7 @@ public:
                                     SfxMapUnit ePresMetric,
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 
-    const GraphicObject& GetGraphicObject() const;
+    const GraphicObject& GetGraphicObject() const { return maGraphicObject;}
     void SetGraphicObject(const GraphicObject& rGraphicObject);
 
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 364292f66e89..a37ac54b0883 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -55,7 +55,7 @@ public:
     virtual bool            HasMetrics() const SAL_OVERRIDE;
     virtual bool            ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE;
 
-    const XHatch&           GetHatchValue() const; // GetValue -> GetHatchValue
+    const XHatch&           GetHatchValue() const { return aHatch;} // GetValue -> GetHatchValue
     void                    SetHatchValue(const XHatch& rNew)  { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
 
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index e58159932117..9c31904671e3 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -57,7 +57,7 @@ public:
     virtual bool            HasMetrics() const SAL_OVERRIDE;
     virtual bool            ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE;
 
-    const XDash&            GetDashValue() const;
+    const XDash&            GetDashValue() const { return aDash;}
     void                    SetDashValue(const XDash& rNew)   { aDash = rNew; Detach(); } // SetValue -> SetDashValue
 
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index edd77763abab..175f02380b82 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -54,7 +54,7 @@ public:
                                     SfxMapUnit ePresMetric,
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 
-    basegfx::B2DPolyPolygon GetLineEndValue() const;
+    basegfx::B2DPolyPolygon GetLineEndValue() const { return maPolyPolygon;}
     void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
 
     XLineEndItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index bb0c66720d31..1d3b525e993c 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -54,7 +54,7 @@ public:
                                     SfxMapUnit ePresMetric,
                                     OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
 
-    basegfx::B2DPolyPolygon GetLineStartValue() const;
+    basegfx::B2DPolyPolygon GetLineStartValue() const { return maPolyPolygon;}
     void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
 
     XLineStartItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index 0cb37424ef19..45c32b60bb34 100644
--- a/include/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
@@ -40,7 +40,7 @@ public:
     virtual ~SvxZoomSliderItem();
 
     void AddSnappingPoint( sal_Int32 nNew );
-    const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const;
+    const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;}
     sal_uInt16 GetMinZoom() const {return mnMinZoom;}
     sal_uInt16 GetMaxZoom() const {return mnMaxZoom;}
 
diff --git a/include/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx
index cb7403ca69d7..844c61bae55a 100644
--- a/include/unotest/officeconnection.hxx
+++ b/include/unotest/officeconnection.hxx
@@ -46,7 +46,7 @@ public:
     void tearDown();
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-    getComponentContext() const;
+    getComponentContext() const { return context_;}
 
     // Must not be called before setUp or after tearDown:
     bool isStillAlive() const;
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 134d7cadce5c..b30af8083d4e 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -169,7 +169,7 @@ namespace utl
             /** writes the changed values into the sub tree. Always called in the Dtor of the derived class.  */
             virtual void            Commit()=0;
 
-            bool IsInValueChange() const;
+            bool IsInValueChange() const { return m_nInValueChange > 0;}
 
             sal_Int16               GetMode() const { return m_nMode;}
     };
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 13d2beff9cb9..adb08cb50801 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -76,7 +76,7 @@ public :
     void        WriteBool( const OUString& rKey, bool bValue );
     void        WriteInt32( const OUString& rKey, sal_Int32 nValue );
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const { return aFilterData;}
 
     // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 1c283aff5f47..1146c73dc3a3 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -369,7 +369,7 @@ public:
     bool            IsRadioCheckEnabled() const { return mbRadioCheck; }
 
     bool            SetModeRadioImage( const Image& rImage );
-    const Image&    GetModeRadioImage( ) const;
+    const Image&    GetModeRadioImage( ) const { return maImage;}
 
     void            SetState( bool bCheck );
     void            Check( bool bCheck = true );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index fe4b7c6d0344..f60e895f03d8 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -136,7 +136,7 @@ public:
     void            ToggleFloatingMode();
 
     void            SetDragArea( const Rectangle& rRect );
-    Rectangle       GetDragArea() const;
+    Rectangle       GetDragArea() const { return maDragArea;}
 
     void            Lock();
     void            Unlock();
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index dbd6d131803f..e43c1b1aa138 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -250,7 +250,7 @@ class VCL_DLLPUBLIC HelpEvent
 {
 private:
     Point           maPos;
-    sal_uInt16          mnMode;
+    sal_uInt16      mnMode;
     bool            mbKeyboardActivated;
 
 public:
@@ -258,8 +258,8 @@ public:
     explicit        HelpEvent( sal_uInt16 nHelpMode );
     explicit        HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
 
-    const Point&    GetMousePosPixel() const;
-    sal_uInt16          GetMode() const { return mnMode; }
+    const Point&    GetMousePosPixel() const { return maPos; }
+    sal_uInt16      GetMode() const { return mnMode; }
     bool            KeyboardActivated() const { return mbKeyboardActivated; }
     void            SetKeyboardActivated( bool bKeyboard ) { mbKeyboardActivated = bKeyboard; }
 };
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 8a7f844fa4d2..ad3e31044e18 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -442,7 +442,7 @@ public:
     const Time&             GetMax() const { return maMax; }
 
     void                    SetTimeFormat( TimeFormat eNewFormat );
-    TimeFormat              GetTimeFormat() const;
+    TimeFormat              GetTimeFormat() const { return (TimeFormat)mnTimeFormat;}
 
     void                    SetFormat( TimeFieldFormat eNewFormat );
     TimeFieldFormat         GetFormat() const { return meFormat; }
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 9d182ad54f1d..c6e2c45f55a5 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -199,7 +199,7 @@ public:
     const Image&    GetImage() const { return maImage; }
 
     bool        SetModeImage( const Image& rImage );
-    const Image&    GetModeImage( ) const;
+    const Image&    GetModeImage( ) const { return maImage;}
     virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
 
     static Image loadThemeImage(const OString &rFileName);
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index 37e4465d4f53..9ad244c473d7 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -116,7 +116,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
             @return
                 m_sURL
         */
-        OUString    GetURL() const;
+        const OUString&    GetURL() const { return m_sURL;}
 
         /** sets new text and recalculates the text length. */
         virtual void SetText(const OUString& rNewDescription) SAL_OVERRIDE;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 9eafde5e70b2..c092f0bbf7ec 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -153,13 +153,13 @@ public:
     void                SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns );
     const sal_uInt8*            GetData() const;
 
-    const Size&         GetPrefSize() const;
+    const Size&         GetPrefSize() const { return mpImpData->maPrefSize;}
     void                SetPrefSize( const Size& rPrefSize );
-    bool                IsPrefSizeValid();
+    bool                IsPrefSizeValid() { return mpImpData->mbPrefSizeValid;}
 
-    const MapMode&      GetPrefMapMode() const;
+    const MapMode&      GetPrefMapMode() const { return mpImpData->maPrefMapMode;}
     void                SetPrefMapMode( const MapMode& rPrefMapMode );
-    bool                IsPrefMapModeValid();
+    bool                IsPrefMapModeValid() { return mpImpData->mbPrefMapModeValid;}
 
     bool                IsNative() const;
     bool                IsUser() const { return( GFX_LINK_TYPE_USER == meType ); }
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a27fcbe98c2e..1579845a4cac 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -311,7 +311,7 @@ public:
 
     void            Abort() { bAbort = true; }
 
-    const FilterErrorEx&    GetLastError() const;
+    const FilterErrorEx&    GetLastError() const { return *pErrorEx;}
     void                    ResetLastError();
 
     const Link      GetFilterCallback() const;
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index b7ef7fbf4737..a96ac40d2427 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -300,7 +300,7 @@ public:
     /// Query path to fill
     void            getPath             ( PolyPolygon& ) const;
     /// Get color used for solid fills
-    Color           getFillColor        () const;
+    const Color&    getFillColor        () const { return maFillColor;}
     /** Get stroke transparency
 
         @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent)
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 608c9cb2ef19..1e6f13ed3bae 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -157,7 +157,7 @@ public:
 
     void setWinPosAndSize(const Point &rPos, const Size& rSize);
     void setWinSize(const Size& rSize);
-    GLWindow& getOpenGLWindow();
+    GLWindow& getOpenGLWindow() { return m_aGLWin;}
 
     void renderToFile();
 
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1a8c67623282..cefffe2815c5 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1603,7 +1603,7 @@ public:
 
         @return the current offset in pixel
      */
-    Size                        GetPixelOffset() const;
+    Size                        GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY);}
 
     Point                       LogicToPixel( const Point& rLogicPt ) const;
     Size                        LogicToPixel( const Size& rLogicSize ) const;
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 2b603c1c67ea..85541fe1817b 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -143,10 +143,10 @@ public :
     bool    GetIsReduceImageResolution() const { return mbReduceImageResolution;}
     void        SetIsReduceImageResolution( const bool bReduceImageResolution );
 
-    const com::sun::star::lang::Locale& GetDocumentLocale() const;
+    const com::sun::star::lang::Locale& GetDocumentLocale() const { return maDocLocale;}
     void        SetDocumentLocale( const com::sun::star::lang::Locale& rLoc );
 
-    std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks();
+    std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return maBookmarks;}
 
     /** Start a new group of render output
 
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 473b8e4f4f71..25bc14709115 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -249,7 +249,7 @@ class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
 public:
     VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
     virtual ~VclAccessibleEvent();
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const { return mxAccessible;}
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index b45ed3993c4b..d0b02456e6f5 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -539,7 +539,7 @@ public:
 
     ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext();
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() { return m_xContext;}
 
     // Shapes in Writer cannot be named via context menu (#i51726#)
     SvtModuleOptions::EFactory GetModelType() const
diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index 02866c3f5868..45f53d94fc88 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -66,7 +66,7 @@ public:
 
     int getNamespaceId(Span const & prefix) const;
 
-    OUString getUrl() const;
+    const OUString& getUrl() const { return fileUrl_;}
 
 private:
     typedef std::vector< Span > NamespaceIris;