diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-12 14:06:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-17 10:55:17 +0200 |
| commit | 3e82897353e576dc6e3fbf55371fda5a0c3415df (patch) | |
| tree | 71c2f03128885000efae1852dccb504f8355c79e /sc | |
| parent | ec95abf2d8afeec38c9225ea49caa0e08d82b504 (diff) | |
improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
Diffstat (limited to 'sc')
114 files changed, 120 insertions, 509 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 diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index df14e4ec8bce..712bd0457e5c 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -1130,10 +1130,6 @@ ScCondFormatItem* ScCondFormatItem::Clone(SfxItemPool*) const return new ScCondFormatItem(maIndex); } -const std::vector<sal_uInt32>& ScCondFormatItem::GetCondFormatData() const -{ - return maIndex; -} void ScCondFormatItem::AddCondFormatData( sal_uInt32 nIndex ) { diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index 556e3dbcb4d8..d5dc3dc15831 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -82,10 +82,6 @@ void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) } -ScCellValue& CopyFromClipContext::getSingleCell() -{ - return maSingleCell; -} void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondFormatList ) { diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index fe8eff879695..d2e0eef2950b 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -280,10 +280,6 @@ bool ScColorScaleEntry::NeedsRepaint() const return false; } -const Color& ScColorScaleEntry::GetColor() const -{ - return maColor; -} void ScColorScaleEntry::SetColor(const Color& rColor) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index f0dc03af9be9..0bc27bb0f464 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -750,15 +750,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) pDocPool->Remove( *pNewPattern ); // free up resources } -ScDocument& ScColumn::GetDoc() -{ - return *pDocument; -} -const ScDocument& ScColumn::GetDoc() const -{ - return *pDocument; -} ScRefCellValue ScColumn::GetCellValue( SCROW nRow ) const { diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 2fb8cf125d6c..2c6bc2918d29 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1776,10 +1776,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType } -const OUString& ScCondDateFormatEntry::GetStyleName() const -{ - return maStyleName; -} void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 235e0d277d72..06519a0569b6 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -931,30 +931,14 @@ bool ScCellIterator::getCurrent() return false; } -CellType ScCellIterator::getType() const -{ - return maCurCell.meType; -} OUString ScCellIterator::getString() { return maCurCell.getString(mpDoc); } -const EditTextObject* ScCellIterator::getEditText() const -{ - return maCurCell.mpEditText; -} -ScFormulaCell* ScCellIterator::getFormulaCell() -{ - return maCurCell.mpFormula; -} -const ScFormulaCell* ScCellIterator::getFormulaCell() const -{ - return maCurCell.mpFormula; -} ScCellValue ScCellIterator::getCellValue() const { @@ -982,10 +966,6 @@ ScCellValue ScCellIterator::getCellValue() const return aRet; } -const ScRefCellValue& ScCellIterator::getRefCellValue() const -{ - return maCurCell; -} bool ScCellIterator::hasString() const { @@ -2501,10 +2481,6 @@ bool ScUsedAreaIterator::GetNext() return bFound; } -const ScRefCellValue& ScUsedAreaIterator::GetCell() const -{ - return maFoundCell; -} ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index a1bc567efb9d..2b143ff0d873 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1392,10 +1392,6 @@ void ScDocument::SetPreviewFont( SfxItemSet* pFont ) pPreviewFont = pFont; } -const ScMarkData ScDocument::GetPreviewSelection() -{ - return maPreviewSelection; -} void ScDocument::SetPreviewSelection( ScMarkData& rSel ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 2a4bde6506ba..e25a742f60c7 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -324,10 +324,6 @@ ScDPCollection* ScDocument::GetDPCollection() return pDPCollection; } -const ScDPCollection* ScDocument::GetDPCollection() const -{ - return pDPCollection; -} ScDPObject* ScDocument::GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const { @@ -964,10 +960,6 @@ void ScDocument::AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ) pUnoRefUndoList->Add( nId, rOldRanges ); } -sal_Int64 ScDocument::GetNewUnoId() -{ - return ++nUnoObjectId; -} void ScDocument::UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, bool bIncludeDraw, bool bUpdateNoteCaptionPos ) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 928a478e4480..4df3001cecf9 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4503,10 +4503,6 @@ const ScPatternAttr* ScDocument::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow return NULL; } -const ScValidationDataList* ScDocument::GetValidationList() const -{ - return pValidationList; -} void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index 4112bb9d0ee3..a2aac0ac1a93 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -239,10 +239,6 @@ void ScDocument::SetCalcConfig( const ScCalcConfig& rConfig ) maCalcConfig = rConfig; } -const ScCalcConfig& ScDocument::GetCalcConfig() const -{ - return maCalcConfig; -} void ScDocument::PreprocessRangeNameUpdate() { diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 3a95fac2c720..3b248ff9be3b 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -410,10 +410,6 @@ bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>& return true; } -const ScDPCache* ScDPFilteredCache::getCache() const -{ - return &mrCache; -} #if DEBUG_PIVOT_TABLE using std::cout; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index e2eeea7a0971..70085f64f078 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -494,10 +494,6 @@ ScDPGroupTableData::~ScDPGroupTableData() delete[] pNumGroups; } -boost::shared_ptr<ScDPTableData> ScDPGroupTableData::GetSourceTableData() -{ - return pSourceData; -} void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup ) { diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index 94f66762adeb..6bd1f736cc14 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -152,11 +152,6 @@ ScDPItemData::~ScDPItemData() DisposeString(); } -ScDPItemData::Type ScDPItemData::GetType() const -{ - return static_cast<Type>(meType); -} - void ScDPItemData::SetEmpty() { DisposeString(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index df40306ab97b..c69dfd38f51d 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3618,20 +3618,8 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj) return true; } -ScDPCollection::SheetCaches& ScDPCollection::GetSheetCaches() -{ - return maSheetCaches; -} -ScDPCollection::NameCaches& ScDPCollection::GetNameCaches() -{ - return maNameCaches; -} -ScDPCollection::DBCaches& ScDPCollection::GetDBCaches() -{ - return maDBCaches; -} ScRangeList ScDPCollection::GetAllTableRanges( SCTAB nTab ) const { diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 761a369a208e..91fab1cca7e6 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -865,10 +865,6 @@ const OUString* ScDPSaveData::GetGrandTotalName() const return mpGrandTotalName.get(); } -const ScDPSaveData::DimsType& ScDPSaveData::GetDimensions() const -{ - return aDimList; -} namespace { diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 2a03978b7bcb..166c4a3c28be 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -252,10 +252,6 @@ void ScSheetSourceDesc::SetRangeName(const OUString& rName) maRangeName = rName; } -const OUString& ScSheetSourceDesc::GetRangeName() const -{ - return maRangeName; -} bool ScSheetSourceDesc::HasRangeName() const { @@ -267,10 +263,6 @@ void ScSheetSourceDesc::SetQueryParam(const ScQueryParam& rParam) maQueryParam = rParam; } -const ScQueryParam& ScSheetSourceDesc::GetQueryParam() const -{ - return maQueryParam; -} bool ScSheetSourceDesc::operator== (const ScSheetSourceDesc& rOther) const { diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 8355ff48c5d3..f7120ba7e8da 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1458,10 +1458,6 @@ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno return CreateCloneObject(); } -const sheet::DataPilotFieldReference& ScDPDimension::GetReferenceValue() const -{ - return aReferenceValue; -} const ScDPItemData& ScDPDimension::GetSelectedData() { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index c7e9aeb6006e..ea2eadc8a7e9 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3390,10 +3390,6 @@ void ScFormulaCell::SetChanged(bool b) -const ScTokenArray* ScFormulaCell::GetCode() const -{ - return pCode; -} void ScFormulaCell::SetCode( ScTokenArray* pNew ) { @@ -3516,10 +3512,6 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( SCROW nLen, bool bInvarian return mxGroup; } -ScFormulaCellGroupRef ScFormulaCell::GetCellGroup() const -{ - return mxGroup; -} void ScFormulaCell::SetCellGroup( const ScFormulaCellGroupRef &xRef ) { diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index d6b92ebe0ef6..0463e7baa75a 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -20,10 +20,6 @@ StartListeningContext::StartListeningContext( ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet) : mrDoc(rDoc), mpSet(pSet) {} -ScDocument& StartListeningContext::getDoc() -{ - return mrDoc; -} ColumnBlockPosition* StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL nCol) { @@ -44,10 +40,6 @@ void EndListeningContext::setPositionDelta( const ScAddress& rDelta ) maPosDelta = rDelta; } -ScDocument& EndListeningContext::getDoc() -{ - return mrDoc; -} ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index a062593735f0..fc200b23f132 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -216,10 +216,6 @@ SCTAB ScMarkData::GetLastSelected() const return 0; } -const ScMarkData::MarkedTabsType& ScMarkData::GetSelectedTabs() const -{ - return maTabMarked; -} void ScMarkData::SetSelectedTabs(const MarkedTabsType& rTabs) { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 09b6f5189464..141de43276e5 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -510,20 +510,12 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const } -const OUString& ScPostIt::GetDate() const -{ - return maNoteData.maDate; -} void ScPostIt::SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } -const OUString& ScPostIt::GetAuthor() const -{ - return maNoteData.maAuthor; -} void ScPostIt::SetAuthor( const OUString& rAuthor ) { @@ -576,10 +568,6 @@ void ScPostIt::SetText( const ScAddress& rPos, const OUString& rText ) maNoteData.mpCaption->SetText( rText ); } -SdrCaptionObj* ScPostIt::GetCaption() const -{ - return maNoteData.mpCaption; -} SdrCaptionObj* ScPostIt::GetOrCreateCaption( const ScAddress& rPos ) const { @@ -604,10 +592,6 @@ void ScPostIt::ShowCaption( const ScAddress& rPos, bool bShow ) ScCaptionUtil::SetCaptionLayer( *maNoteData.mpCaption, bShow ); } -bool ScPostIt::IsCaptionShown() const -{ - return maNoteData.mbShown; -} void ScPostIt::ShowCaptionTemp( const ScAddress& rPos, bool bShow ) { diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 408bf4df759a..08466ae2acad 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -24,15 +24,7 @@ RowHeightContext::~RowHeightContext() {} -const Fraction& RowHeightContext::getZoomX() const -{ - return maZoomX; -} -const Fraction& RowHeightContext::getZoomY() const -{ - return maZoomY; -} void RowHeightContext::setExtraHeight( sal_uInt16 nH ) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index fe407e0db71c..5cba042224ed 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -394,10 +394,6 @@ void ScTable::SetLoadingRTL( bool bSet ) bLoadingRTL = bSet; } -const Color& ScTable::GetTabBgColor() const -{ - return aTabBgColor; -} void ScTable::SetTabBgColor(const Color& rColor) { diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index b5447116834e..5b44baf605fc 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2640,15 +2640,7 @@ bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, std::set<ScTypedStrData>& r return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit ); } -ScDocument& ScTable::GetDoc() -{ - return *pDocument; -} -const ScDocument& ScTable::GetDoc() const -{ - return *pDocument; -} sal_uLong ScTable::GetCellCount() const { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 8d19ab9ac5c3..364f922d715a 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -112,7 +112,7 @@ public: void setOption(SCSIZE nOptId, bool bEnabled); void setEnhancedProtection( const ::std::vector< ScEnhancedProtection > & rProt ); - const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const; + const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const { return maEnhancedProtection;} bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); bool isBlockEditable( const ScRange& rRange ) const; bool isSelectionEditable( const ScRangeList& rRangeList ) const; @@ -351,10 +351,6 @@ void ScTableProtectionImpl::setEnhancedProtection( const ::std::vector< ScEnhanc maEnhancedProtection = rProt; } -const ::std::vector< ScEnhancedProtection > & ScTableProtectionImpl::getEnhancedProtection() const -{ - return maEnhancedProtection; -} bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pDoc, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 1ca4d1cf0b69..3c7d18248cc9 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -92,7 +92,7 @@ public: explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange); virtual ~ScDBInternalRange(); - const ScRange& getRange() const; + const ScRange& getRange() const { return maRange;} virtual SCCOL getColSize() const SAL_OVERRIDE; virtual SCROW getRowSize() const SAL_OVERRIDE; diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index 63e2ee20f1bd..0f5be1945457 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.hxx @@ -101,7 +101,7 @@ public: void GetJump( SCSIZE nCol, SCSIZE nRow, double& rBool, short& rStart, short& rNext, short& rStop ) const; void SetAllJumps( double fBool, short nStart, short nNext, short nStop = SHRT_MAX ); void SetJumpParameters( ScTokenVec* p ); - const ScTokenVec* GetJumpParameters() const; + const ScTokenVec* GetJumpParameters() const { return pParams;} bool HasResultMatrix() const; ScMatrix* GetResultMatrix(); ///< also applies pending buffered values void GetPos( SCSIZE& rCol, SCSIZE& rRow ) const; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index d8539b9d76aa..f0a757b071e8 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1699,9 +1699,5 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } -ScMatrixRef ScUnoAddInCall::GetMatrix() const -{ - return xMatrix; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 6e15d7739100..a19686bdf4a8 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -95,10 +95,6 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFileIds() -{ - return maFileIds; -} ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : @@ -176,10 +172,6 @@ ScChartListener::~ScChartListener() } } -const OUString& ScChartListener::GetName() const -{ - return maName; -} void ScChartListener::SetUno( const uno::Reference< chart::XChartDataChangeEventListener >& rListener, @@ -477,20 +469,8 @@ bool ScChartListenerCollection::hasListeners() const return !maListeners.empty(); } -const ScChartListenerCollection::ListenersType& ScChartListenerCollection::getListeners() const -{ - return maListeners; -} -ScChartListenerCollection::ListenersType& ScChartListenerCollection::getListeners() -{ - return maListeners; -} -ScChartListenerCollection::StringSetType& ScChartListenerCollection::getNonOleObjectNames() -{ - return maNonOleObjectNames; -} OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index b2097a119d42..239964488221 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -553,20 +553,12 @@ OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } -const OUString& ScChangeAction::GetUser() const -{ - return aUser; -} void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } -const OUString& ScChangeAction::GetComment() const -{ - return aComment; -} void ScChangeAction::SetComment( const OUString& rStr ) { @@ -1451,15 +1443,7 @@ void ScChangeActionContent::GetNewString( OUString& rStr, const ScDocument* pDoc GetValueString(rStr, maNewValue, maNewCell, pDoc); } -const ScCellValue& ScChangeActionContent::GetOldCell() const -{ - return maOldCell; -} -const ScCellValue& ScChangeActionContent::GetNewCell() const -{ - return maNewCell; -} void ScChangeActionContent::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const @@ -2217,10 +2201,6 @@ void ScChangeTrack::Clear() Init(); } -const std::set<OUString>& ScChangeTrack::GetUserCollection() const -{ - return maUserCollection; -} void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { @@ -2258,10 +2238,6 @@ void ScChangeTrack::SetUser( const OUString& rUser ) maUserCollection.insert(maUser); } -const OUString& ScChangeTrack::GetUser() const -{ - return maUser; -} void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction ) diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index e8f171fa4ce0..9e51ae1aa8a3 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -802,25 +802,9 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : ScDBCollection::ScDBCollection(const ScDBCollection& r) : pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} -ScDBCollection::NamedDBs& ScDBCollection::getNamedDBs() -{ - return maNamedDBs; -} -const ScDBCollection::NamedDBs& ScDBCollection::getNamedDBs() const -{ - return maNamedDBs; -} -ScDBCollection::AnonDBs& ScDBCollection::getAnonDBs() -{ - return maAnonDBs; -} -const ScDBCollection::AnonDBs& ScDBCollection::getAnonDBs() const -{ - return maAnonDBs; -} const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const { diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 66a9edbbc043..547bc21e6aec 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -276,10 +276,6 @@ ScDBInternalRange::~ScDBInternalRange() { } -const ScRange& ScDBInternalRange::getRange() const -{ - return maRange; -} SCCOL ScDBInternalRange::getColSize() const { diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index adac4f68f6a3..625e425c18b4 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -110,10 +110,6 @@ void ScJumpMatrix::SetJumpParameters(ScTokenVec* p) pParams = p; } -const ScTokenVec* ScJumpMatrix::GetJumpParameters() const -{ - return pParams; -} void ScJumpMatrix::GetPos(SCSIZE& rCol, SCSIZE& rRow) const { diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index 455c8c6617cb..af739594a2a4 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -79,10 +79,6 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) return *this; } -ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() -{ - return maQueryItems; -} void ScQueryEntry::SetQueryByEmpty() diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 9a5bb0ca4431..435326514f30 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -41,10 +41,6 @@ void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rP SetAddress(rAdr, rPos); } -sal_uInt8 ScSingleRefData::FlagValue() const -{ - return mnFlagValue; -} void ScSingleRefData::SetAbsCol( SCCOL nVal ) { @@ -102,30 +98,18 @@ void ScSingleRefData::SetColDeleted( bool bVal ) Flags.bColDeleted = bVal; } -bool ScSingleRefData::IsColDeleted() const -{ - return Flags.bColDeleted; -} void ScSingleRefData::SetRowDeleted( bool bVal ) { Flags.bRowDeleted = bVal; } -bool ScSingleRefData::IsRowDeleted() const -{ - return Flags.bRowDeleted; -} void ScSingleRefData::SetTabDeleted( bool bVal ) { Flags.bTabDeleted = bVal; } -bool ScSingleRefData::IsTabDeleted() const -{ - return Flags.bTabDeleted; -} bool ScSingleRefData::IsDeleted() const { diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 56e21e41d035..8327b6186cec 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -20,25 +20,13 @@ RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefMovedHint::~RefMovedHint() {} -const ScRange& RefMovedHint::getRange() const -{ - return maRange; -} -const ScAddress& RefMovedHint::getDelta() const -{ - return maMoveDelta; -} RefColReorderHint::RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ) : RefHint(ColumnReordered), mrColMap(rColMap), mnTab(nTab), mnRow1(nRow1), mnRow2(nRow2) {} RefColReorderHint::~RefColReorderHint() {} -const sc::ColReorderMapType& RefColReorderHint::getColMap() const -{ - return mrColMap; -} diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index de23ddb7e7d4..3eb2f16b8474 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -137,10 +137,6 @@ void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) updateTabNames(); } -const std::vector<OUString>& CompileFormulaContext::getTabNames() const -{ - return maTabNames; -} } diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index b13e49a4af6a..de9b8ba14a71 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -105,10 +105,6 @@ bool ScTypedStrData::IsStrData() const } -const OUString& ScTypedStrData::GetString() const -{ - return maStrValue; -} FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 87f4c8d96d44..b9d5c61856c7 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -42,10 +42,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} -const OUString& ScUnitConverterData::GetIndexString() const -{ - return maIndexString; -} OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index dbb2653d6114..9623b9aeef36 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -996,12 +996,6 @@ OUString XclExpPTField::GetFieldName() const return mpCacheField ? mpCacheField->GetFieldName() : OUString(); } -sal_uInt16 XclExpPTField::GetFieldIndex() const -{ - // field index always equal to cache index - return maFieldInfo.mnCacheIdx; -} - sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const { OSL_ENSURE( !maDataInfoVec.empty(), "XclExpPTField::GetLastDataInfoIndex - no data info found" ); diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index a1c9585372a8..3f9e9a93ce05 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2205,10 +2205,6 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetData ); } -XclExpDimensions* XclExpRowBuffer::GetDimensions() -{ - return &maDimensions; -} XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty ) { diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 28d8ec53b784..774d24479854 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -811,10 +811,6 @@ XclImpCachedValue::~XclImpCachedValue() { } -const OUString& XclImpCachedValue::GetString() const -{ - return maStr; -} sal_uInt16 XclImpCachedValue::GetScError() const { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 0e26d5eb5c54..49e2acb55fb9 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -51,7 +51,7 @@ public: /** Reads a cached value and stores it with its cell address. */ explicit XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ); - const XclAddress& GetAddress() const; + const XclAddress& GetAddress() const { return maXclPos;} private: XclAddress maXclPos; /// Excel position of the cached cell. @@ -544,10 +544,6 @@ XclImpCrn::XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ) : { } -const XclAddress& XclImpCrn::GetAddress() const -{ - return maXclPos; -} // Sheet in an external document ============================================== diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index e4b733fb7e9d..40fb56e298e2 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -203,15 +203,7 @@ ScHTMLParser::~ScHTMLParser() { } -ScHTMLStyles& ScHTMLParser::GetStyles() -{ - return maStyles; -} -ScDocument& ScHTMLParser::GetDoc() -{ - return *mpDoc; -} ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 6dd41a39aed2..c572c3913ab4 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -90,8 +90,8 @@ public: virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; - ScHTMLStyles& GetStyles(); - ScDocument& GetDoc(); + ScHTMLStyles& GetStyles() { return maStyles;} + ScDocument& GetDoc() { return *mpDoc;} /** Returns the "global table" which contains the entire HTML document. */ virtual const ScHTMLTable* GetGlobalTable() const = 0; diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 7f3a73242522..b2e11864f6b8 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -252,7 +252,7 @@ public: void finalizeImport(); /** Returns an API font descriptor with own font information. */ - const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const; + const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} /** Returns true, if the font requires rich text formatting in Calc. @descr Example: Font escapement is a cell attribute in Excel, but Calc needs an rich text cell for this attribute. */ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e2fc6d8a805e..e4be5e58df55 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -318,7 +318,7 @@ class ExcBundlesheet8 : public ExcBundlesheetBase { private: OUString sUnicodeName; - XclExpString GetName() const; + XclExpString GetName() const { return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH );} virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 7eacea1a3b79..9c645d78498b 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -274,8 +274,11 @@ public: /** Returns the name of this field. */ OUString GetFieldName() const; - /** Returns the pivot table field list index of this field. */ - sal_uInt16 GetFieldIndex() const; + /** Returns the pivot table field list index of this field. + * The field index is always equal to cache index. + */ + sal_uInt16 GetFieldIndex() const { return maFieldInfo.mnCacheIdx; } + /** Returns the index of the last inserted data info struct. */ sal_uInt16 GetLastDataInfoIndex() const; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index b9aad1d09e92..0d90d08f2086 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -941,7 +941,7 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - XclExpDimensions* GetDimensions(); + XclExpDimensions* GetDimensions() { return &maDimensions;} private: /** Returns access to the specified ROW record. Inserts preceding missing ROW records. diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 02786a942089..ce49f0e9ccd7 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -302,7 +302,7 @@ public: /** Returns the type of the cached value (EXC_CACHEDVAL_*). */ inline sal_uInt8 GetType() const { return mnType; } /** Returns the cached string value, if this value is a string, else an empty string. */ - const OUString& GetString() const; + const OUString& GetString() const { return maStr;} /** Returns the cached number, if this value has number type, else 0.0. */ inline double GetValue() const { return mfValue; } /** Returns the cached Boolean value, if this value has Boolean type, else false. */ diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 628db5e915d6..29ae77008971 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -859,10 +859,6 @@ void Font::finalizeImport() } } -const FontDescriptor& Font::getFontDescriptor() const -{ - return maApiData.maDesc; -} bool Font::needsRichTextFormat() const { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index f59c4781bffa..4463be4b429d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -149,7 +149,8 @@ public: ScDocument& getScDocument() { return *mpDoc; } - ScDocShell& getDocShell(); + ScDocShell& getDocShell() { return *mpDocShell; } + ScDocumentImport& getDocImport(); /** Returns a reference to the source/target spreadsheet document model. */ @@ -331,11 +332,6 @@ WorkbookGlobals::~WorkbookGlobals() mrExcelFilter.unregisterWorkbookGlobals(); } -ScDocShell& WorkbookGlobals::getDocShell() -{ - return *mpDocShell; -} - ScDocumentImport& WorkbookGlobals::getDocImport() { return *mxDocImport; diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index bb4eb8c5f421..17fda19b1ad1 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1086,10 +1086,6 @@ ExcBundlesheet8::ExcBundlesheet8( const OUString& rString ) : } -XclExpString ExcBundlesheet8::GetName() const -{ - return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH ); -} void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 156650552783..31566c85b396 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -678,10 +678,6 @@ sal_Int32 ScRowFormatRanges::GetMaxRows() const return nMaxRows; } -sal_Int32 ScRowFormatRanges::GetSize() const -{ - return nSize; -} void ScRowFormatRanges::Sort() { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 31ceafe68902..e51f46820b4f 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -160,7 +160,7 @@ public: void AddRange(ScMyRowFormatRange& rFormatRange); bool GetNext(ScMyRowFormatRange& rFormatRange); sal_Int32 GetMaxRows() const; - sal_Int32 GetSize() const; + sal_Int32 GetSize() const { return nSize;} void Sort(); }; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index a9e8dd9343da..f092200846f8 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -986,10 +986,6 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) return false; } -const sc::ImportPostProcessData& ScXMLImportWrapper::GetImportPostProcessData() const -{ - return maPostProcessData; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a64d075b2541..b070c3697f7e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -648,10 +648,6 @@ void ScModule::ResetDragObject() mpDragData->aJumpText = OUString(); } -const ScDragData& ScModule::GetDragData() const -{ - return *mpDragData; -} void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { @@ -679,10 +675,6 @@ void ScModule::SetDragJump( mpDragData->aJumpText = rText; } -const ScClipData& ScModule::GetClipData() const -{ - return *mpClipData; -} void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c4c6be5810fb..2e2413b367f6 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -428,10 +428,6 @@ void ScMenuFloatingWindow::drawAllMenuItems() } } -const Font& ScMenuFloatingWindow::getLabelFont() const -{ - return maLabelFont; -} void ScMenuFloatingWindow::executeMenuItem(size_t nPos) { @@ -656,10 +652,6 @@ void ScMenuFloatingWindow::setName(const OUString& rName) maName = rName; } -const OUString& ScMenuFloatingWindow::getName() const -{ - return maName; -} void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index dd9ca8a1d5b1..de2f4a623faf 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,10 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } -ScDPLabelDataVector& ScPivotLayoutDialog::GetLabelDataVector() -{ - return maPivotParameters.maLabelArray; -} void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index ab9a7b9b8d16..fae875483756 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1103,10 +1103,6 @@ void ScExternalRefCache::addCacheDocToReferenced( sal_uInt16 nFileId ) } } -bool ScExternalRefCache::areAllCacheTablesReferenced() const -{ - return maReferenced.mbAllReferenced; -} void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet& rSet ) const { diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index ace1ed5ffdb9..290773a317ff 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -127,7 +127,7 @@ public: bool IsDataElement(SCCOL nColumn); ScDPLabelData* GetLabelData(SCCOL nColumn); - ScDPLabelDataVector& GetLabelDataVector(); + ScDPLabelDataVector& GetLabelDataVector() { return maPivotParameters.maLabelArray;} void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index d64c7015cd1b..b23da9aab1a3 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -68,7 +68,7 @@ public: size_t getSelectedMenuItem() const { return mnSelectedMenu;} void setName(const OUString& rName); - const OUString& getName() const; + const OUString& getName() const { return maName;} void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -81,7 +81,7 @@ protected: void drawMenuItem(size_t nPos); void drawSeparator(size_t nPos); void drawAllMenuItems(); - const Font& getLabelFont() const; + const Font& getLabelFont() const { return maLabelFont;} void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu); void queueCloseSubMenu(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 0a019357a5de..df03b88f525c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -325,7 +325,7 @@ public: void FakeButtonUp(); - Point GetMousePosPixel() const; + Point GetMousePosPixel() const { return aCurMousePos; } void UpdateStatusPosSize(); void ClickExtern(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 588149c9f6f4..bb5c79874979 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -163,7 +163,7 @@ public: virtual void SwitchView(); SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); - SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const; + const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } }; #endif diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index a31c653e4870..5b041b5062a5 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -62,7 +62,8 @@ public: const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog(); - const OUString& GetEngine() const; + // already updated in selection handler + const OUString& GetEngine() const { return maEngine; } const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index d624759ba9f7..698087d38d4d 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -26,6 +26,8 @@ #include "hiranges.hxx" #include "viewutil.hxx" #include "select.hxx" +#include "gridwin.hxx" +#include "drawview.hxx" #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> @@ -294,7 +296,8 @@ public: bool SelMouseButtonDown( const MouseEvent& rMEvt ); ScDrawView* GetScDrawView() { return pDrawView; } - SdrView* GetSdrView(); // gegen CLOKs + // gegen CLOKs + SdrView* GetSdrView() { return pDrawView; } bool IsMinimized() const { return bMinimized; } @@ -325,7 +328,7 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ); + Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } ScSplitPos FindWindow( Window* pWindow ) const; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 5ca8953e0ced..3e60f12636da 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -124,7 +124,7 @@ public: void SetPopupMenu(PopupMenu* pPopUp); sal_uInt16 GetSelected() const { return nSelected;} - OString GetSelectedIdent() const; + OString GetSelectedIdent() const { return aSelectedIdent;} void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 380079f894bf..6995bf3ef325 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -385,7 +385,7 @@ public: virtual bool CanRepeat( SfxRepeatTarget& ) const SAL_OVERRIDE; virtual OUString GetComment() const SAL_OVERRIDE; - CellValues& GetOldValues(); + CellValues& GetOldValues() { return maOldValues;} void SetNewValues( const std::vector<double>& rVals ); }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6a86e46720e3..34c62927bc87 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -23,6 +23,7 @@ #include "rangelst.hxx" #include "scdllapi.h" #include "viewopti.hxx" +#include "docsh.hxx" #include <boost/scoped_ptr.hpp> @@ -232,8 +233,7 @@ public: ScDocFunc& GetDocFunc() const; ScDBFunc* GetView() const { return pView; } ScTabViewShell* GetViewShell() const { return pViewShell; } - - SfxObjectShell* GetSfxDocShell() const; + SfxObjectShell* GetSfxDocShell() const { return pDocShell; } SfxBindings& GetBindings(); // from ViewShell's ViewFrame SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index ad004b017cbd..7a25b5aeed62 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -162,11 +162,6 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog() delete mpCheckButtonData; } -const OUString& ScSolverOptionsDialog::GetEngine() const -{ - return maEngine; // already updated in selection handler -} - const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties() { // update maProperties from list box content diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index e5057af8148b..0a996e54b574 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -188,10 +188,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC ScCalcOptionsDialog::~ScCalcOptionsDialog() {} -const ScCalcConfig& ScCalcOptionsDialog::GetConfig() const -{ - return maConfig; -} SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, bool bValue) const { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 9a0f5795fcfb..9097725bf4b6 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -36,7 +36,7 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); - const ScCalcConfig& GetConfig() const; + const ScCalcConfig& GetConfig() const { return maConfig;} private: void FillOptionsList(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 2c92ccc7bbe3..faf5c4eb18ba 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -351,10 +351,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) } -OString ScExtIButton::GetSelectedIdent() const -{ - return aSelectedIdent; -} void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx index f4b5d9376ad2..0b45efc419e9 100644 --- a/sc/source/ui/undo/undocell2.cxx +++ b/sc/source/ui/undo/undocell2.cxx @@ -54,10 +54,6 @@ OUString UndoSetCells::GetComment() const return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); } -CellValues& UndoSetCells::GetOldValues() -{ - return maOldValues; -} void UndoSetCells::SetNewValues( const std::vector<double>& rVals ) { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 3211f4508e34..5b5dd354961d 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -253,10 +253,6 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine) bDataValid = false; } -const EditTextObject* ScHeaderFooterTextData::GetTextObject() const -{ - return mpTextObj; -} ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 790f7499e3fb..d6730ae3917b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4777,7 +4777,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } -Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 0735c42de636..3b3c0ace8d63 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1606,9 +1606,4 @@ void ScPreview::SetSelectedTabs(const ScMarkData& rMark) maSelectedTabs = rMark.GetSelectedTabs(); } -const ScMarkData::MarkedTabsType& ScPreview::GetSelectedTabs() const -{ - return maSelectedTabs; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index caaee2278c04..0777d419637d 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -866,11 +866,6 @@ ScGridWindow* ScTabView::GetActiveWin() return pGridWin[ePos]; } -Window* ScTabView::GetWindowByPos( ScSplitPos ePos ) -{ - return pGridWin[ePos]; -} - void ScTabView::SetActivePointer( const Pointer& rPointer ) { for (sal_uInt16 i=0; i<4; i++) diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 4fea5a32da98..563bd2cf5657 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -430,11 +430,6 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang // Helper-Funktion gegen das Include des Drawing Layers -SdrView* ScTabView::GetSdrView() -{ - return pDrawView; -} - void ScTabView::DrawMarkListHasChanged() { if ( pDrawView ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d77d8cd54493..14d41550082e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2071,11 +2071,6 @@ void ScViewData::SetScreen( const Rectangle& rVisArea ) ( aScrSize.Height() * ScGlobal::nScreenPPTY / HMM_PER_TWIPS ); } -SfxObjectShell* ScViewData::GetSfxDocShell() const -{ - return pDocShell; -} - ScDocFunc& ScViewData::GetDocFunc() const { return pDocShell->GetDocFunc(); |