improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

34 files changed, 85 insertions, 84 deletions

diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index dbf807dab8e5..c1afbf9edd28 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -31,6 +31,7 @@
 #include <rtl/ustring.h>
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
+#include "scmatrix.hxx"
 
 #include "types.hxx"
 
@@ -224,7 +225,7 @@ public:
     bool                HasVarRes() const       { return ( xVarRes.is() ); }
     double              GetValue() const        { return fValue; }
     const OUString&     GetString() const       { return aString; }
-    ScMatrixRef         GetMatrix() const;
+    ScMatrixRef         GetMatrix() const       { return xMatrix;}
     com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult>
                         GetVarRes() const       { return xVarRes; }
 };
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index bb14668a045f..df7ed0106b6c 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -377,7 +377,7 @@ public:
     virtual bool operator==(const SfxPoolItem& rCmp ) const SAL_OVERRIDE;
     virtual ScCondFormatItem*  Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE;
 
-    const std::vector<sal_uInt32>& GetCondFormatData() const;
+    const std::vector<sal_uInt32>& GetCondFormatData() const { return maIndex;}
     void AddCondFormatData( sal_uInt32 nIndex );
     void SetCondFormatData( const std::vector<sal_uInt32>& aIndex );
     void RemoveCondFormatData( sal_uInt32 nIndex );
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 24c1bcdc0913..f9a364181389 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -49,7 +49,7 @@ public:
         virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE;
         void addFileId(sal_uInt16 nFileId);
         void removeFileId(sal_uInt16 nFileId);
-        ::boost::unordered_set<sal_uInt16>& getAllFileIds();
+        ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
 
     private:
         ExternalRefListener();
@@ -83,7 +83,7 @@ public:
     ScChartListener( const ScChartListener& );
     virtual ~ScChartListener();
 
-    const OUString& GetName() const;
+    const OUString& GetName() const { return maName;}
 
     void            SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener,
                             const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource );
@@ -167,9 +167,9 @@ public:
 
     void removeByName(const OUString& rName);
 
-    const ListenersType& getListeners() const;
-    ListenersType& getListeners();
-    StringSetType& getNonOleObjectNames();
+    const ListenersType& getListeners() const { return maListeners;}
+    ListenersType& getListeners() { return maListeners;}
+    StringSetType& getNonOleObjectNames() { return maNonOleObjectNames;}
 
     /**
      * Create a unique name that's not taken by any existing chart listener
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index bc8304982dce..49c6409384b7 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -404,8 +404,8 @@ public:
     void                SetDateTimeUTC( const DateTime& rDT )
                             { aDateTime = rDT; }
 
-    SC_DLLPUBLIC const OUString& GetUser() const;
-    const OUString& GetComment() const;
+    const OUString& GetUser() const { return aUser;}
+    const OUString& GetComment() const { return aComment;}
 
     // set user comment
     void SetComment( const OUString& rStr );
@@ -799,8 +799,8 @@ public:
 
     void GetOldString( OUString& rStr, const ScDocument* pDoc ) const;
     void GetNewString( OUString& rStr, const ScDocument* pDoc ) const;
-    SC_DLLPUBLIC const ScCellValue& GetOldCell() const;
-    SC_DLLPUBLIC const ScCellValue& GetNewCell() const;
+    const ScCellValue& GetOldCell() const { return maOldCell;}
+    const ScCellValue& GetNewCell() const { return maNewCell;}
     virtual void GetDescription(
         OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE;
 
@@ -1076,8 +1076,8 @@ public:
     bool IsInDeleteUndo() const { return bInDeleteUndo; }
     bool IsInPasteCut() const { return bInPasteCut; }
     SC_DLLPUBLIC void SetUser( const OUString& rUser );
-    SC_DLLPUBLIC const OUString& GetUser() const;
-    SC_DLLPUBLIC const std::set<OUString>& GetUserCollection() const;
+    const OUString& GetUser() const { return maUser;}
+    const std::set<OUString>& GetUserCollection() const { return maUserCollection;}
     ScDocument*         GetDocument() const { return pDoc; }
                         // for import filter
     const DateTime&     GetFixDateTime() const { return aFixDateTime; }
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index b206b33ef999..7a2eb441f4e3 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -96,7 +96,7 @@ public:
     void setDeleteFlag( sal_uInt16 nFlag );
     sal_uInt16 getDeleteFlag() const { return mnDeleteFlag;}
 
-    ScCellValue& getSingleCell();
+    ScCellValue& getSingleCell() { return maSingleCell;}
 
     void setCondFormatList( ScConditionalFormatList* pCondFormatList );
     ScConditionalFormatList* getCondFormatList() { return mpCondFormatList;}
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index b06fe2b8bd32..06c3c80c7faa 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -61,7 +61,7 @@ public:
     ScColorScaleEntry(ScDocument* pDoc, const ScColorScaleEntry& rEntry);
     ~ScColorScaleEntry();
 
-    const Color& GetColor() const;
+    const Color& GetColor() const { return maColor;}
     void SetColor(const Color&);
     double GetValue() const;
     void SetValue(double nValue);
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 547fd147b3ca..e4e956b104bb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -166,8 +166,8 @@ public:
 
     void        Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
 
-    ScDocument& GetDoc();
-    const ScDocument& GetDoc() const;
+    ScDocument& GetDoc() { return *pDocument;}
+    const ScDocument& GetDoc() const { return *pDocument;}
     SCTAB GetTab() const { return nTab; }
     SCCOL GetCol() const { return nCol; }
     sc::CellStoreType& GetCellStore() { return maCells; }
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 0f2bde98796e..f70b01bd6585 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -350,7 +350,7 @@ public:
     void SetDateType(condformat::ScCondFormatDateType eType);
     condformat::ScCondFormatDateType GetDateType() const { return meType;}
 
-    const OUString& GetStyleName() const;
+    const OUString& GetStyleName() const { return maStyleName;}
     void SetStyleName( const OUString& rStyleName );
 
     virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::DATE; }
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c42e97043541..bb2684a409f4 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -220,11 +220,11 @@ public:
     ScDBCollection(ScDocument* pDocument);
     ScDBCollection(const ScDBCollection& r);
 
-    NamedDBs& getNamedDBs();
-    const NamedDBs& getNamedDBs() const;
+    NamedDBs& getNamedDBs() { return maNamedDBs;}
+    const NamedDBs& getNamedDBs() const { return maNamedDBs;}
 
-    AnonDBs& getAnonDBs();
-    const AnonDBs& getAnonDBs() const;
+    AnonDBs& getAnonDBs() { return maAnonDBs;}
+    const AnonDBs& getAnonDBs() const { return maAnonDBs;}
 
     const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const;
     ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly);
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index cf858a0ecdf7..212a64440bb8 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -215,13 +215,13 @@ public:
 
     const ScAddress& GetPos() const { return maCurPos; }
 
-    CellType getType() const;
+    CellType getType() const { return maCurCell.meType;}
     OUString getString();
-    const EditTextObject* getEditText() const;
-    ScFormulaCell* getFormulaCell();
-    const ScFormulaCell* getFormulaCell() const;
+    const EditTextObject* getEditText() const { return maCurCell.mpEditText;}
+    ScFormulaCell* getFormulaCell() { return maCurCell.mpFormula;}
+    const ScFormulaCell* getFormulaCell() const { return maCurCell.mpFormula;}
     ScCellValue getCellValue() const;
-    const ScRefCellValue& getRefCellValue() const;
+    const ScRefCellValue& getRefCellValue() const { return maCurCell;}
 
     bool hasString() const;
     bool hasEmptyData() const;
@@ -545,7 +545,7 @@ public:
     SCCOL                   GetEndCol() const       { return nFoundEndCol; }
     SCROW                   GetRow() const          { return nFoundRow; }
     const ScPatternAttr*    GetPattern() const      { return pFoundPattern; }
-    const ScRefCellValue&   GetCell() const;
+    const ScRefCellValue&   GetCell() const { return maFoundCell;}
 };
 
 class ScRowBreakIterator
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c00f55efd632..9d032d545263 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -553,8 +553,8 @@ public:
     SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, OUString* pName=NULL ) const;
 
     bool HasPivotTable() const;
-    SC_DLLPUBLIC ScDPCollection*        GetDPCollection();
-    SC_DLLPUBLIC const ScDPCollection* GetDPCollection() const;
+    SC_DLLPUBLIC ScDPCollection*       GetDPCollection();
+    const ScDPCollection* GetDPCollection() const { return pDPCollection; }
     SC_DLLPUBLIC ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
     ScDPObject*         GetDPAtBlock( const ScRange& rBlock ) const;
 
@@ -769,7 +769,7 @@ public:
     void            BeginUnoRefUndo();
     bool            HasUnoRefUndo() const       { return ( pUnoRefUndoList != NULL ); }
     ScUnoRefList*   EndUnoRefUndo();            // must be deleted by caller!
-    sal_Int64       GetNewUnoId();
+    sal_Int64       GetNewUnoId() { return ++nUnoObjectId; }
     void            AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges );
 
     bool IsChart( const SdrObject* pObject );
@@ -1034,7 +1034,7 @@ public:
     void             SetPreviewFont( SfxItemSet* pFontSet );
     SfxItemSet*      GetPreviewFont() { return pPreviewFont; }
     SfxItemSet*      GetPreviewFont( SCCOL nCol, SCROW nRow, SCTAB nTab );
-    const ScMarkData GetPreviewSelection();
+    const ScMarkData& GetPreviewSelection() const { return maPreviewSelection; }
     void             SetPreviewSelection( ScMarkData& rSel );
     ScStyleSheet*    GetPreviewCellStyle() { return pPreviewCellStyle; }
     ScStyleSheet*    GetPreviewCellStyle( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -1410,7 +1410,7 @@ public:
 
     SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const;
 
-    const ScValidationDataList* GetValidationList() const;
+    const ScValidationDataList* GetValidationList() const { return pValidationList;}
     ScValidationDataList* GetValidationList() { return pValidationList;}
 
     SC_DLLPUBLIC void           ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab,
@@ -2092,7 +2092,7 @@ public:
 #endif
 
     void SetCalcConfig( const ScCalcConfig& rConfig );
-    const ScCalcConfig& GetCalcConfig() const;
+    const ScCalcConfig& GetCalcConfig() const { return maCalcConfig; }
 
 private:
 
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index a740a929cbe8..ba578d2b5262 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -106,7 +106,7 @@ public:
     sal_Int32 getRowSize() const;
     sal_Int32 getColSize() const;
 
-    const ScDPCache* getCache() const;
+    const ScDPCache* getCache() const { return &mrCache;}
 
     void fillTable(const ScQueryParam& rQuery, bool bIgnoreEmptyRows, bool bRepeatIfEmpty);
 
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 4990a29e8542..60b5d18a213b 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -143,7 +143,7 @@ public:
                 ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
     virtual     ~ScDPGroupTableData();
 
-    boost::shared_ptr<ScDPTableData> GetSourceTableData();
+    boost::shared_ptr<ScDPTableData> GetSourceTableData() { return pSourceData;}
 
     void        AddGroupDimension( const ScDPGroupDimension& rGroup );
     void        SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup );
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 5ab1b1ac76d3..1b586060627d 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -70,7 +70,7 @@ public:
     ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue);
     ~ScDPItemData();
 
-    Type GetType() const;
+    Type GetType() const { return static_cast<Type>(meType); }
     void SetEmpty();
     void SetString(const OUString& rS);
     void SetString(const OUString* pS);
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index b6866f743c95..696ec1f92766 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -396,9 +396,9 @@ public:
     void FreeTable(ScDPObject* pDPObj);
     SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
 
-    SC_DLLPUBLIC SheetCaches& GetSheetCaches();
-    NameCaches& GetNameCaches();
-    DBCaches& GetDBCaches();
+    SheetCaches& GetSheetCaches() { return maSheetCaches;}
+    NameCaches& GetNameCaches() { return maNameCaches;}
+    DBCaches& GetDBCaches() { return maDBCaches;}
 
     ScRangeList GetAllTableRanges( SCTAB nTab ) const;
     bool IntersectsTableByColumns( SCCOL nCol1, SCCOL nCol2, SCROW nRow, SCTAB nTab ) const;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index ff3f43827614..4a4178d905d9 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -269,7 +269,7 @@ public:
     SC_DLLPUBLIC void SetGrandTotalName(const OUString& rName);
     SC_DLLPUBLIC const OUString* GetGrandTotalName() const;
 
-    SC_DLLPUBLIC const DimsType& GetDimensions() const;
+    const DimsType& GetDimensions() const { return aDimList;}
 
     /**
      * Get sort order map to sort row and column dimensions in order of
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index b5b10cb3d341..e591aaefd4d3 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -62,10 +62,10 @@ public:
      */
     SC_DLLPUBLIC const ScRange& GetSourceRange() const;
     SC_DLLPUBLIC void SetRangeName(const OUString& rName);
-    SC_DLLPUBLIC const OUString& GetRangeName() const;
+    const OUString& GetRangeName() const { return maRangeName;}
     bool HasRangeName() const;
     void SetQueryParam(const ScQueryParam& rParam);
-    const ScQueryParam& GetQueryParam() const;
+    const ScQueryParam& GetQueryParam() const { return maQueryParam;}
 
     bool operator== ( const ScSheetSourceDesc& rOther ) const;
     SC_DLLPUBLIC const ScDPCache* CreateCache(const ScDPDimensionSaveData* pDimData) const;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 757054fb4131..733084952b18 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -424,7 +424,7 @@ public:
     bool                        HasSelectedPage() const     { return bHasSelectedPage; }
     const ScDPItemData&         GetSelectedData();
 
-    const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const;
+    const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;}
 };
 
 class ScDPHierarchies : public cppu::WeakImplHelper2<
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 666958a5f60a..78176fbc94f5 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -274,7 +274,7 @@ public:
      */
     bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets, bool bPermanent );
     void setAllCacheTableReferencedStati( bool bReferenced );
-    bool areAllCacheTablesReferenced() const;
+    bool areAllCacheTablesReferenced() const { return maReferenced.mbAllReferenced;}
 
     /**
      * Collect all cached non-empty cell positions, inferred directly from the
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 25efdb786a8e..9e55aec7fd99 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -302,7 +302,7 @@ public:
     sc::FormulaResultValue GetResult();
     sal_uInt8       GetMatrixFlag() const { return cMatrixFlag;}
     ScTokenArray* GetCode() { return pCode;}
-    const ScTokenArray* GetCode() const;
+    const ScTokenArray* GetCode() const { return pCode;}
 
     void SetCode( ScTokenArray* pNew );
 
@@ -375,7 +375,7 @@ public:
      * Turn a non-grouped cell into the top of a grouped cell.
      */
     ScFormulaCellGroupRef CreateCellGroup( SCROW nLen, bool bInvariant );
-    ScFormulaCellGroupRef GetCellGroup() const;
+    ScFormulaCellGroupRef GetCellGroup() const { return mxGroup;}
     void SetCellGroup( const ScFormulaCellGroupRef &xRef );
 
     CompareState CompareByTokenArray( ScFormulaCell& rOther ) const;
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index f42fdc7a4054..000a5beca7e7 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -32,7 +32,7 @@ class StartListeningContext : boost::noncopyable
 public:
     StartListeningContext(ScDocument& rDoc);
     StartListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet);
-    ScDocument& getDoc();
+    ScDocument& getDoc() { return mrDoc;}
 
     ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
 };
@@ -51,7 +51,7 @@ public:
 
     void setPositionDelta( const ScAddress& rDelta );
 
-    ScDocument& getDoc();
+    ScDocument& getDoc() { return mrDoc;}
     ScTokenArray* getOldCode() { return mpOldCode;}
     ScAddress getOldPosition( const ScAddress& rPos ) const;
 
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index eb374ec6d037..82c2247c7a29 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -87,7 +87,7 @@ public:
     SCTAB       GetFirstSelected() const;
     SCTAB       GetLastSelected() const;
 
-    const MarkedTabsType& GetSelectedTabs() const;
+    const MarkedTabsType& GetSelectedTabs() const { return maTabMarked;}
     void SetSelectedTabs(const MarkedTabsType& rTabs);
 
     void        SetMarkNegative( bool bFlag )   { bMarkIsNeg = bFlag; }
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 5716207e07e7..e4408b2cf8a2 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -99,12 +99,12 @@ public:
     const ScNoteData& GetNoteData() const { return maNoteData;}
 
     /** Returns the creation date of this note. */
-    const OUString& GetDate() const;
+    const OUString& GetDate() const { return maNoteData.maDate;}
     /** Sets a new creation date for this note. */
     void SetDate( const OUString& rDate );
 
     /** Returns the author date of this note. */
-    const OUString& GetAuthor() const;
+    const OUString& GetAuthor() const { return maNoteData.maAuthor;}
     /** Sets a new author date for this note. */
     void SetAuthor( const OUString& rAuthor );
 
@@ -123,7 +123,7 @@ public:
 
     /** Returns an existing note caption object. returns null, if the note
         contains initial caption data needed to construct a caption object. */
-    SdrCaptionObj* GetCaption() const;
+    SdrCaptionObj* GetCaption() const { return maNoteData.mpCaption;}
     /** Returns the caption object of this note. Creates the caption object, if
         the note contains initial caption data instead of the caption. */
     SdrCaptionObj*      GetOrCreateCaption( const ScAddress& rPos ) const;
@@ -133,7 +133,7 @@ public:
     /** Shows or hides the note caption object. */
     void                ShowCaption( const ScAddress& rPos, bool bShow = true );
     /** Returns true, if the caption object is visible. */
-    bool IsCaptionShown() const;
+    bool IsCaptionShown() const { return maNoteData.mbShown;}
 
     /** Shows or hides the caption temporarily (does not change internal visibility state). */
     void                ShowCaptionTemp( const ScAddress& rPos, bool bShow = true );
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 2d1116e66629..f024e6de2753 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -64,7 +64,7 @@ struct SC_DLLPUBLIC ScQueryEntry
     /// creates pSearchParam and pSearchText if necessary, always RegExp!
     utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const;
 
-    QueryItemsType& GetQueryItems();
+    QueryItemsType& GetQueryItems() { return maQueryItems;}
     const QueryItemsType& GetQueryItems() const { return maQueryItems;}
     void SetQueryByEmpty();
     bool IsQueryByEmpty() const;
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 53a356c959b5..ac27db8a3d9a 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -57,7 +57,7 @@ public:
     void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
     /// InitAddressRel: InitFlags and set address, everything relative to rPos
     void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos );
-    sal_uInt8 FlagValue() const;
+    sal_uInt8 FlagValue() const { return mnFlagValue;}
 
     void SetColRel( bool bVal ) { Flags.bColRel = bVal; }
     bool IsColRel() const { return Flags.bColRel; }
@@ -77,11 +77,11 @@ public:
     void IncTab( SCTAB nInc );
 
     void SetColDeleted( bool bVal );
-    bool IsColDeleted() const;
+    bool IsColDeleted() const { return Flags.bColDeleted;}
     void SetRowDeleted( bool bVal );
-    bool IsRowDeleted() const;
+    bool IsRowDeleted() const { return Flags.bRowDeleted;}
     void SetTabDeleted( bool bVal );
-    bool IsTabDeleted() const;
+    bool IsTabDeleted() const { return Flags.bTabDeleted;}
     bool IsDeleted() const;
 
     void SetFlag3D( bool bVal ) { Flags.bFlag3D = bVal; }
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 146adf8f35d9..f8a6df71d40f 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -47,12 +47,12 @@ public:
     /**
      * Get the source range from which the references have moved.
      */
-    const ScRange& getRange() const;
+    const ScRange& getRange() const { return maRange;}
 
     /**
      * Get the movement vector.
      */
-    const ScAddress& getDelta() const;
+    const ScAddress& getDelta() const { return maMoveDelta;}
 };
 
 class RefColReorderHint : public RefHint
@@ -66,7 +66,7 @@ public:
     RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 );
     virtual ~RefColReorderHint();
 
-    const sc::ColReorderMapType& getColMap() const;
+    const sc::ColReorderMapType& getColMap() const { return mrColMap;}
 
     SCTAB getTab() const { return mnTab;}
     SCROW getStartRow() const { return mnRow1;}
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 8d2c5975d1bf..a33455444438 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -38,8 +38,8 @@ public:
 
     double getPPTX() const { return mfPPTX;}
     double getPPTY() const { return mfPPTY;}
-    const Fraction& getZoomX() const;
-    const Fraction& getZoomY() const;
+    const Fraction& getZoomX() const { return maZoomX;}
+    const Fraction& getZoomY() const { return maZoomY;}
 
     OutputDevice* getOutputDevice() { return mpOutDev;}
 
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 055c38e9f05a..1e68839bc401 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -141,7 +141,7 @@ public:
     void                AnythingChanged();
 
     //  Drag & Drop:
-    const ScDragData&   GetDragData() const;
+    const ScDragData&   GetDragData() const { return *mpDragData;}
     void                SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj );
     void                ResetDragObject();
     void                SetDragLink(
@@ -150,7 +150,7 @@ public:
         ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText );
 
     //  clipboard:
-    const ScClipData&   GetClipData() const;
+    const ScClipData&   GetClipData() const { return *mpClipData;}
     void                SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj );
 
     ScDocument*         GetClipDoc();       // called from document - should be removed later
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 45f8912fa7f4..14bdbe5614d5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -223,8 +223,8 @@ public:
                          bool bColInfo = true, bool bRowInfo = true );
                 ~ScTable();
 
-    ScDocument& GetDoc();
-    const ScDocument& GetDoc() const;
+    ScDocument& GetDoc() { return *pDocument;}
+    const ScDocument& GetDoc() const { return *pDocument;}
     SCTAB GetTab() const { return nTab; }
 
     ScOutlineTable* GetOutlineTable()               { return pOutlineTable; }
@@ -271,21 +271,21 @@ public:
     void        GetScenarioComment( OUString& rComment) const  { rComment = aComment; }
     void        SetScenarioComment( const OUString& rComment ) { aComment = rComment; }
     const Color& GetScenarioColor() const                    { return aScenarioColor; }
-    void        SetScenarioColor(const Color& rNew)          { aScenarioColor = rNew; }
-    const Color& GetTabBgColor() const;
+    void         SetScenarioColor(const Color& rNew)         { aScenarioColor = rNew; }
+    const Color& GetTabBgColor() const                       { return aTabBgColor; }
     void         SetTabBgColor(const Color& rColor);
-    sal_uInt16      GetScenarioFlags() const                     { return nScenarioFlags; }
-    void        SetScenarioFlags(sal_uInt16 nNew)                { nScenarioFlags = nNew; }
+    sal_uInt16  GetScenarioFlags() const                     { return nScenarioFlags; }
+    void        SetScenarioFlags(sal_uInt16 nNew)            { nScenarioFlags = nNew; }
     void        SetActiveScenario(bool bSet)                 { bActiveScenario = bSet; }
     bool        IsActiveScenario() const                     { return bActiveScenario; }
 
-    sal_uInt8       GetLinkMode() const                         { return nLinkMode; }
-    bool        IsLinked() const                            { return nLinkMode != SC_LINK_NONE; }
-    const OUString& GetLinkDoc() const                        { return aLinkDoc; }
-    const OUString& GetLinkFlt() const                        { return aLinkFlt; }
-    const OUString& GetLinkOpt() const                        { return aLinkOpt; }
-    const OUString& GetLinkTab() const                        { return aLinkTab; }
-    sal_uLong       GetLinkRefreshDelay() const                 { return nLinkRefreshDelay; }
+    sal_uInt8   GetLinkMode() const                          { return nLinkMode; }
+    bool        IsLinked() const                             { return nLinkMode != SC_LINK_NONE; }
+    const OUString& GetLinkDoc() const                       { return aLinkDoc; }
+    const OUString& GetLinkFlt() const                       { return aLinkFlt; }
+    const OUString& GetLinkOpt() const                       { return aLinkOpt; }
+    const OUString& GetLinkTab() const                       { return aLinkTab; }
+    sal_uLong   GetLinkRefreshDelay() const                  { return nLinkRefreshDelay; }
 
     void        SetLink( sal_uInt8 nMode, const OUString& rDoc, const OUString& rFlt,
                         const OUString& rOpt, const OUString& rTab, sal_uLong nRefreshDelay );
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index e516a967e7cf..7f854ad3df27 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -135,7 +135,7 @@ public:
     sal_uInt16                  GetPart() const         { return nPart; }
     ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; }
 
-    const EditTextObject* GetTextObject() const;
+    const EditTextObject* GetTextObject() const { return mpTextObj;}
 };
 
 /**
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 37965c8fe200..a94844d02959 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -61,7 +61,7 @@ public:
     formula::FormulaGrammar::Grammar getGrammar() const { return meGram;}
     void setGrammar( formula::FormulaGrammar::Grammar eGram );
 
-    const std::vector<OUString>& getTabNames() const;
+    const std::vector<OUString>& getTabNames() const { return maTabNames;}
 
     ScDocument* getDoc() { return mpDoc;}
 };
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index dc313c05d913..42dcd609c079 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -33,7 +33,7 @@ public:
 
     bool IsStrData() const;
     bool IsDate() const { return mbIsDate;}
-    SC_DLLPUBLIC const OUString& GetString() const;
+    const OUString& GetString() const { return maStrValue;}
     StringType GetStringType() const { return meStrType;}
     double GetValue() const { return mfValue; }
 
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index c2a88dfbebf5..bdac5fd5c48f 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -37,7 +37,7 @@ public:
     ~ScUnitConverterData();
 
     double GetValue() const { return mfValue;}
-    const OUString& GetIndexString() const;
+    const OUString& GetIndexString() const { return maIndexString;}
 
     static OUString BuildIndexString(
         const OUString& rFromUnit, const OUString& rToUnit );
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index b7ec5cd2f055..817ac2c14415 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -85,7 +85,7 @@ public:
     bool Import( sal_uInt8 nMode, ErrCode& rError );
     bool Export(bool bStylesOnly);
 
-    const sc::ImportPostProcessData& GetImportPostProcessData() const;
+    const sc::ImportPostProcessData& GetImportPostProcessData() const { return maPostProcessData;}
 };
 
 class ScXMLChartExportWrapper