diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
| commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
| tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 /sc | |
| parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) | |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'sc')
119 files changed, 150 insertions, 679 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index c6995ea32a47..dbf807dab8e5 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -210,7 +210,7 @@ public: com::sun::star::uno::XInterface>& rInterface ); void SetCallerFromObjectShell( SfxObjectShell* pSh ); - bool ValidParamCount(); + bool ValidParamCount() { return bValidCount;} ScAddInArgumentType GetArgType( long nPos ); void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 534e0dc6275a..cb386f3cac7f 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -379,7 +379,7 @@ private: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE; void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - const ::boost::unordered_set<sal_uInt16>& getAllFileIds(); + const ::boost::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;} private: ExternalRefListener(); diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 2b1e387afaad..bc8304982dce 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -549,8 +549,8 @@ public: // is col, belonging to a TabDelete bool IsTabDeleteCol() const; - SCsCOL GetDx() const; - SCsROW GetDy() const; + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) const ScChangeActionCellListEntry* GetFirstCellEntry() const diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx index 7791a938fddc..b206b33ef999 100644 --- a/sc/inc/clipcontext.hxx +++ b/sc/inc/clipcontext.hxx @@ -83,36 +83,36 @@ public: void setTabRange(SCTAB nStart, SCTAB nEnd); - SCTAB getTabStart() const; - SCTAB getTabEnd() const; + SCTAB getTabStart() const { return mnTabStart;} + SCTAB getTabEnd() const { return mnTabEnd;} void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); Range getDestRange() const; - ScDocument* getUndoDoc(); - ScDocument* getClipDoc(); - sal_uInt16 getInsertFlag() const; + ScDocument* getUndoDoc() { return mpRefUndoDoc;} + ScDocument* getClipDoc() { return mpClipDoc;} + sal_uInt16 getInsertFlag() const { return mnInsertFlag;} void setDeleteFlag( sal_uInt16 nFlag ); - sal_uInt16 getDeleteFlag() const; + sal_uInt16 getDeleteFlag() const { return mnDeleteFlag;} ScCellValue& getSingleCell(); void setCondFormatList( ScConditionalFormatList* pCondFormatList ); - ScConditionalFormatList* getCondFormatList(); + ScConditionalFormatList* getCondFormatList() { return mpCondFormatList;} - const ScPatternAttr* getSingleCellPattern() const; + const ScPatternAttr* getSingleCellPattern() const { return mpSinglePattern;} void setSingleCellPattern( const ScPatternAttr* pAttr ); - const ScPostIt* getSingleCellNote() const; + const ScPostIt* getSingleCellNote() const { return mpSingleNote;} void setSingleCellNote( const ScPostIt* pNote ); void setTableProtected( bool b ); - bool isTableProtected() const; + bool isTableProtected() const { return mbTableProtected;} - bool isAsLink() const; - bool isSkipAttrForEmptyCells() const; - bool isCloneNotes() const; + bool isAsLink() const { return mbAsLink;} + bool isSkipAttrForEmptyCells() const { return mbSkipAttrForEmptyCells;} + bool isCloneNotes() const { return mbCloneNotes;} bool isDateCell( const ScColumn& rCol, SCROW nRow ) const; }; @@ -127,8 +127,8 @@ public: CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags, bool bCloneNotes); virtual ~CopyToClipContext(); - bool isKeepScenarioFlags() const; - bool isCloneNotes() const; + bool isKeepScenarioFlags() const { return mbKeepScenarioFlags;} + bool isCloneNotes() const { return mbCloneNotes;} }; class CopyToDocContext : public ClipContextBase diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 6639741dced6..b06fe2b8bd32 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -76,7 +76,7 @@ public: const ScTokenArray* GetFormula() const; OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const; - ScColorScaleEntryType GetType() const; + ScColorScaleEntryType GetType() const { return meType;} void SetType( ScColorScaleEntryType eType ); bool NeedsRepaint() const; diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 730855a7e10f..0f2bde98796e 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -348,7 +348,7 @@ public: bool IsValid( const ScAddress& rPos ) const; void SetDateType(condformat::ScCondFormatDateType eType); - condformat::ScCondFormatDateType GetDateType() const; + condformat::ScCondFormatDateType GetDateType() const { return meType;} const OUString& GetStyleName() const; void SetStyleName( const OUString& rStyleName ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 259d119eeffa..c00f55efd632 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -542,7 +542,7 @@ public: ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } - SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; + SC_DLLPUBLIC ScDBCollection* GetDBCollection() const { return pDBCollection;} void SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter = false ); const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly = false) const; @@ -558,7 +558,7 @@ public: SC_DLLPUBLIC ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; - SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; + SC_DLLPUBLIC ScChartCollection* GetChartCollection() const { return pChartCollection;} void StopTemporaryChartLock(); @@ -629,7 +629,7 @@ public: SC_DLLPUBLIC bool GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); - bool IsEmbedded() const; + bool IsEmbedded() const { return bIsEmbedded;} void GetEmbedded( ScRange& rRange ) const; void SetEmbedded( const ScRange& rRange ); void ResetEmbedded(); @@ -687,7 +687,7 @@ public: SC_DLLPUBLIC bool IsActiveScenario( SCTAB nTab ) const; SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, bool bActive ); // only for Undo etc. SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const; - SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const; + SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const { return eGrammar;} SC_DLLPUBLIC void SetGrammar( formula::FormulaGrammar::Grammar eGram ); SC_DLLPUBLIC sal_uInt8 GetLinkMode( SCTAB nTab ) const; bool IsLinked( SCTAB nTab ) const; @@ -762,7 +762,7 @@ public: SfxBindings* GetViewBindings(); SfxObjectShell* GetDocumentShell() const { return pShell; } - SC_DLLPUBLIC ScDrawLayer* GetDrawLayer(); + SC_DLLPUBLIC ScDrawLayer* GetDrawLayer() { return pDrawLayer; } SfxBroadcaster* GetDrawBroadcaster(); // to avoid header void BeginDrawUndo(); @@ -1185,7 +1185,7 @@ public: void EnableExecuteLink( bool bVal ) { mbExecuteLinkEnabled = bVal; } bool IsChangeReadOnlyEnabled() const { return mbChangeReadOnlyEnabled; } void EnableChangeReadOnly( bool bVal ) { mbChangeReadOnlyEnabled = bVal; } - SC_DLLPUBLIC bool IsUserInteractionEnabled() const; + SC_DLLPUBLIC bool IsUserInteractionEnabled() const { return mbUserInteractionEnabled;} SC_DLLPUBLIC void EnableUserInteraction( bool bVal ); SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const { return mnNamedRangesLockCount; } void SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; } @@ -1411,7 +1411,7 @@ public: SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; const ScValidationDataList* GetValidationList() const; - ScValidationDataList* GetValidationList(); + ScValidationDataList* GetValidationList() { return pValidationList;} SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ); @@ -1759,7 +1759,7 @@ public: bool GetNoListening() const { return bNoListening; } ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } - SC_DLLPUBLIC ScChartListenerCollection* GetChartListenerCollection() const; + SC_DLLPUBLIC ScChartListenerCollection* GetChartListenerCollection() const { return pChartListenerCollection;} void SetChartListenerCollection( ScChartListenerCollection*, bool bSetChartRangeLists = false ); void UpdateChart( const OUString& rName ); @@ -1955,10 +1955,10 @@ public: return *pRecursionHelper; } bool IsInDtorClear() const { return bInDtorClear; } - void SetExpandRefs( bool bVal ); - bool IsExpandRefs() const; + void SetExpandRefs( bool bVal ); + bool IsExpandRefs() const { return bExpandRefs; } - sal_uLong GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } + sal_uLong GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } void IncXMLImportedFormulaCount( sal_uLong nVal ) { if ( nXMLImportedFormulaCount + nVal > nXMLImportedFormulaCount ) diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 4647227a43e8..06f66c0b7788 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -129,7 +129,7 @@ public: const OUString* InternString(const OUString& rStr) const; void AddReference(ScDPObject* pObj) const; void RemoveReference(ScDPObject* pObj) const; - const ObjectSetType& GetAllReferences() const; + const ObjectSetType& GetAllReferences() const { return maRefObjects;} SCROW GetIdByItemData(long nDim, const ScDPItemData& rItem) const; OUString GetFormattedString(long nDim, const ScDPItemData& rItem) const; @@ -160,15 +160,15 @@ public: bool InitFromDoc(ScDocument* pDoc, const ScRange& rRange); bool InitFromDataBase(DBConnector& rDB); - SCROW GetRowCount() const; + SCROW GetRowCount() const { return mnRowCount;} SCROW GetDataSize() const; SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) const; OUString GetDimensionName(LabelsType::size_type nDim) const; bool IsRowEmpty(SCROW nRow) const; bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const; - ScDocument* GetDoc() const; - long GetColumnCount() const; + ScDocument* GetDoc() const { return mpDoc;} + long GetColumnCount() const { return mnColumnCount;} const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index cb3b130db8b3..4990a29e8542 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -85,7 +85,7 @@ public: size_t GetItemCount() const { return aItems.size(); } void SetDateDimension(); - bool IsDateDimension() const; + bool IsDateDimension() const { return mbDateDimension;} }; typedef ::std::vector<ScDPGroupDimension> ScDPGroupDimensionVec; @@ -112,7 +112,7 @@ public: void DisposeData(); - bool IsDateDimension() const; + bool IsDateDimension() const { return mbDateDimension;} }; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 299baa0e2e45..b6866f743c95 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -140,7 +140,7 @@ public: const ScRange& GetOutRange() const { return aOutRange; } void SetHeaderLayout(bool bUseGrid); - bool GetHeaderLayout() const; + bool GetHeaderLayout() const { return mbHeaderLayout;} void SetSheetDesc(const ScSheetSourceDesc& rDesc, bool bFromRefUpdate = false); void SetImportDesc(const ScImportSourceDesc& rDesc); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 5bac8c40ab98..d4ff356c739d 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -131,7 +131,7 @@ public: void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); void SetHeaderLayout(bool bUseGrid); - bool GetHeaderLayout() const; + bool GetHeaderLayout() const { return mbHeaderLayout;} static void GetDataDimensionNames( OUString& rSourceName, OUString& rGivenName, diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 207e256eb25e..e02890a2ccb0 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -114,10 +114,10 @@ public: ScDPResultMember* GetColResRoot() const { return pColResRoot; } ScDPResultMember* GetRowResRoot() const { return pRowResRoot; } - const IndexArray& GetColVisible() const; - const IndexArray& GetColSorted() const; - const IndexArray& GetRowVisible() const; - const IndexArray& GetRowSorted() const; + const IndexArray& GetColVisible() const { return maColVisible;} + const IndexArray& GetColSorted() const { return maColSorted;} + const IndexArray& GetRowVisible() const { return maRowVisible;} + const IndexArray& GetRowSorted() const { return maRowSorted;} void AddColIndex( long nVisible, long nSorted ); void AddRowIndex( long nVisible, long nSorted ); @@ -339,7 +339,7 @@ public: ResultMembers* GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const; - const ScDPSource& GetSource() const; + const ScDPSource& GetSource() const { return mrSource;} }; class ScDPResultMember @@ -381,7 +381,9 @@ public: bool IsValid() const; bool IsVisible() const; long GetSize(long nMeasure) const; - bool HasHiddenDetails() const; + // bHasHiddenDetails is set only if the "show details" flag is off, + // and there was a child dimension to skip + bool HasHiddenDetails() const { return bHasHiddenDetails; } bool IsSubTotalInTitle(long nMeasure) const; long GetSubTotalCount( long* pUserSubStart = NULL ) const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 6d9d73e21028..757054fb4131 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -416,9 +416,9 @@ public: void setOrientation(sal_uInt16 nNew); long getPosition() const; bool getIsDataLayoutDimension() const; - sal_uInt16 getFunction() const; + sal_uInt16 getFunction() const { return nFunction;} void setFunction(sal_uInt16 nNew); // for data dimension - long getUsedHierarchy() const; + long getUsedHierarchy() const { return nUsedHier;} void setUsedHierarchy(long nNew); bool HasSelectedPage() const { return bHasSelectedPage; } @@ -638,7 +638,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; - bool getShowEmpty() const; + bool getShowEmpty() const { return bShowEmpty;} const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } @@ -717,7 +717,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - long getCount() const; + long getCount() const { return nMbrCount;} ScDPMember* getByIndex(long nIndex) const; long getMinMembers() const; @@ -757,7 +757,7 @@ public: bool IsNamedItem(SCROW nIndex) const; SC_DLLPUBLIC const OUString* GetLayoutName() const; - long GetDim() const; + long GetDim() const { return nDim;} sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order @@ -815,8 +815,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - bool isVisible() const; - bool getShowDetails() const; + bool isVisible() const { return bVisible;} + bool getShowDetails() const { return bShowDet;} }; diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx index 4eb57b990135..e13a4b1c6f20 100644 --- a/sc/inc/editdataarray.hxx +++ b/sc/inc/editdataarray.hxx @@ -40,9 +40,9 @@ public: const EditTextObject* GetOldData() const; const EditTextObject* GetNewData() const; - SCTAB GetTab() const; - SCCOL GetCol() const; - SCROW GetRow() const; + SCTAB GetTab() const { return mnTab;} + SCCOL GetCol() const { return mnCol;} + SCROW GetRow() const { return mnRow;} private: Item(); // disabled diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 9bcc64d36f8f..666958a5f60a 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -168,7 +168,7 @@ public: void setReferenced( bool bReferenced ); /// Unconditionally set the reference status flag. void setReferencedFlag( ReferencedFlag eFlag ); - ReferencedFlag getReferencedFlag() const; + ReferencedFlag getReferencedFlag() const { return meReferenced;} bool isReferenced() const; /// Obtain a sorted vector of rows. void getAllRows(::std::vector<SCROW>& rRows, SCROW nLow = 0, SCROW nHigh = MAXROW) const; diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 3d76950c52a9..bb117090748a 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -241,7 +241,7 @@ public: ScEditSource* pEditSrc, sal_Int32 eType, const ESelection& rSel); virtual ~ScEditFieldObj(); - sal_Int32 GetFieldType() const; + sal_Int32 GetFieldType() const { return meType;} void DeleteField(); bool IsInserted() const; SvxFieldItem CreateFieldItem(); diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 3301d1e54468..25efdb786a8e 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -210,14 +210,14 @@ public: void ResetTableOpDirtyVar(); void SetTableOpDirty(); bool IsDirtyOrInTableOpDirty() const; - bool GetDirty() const; + bool GetDirty() const { return bDirty; } void ResetDirty(); - bool NeedsListening() const; + bool NeedsListening() const { return bNeedListening; } void SetNeedsListening( bool bVar ); void SetNeedsDirty( bool bVar ); void SetNeedNumberFormat( bool bVal ); - bool NeedsNumberFormat() const; - short GetFormatType() const; + bool NeedsNumberFormat() const { return mbNeedsNumberFormat;} + short GetFormatType() const { return nFormatType; } void Compile(const OUString& rFormula, bool bNoListening = false, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); @@ -230,8 +230,8 @@ public: void CalcAfterLoad( sc::CompileFormulaContext& rCxt ); bool MarkUsedExternalReferences(); void Interpret(); - bool IsIterCell() const; - sal_uInt16 GetSeenInIteration() const; + bool IsIterCell() const { return bIsIterCell; } + sal_uInt16 GetSeenInIteration() const { return nSeenInIteration; } bool HasOneReference( ScRange& r ) const; /* Checks if the formula contains reference list that can be @@ -281,8 +281,8 @@ public: bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; - bool IsSubTotal() const; - bool IsChanged() const; + bool IsSubTotal() const { return bSubTotal;} + bool IsChanged() const { return bChanged;} void SetChanged(bool b); bool IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result @@ -300,35 +300,35 @@ public: sal_uInt16 GetRawError(); // don't interpret, just return code or result error bool GetErrorOrValue( sal_uInt16& rErr, double& rVal ); sc::FormulaResultValue GetResult(); - sal_uInt8 GetMatrixFlag() const; - ScTokenArray* GetCode(); + sal_uInt8 GetMatrixFlag() const { return cMatrixFlag;} + ScTokenArray* GetCode() { return pCode;} const ScTokenArray* GetCode() const; void SetCode( ScTokenArray* pNew ); - bool IsRunning() const; + bool IsRunning() const { return bRunning;} void SetRunning( bool bVal ); void CompileDBFormula( sc::CompileFormulaContext& rCxt ); void CompileDBFormula( sc::CompileFormulaContext& rCxt, bool bCreateFormulaString ); void CompileColRowNameFormula( sc::CompileFormulaContext& rCxt ); - ScFormulaCell* GetPrevious() const; - ScFormulaCell* GetNext() const; + ScFormulaCell* GetPrevious() const { return pPrevious; } + ScFormulaCell* GetNext() const { return pNext; } void SetPrevious( ScFormulaCell* pF ); void SetNext( ScFormulaCell* pF ); - ScFormulaCell* GetPreviousTrack() const; - ScFormulaCell* GetNextTrack() const; + ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } + ScFormulaCell* GetNextTrack() const { return pNextTrack; } void SetPreviousTrack( ScFormulaCell* pF ); void SetNextTrack( ScFormulaCell* pF ); virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; void SetCompile( bool bVal ); - ScDocument* GetDocument() const; + ScDocument* GetDocument() const { return pDocument;} void SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag=true ); void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; // cell belongs to ChangeTrack and not to the real document void SetInChangeTrack( bool bVal ); - bool IsInChangeTrack() const; + bool IsInChangeTrack() const { return bInChangeTrack;} // For import filters! void AddRecalcMode( formula::ScRecalcMode ); @@ -399,7 +399,7 @@ public: void SyncSharedCode(); - bool IsPostponedDirty() const; + bool IsPostponedDirty() const { return mbPostponedDirty;} }; #endif diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx index 7d66f9248ad6..f42fdc7a4054 100644 --- a/sc/inc/listenercontext.hxx +++ b/sc/inc/listenercontext.hxx @@ -52,7 +52,7 @@ public: void setPositionDelta( const ScAddress& rDelta ); ScDocument& getDoc(); - ScTokenArray* getOldCode(); + ScTokenArray* getOldCode() { return mpOldCode;} ScAddress getOldPosition( const ScAddress& rPos ) const; ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol); diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 1c76955da094..3bc60ac4d69a 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -209,7 +209,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - bool IsModifyAndBroadcast() const; + bool IsModifyAndBroadcast() const { return mbModifyAndBroadcast;} /// XNamedRanges virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 8a557c6c61e9..a0df79d56a95 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -41,19 +41,19 @@ public: ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden = false ); ScOutlineEntry( const ScOutlineEntry& rEntry ); - SC_DLLPUBLIC SCCOLROW GetStart() const; - SCSIZE GetSize() const; + SC_DLLPUBLIC SCCOLROW GetStart() const { return nStart;} + SCSIZE GetSize() const { return nSize;} SC_DLLPUBLIC SCCOLROW GetEnd() const; /** * @return true is the group is hidden, false otherwise. */ - SC_DLLPUBLIC bool IsHidden() const; + SC_DLLPUBLIC bool IsHidden() const { return bHidden;} /** * @return true if the control is visible, false otherwise. */ - SC_DLLPUBLIC bool IsVisible() const; + SC_DLLPUBLIC bool IsVisible() const { return bVisible;} void Move( SCsCOLROW nDelta ); void SetSize( SCSIZE nNewSize ); @@ -106,7 +106,7 @@ public: ScOutlineArray(); ScOutlineArray( const ScOutlineArray& rArray ); - size_t GetDepth() const; + size_t GetDepth() const { return nDepth;} bool FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const; @@ -180,7 +180,7 @@ public: ScSubOutlineIterator( ScOutlineArray* pOutlineArray, size_t nLevel, size_t nEntry ); ScOutlineEntry* GetNext(); - size_t LastLevel() const; + size_t LastLevel() const { return nSubLevel;} size_t LastEntry() const; void DeleteLast(); }; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 47a299761612..5716207e07e7 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -96,7 +96,7 @@ public: bool bCloneCaption ) const; /** Returns the data struct containing all note settings. */ - const ScNoteData& GetNoteData() const; + const ScNoteData& GetNoteData() const { return maNoteData;} /** Returns the creation date of this note. */ const OUString& GetDate() const; diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index 1c3a067a3f6f..2d1116e66629 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -65,7 +65,7 @@ struct SC_DLLPUBLIC ScQueryEntry utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const; QueryItemsType& GetQueryItems(); - const QueryItemsType& GetQueryItems() const; + const QueryItemsType& GetQueryItems() const { return maQueryItems;} void SetQueryByEmpty(); bool IsQueryByEmpty() const; void SetQueryByNonEmpty(); diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index f069abdb5dc3..90105cc71402 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -112,7 +112,7 @@ struct ScDBQueryParamBase : public ScQueryParamBase SCCOL mnField; /// the field in which the values are processed during iteration. bool mbSkipString; - DataType GetType() const; + DataType GetType() const { return meType;} virtual ~ScDBQueryParamBase(); diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx index 1f927312327b..146adf8f35d9 100644 --- a/sc/inc/refhint.hxx +++ b/sc/inc/refhint.hxx @@ -31,7 +31,7 @@ protected: public: virtual ~RefHint() = 0; - Type getType() const; + Type getType() const { return meType; } }; class RefMovedHint : public RefHint @@ -68,9 +68,9 @@ public: const sc::ColReorderMapType& getColMap() const; - SCTAB getTab() const; - SCROW getStartRow() const; - SCROW getEndRow() const; + SCTAB getTab() const { return mnTab;} + SCROW getStartRow() const { return mnRow1;} + SCROW getEndRow() const { return mnRow2;} }; } diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx index 21e9ee4e9e09..8d2c5975d1bf 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -36,18 +36,18 @@ public: ~RowHeightContext(); - double getPPTX() const; - double getPPTY() const; + double getPPTX() const { return mfPPTX;} + double getPPTY() const { return mfPPTY;} const Fraction& getZoomX() const; const Fraction& getZoomY() const; - OutputDevice* getOutputDevice(); + OutputDevice* getOutputDevice() { return mpOutDev;} void setExtraHeight( sal_uInt16 nH ); - sal_uInt16 getExtraHeight() const; + sal_uInt16 getExtraHeight() const { return mnExtraHeight;} void setForceAutoSize( bool b ); - bool isForceAutoSize() const; + bool isForceAutoSize() const { return mbForceAutoSize;} }; } diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index cafefdf5d836..055c38e9f05a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -214,7 +214,7 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, bool bUseRef = true ); void SetRefInputHdl( ScInputHandler* pNew ); - ScInputHandler* GetRefInputHdl(); + ScInputHandler* GetRefInputHdl() { return pRefInputHandler;} void ViewShellGone(ScTabViewShell* pViewSh); void ViewShellChanged(); diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index a62e35606115..f1775fd34126 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -42,7 +42,7 @@ public: explicit ForwardIterator(ScFlatBoolRowSegments& rSegs); bool getValue(SCROW nPos, bool& rVal); - SCROW getLastPos() const; + SCROW getLastPos() const { return mnLastPos;} private: ScFlatBoolRowSegments& mrSegs; @@ -124,7 +124,7 @@ public: explicit ForwardIterator(ScFlatUInt16RowSegments& rSegs); bool getValue(SCROW nPos, sal_uInt16& rVal); - SCROW getLastPos() const; + SCROW getLastPos() const { return mnLastPos;} private: ScFlatUInt16RowSegments& mrSegs; diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 0e6e240681f3..38ae38e29bae 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -169,7 +169,7 @@ public: const std::vector<ScTextStyleEntry>& GetNoteTextStyles() const { return maNoteTextStyles; } const std::vector<ScTextStyleEntry>& GetTextStyles() const { return maTextStyles; } - bool IsInSupportedSave() const; + bool IsInSupportedSave() const { return mbInSupportedSave;} void SetInSupportedSave( bool bSet ); }; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 0c008514cbc5..45f8912fa7f4 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -294,7 +294,7 @@ public: void SetName( const OUString& rNewName ); void SetAnonymousDBData(ScDBData* pDBData); - ScDBData* GetAnonymousDBData(); + ScDBData* GetAnonymousDBData() { return pDBDataNoName;} void GetCodeName( OUString& rName ) const { rName = aCodeName; } void SetCodeName( const OUString& rNewName ) { aCodeName = rNewName; } @@ -1105,7 +1105,7 @@ private: * @return Current row position, or ROW_NOT_FOUND if the iterator * doesn't point to a valid data cell position. */ - SCROW getRow() const; + SCROW getRow() const { return mnCurRow;} private: ScFlatBoolRowSegments& mrRowSegs; diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 9538819e7733..b6aee9504899 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -60,9 +60,9 @@ public: ScTokenArray* Clone() const; /// True copy! void GenHash(); - size_t GetHash() const; + size_t GetHash() const { return mnHashValue;} - ScFormulaVectorState GetVectorState() const; + ScFormulaVectorState GetVectorState() const { return meVectorState;} /** * If the array contains at least one relative row reference or named diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx index 5ba1c0313a52..37965c8fe200 100644 --- a/sc/inc/tokenstringcontext.hxx +++ b/sc/inc/tokenstringcontext.hxx @@ -58,12 +58,12 @@ public: CompileFormulaContext( ScDocument* pDoc ); CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ); - formula::FormulaGrammar::Grammar getGrammar() const; + formula::FormulaGrammar::Grammar getGrammar() const { return meGram;} void setGrammar( formula::FormulaGrammar::Grammar eGram ); const std::vector<OUString>& getTabNames() const; - ScDocument* getDoc(); + ScDocument* getDoc() { return mpDoc;} }; } diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 4e393b790baa..dc313c05d913 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -32,9 +32,9 @@ public: ScTypedStrData( const ScTypedStrData& rCpy ); bool IsStrData() const; - bool IsDate() const; + bool IsDate() const { return mbIsDate;} SC_DLLPUBLIC const OUString& GetString() const; - StringType GetStringType() const; + StringType GetStringType() const { return meStrType;} double GetValue() const { return mfValue; } struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool> diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 8c6e11eddb6f..c2a88dfbebf5 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -36,7 +36,7 @@ public: ScUnitConverterData( const ScUnitConverterData& ); ~ScUnitConverterData(); - double GetValue() const; + double GetValue() const { return mfValue;} const OUString& GetIndexString() const; static OUString BuildIndexString( diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index c70d9d48de2b..556e3dbcb4d8 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -53,15 +53,7 @@ void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB nEnd) mnTabEnd = nEnd; } -SCTAB CopyFromClipContext::getTabStart() const -{ - return mnTabStart; -} -SCTAB CopyFromClipContext::getTabEnd() const -{ - return mnTabEnd; -} void CopyFromClipContext::setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -81,30 +73,14 @@ CopyFromClipContext::Range CopyFromClipContext::getDestRange() const return aRet; } -ScDocument* CopyFromClipContext::getUndoDoc() -{ - return mpRefUndoDoc; -} -ScDocument* CopyFromClipContext::getClipDoc() -{ - return mpClipDoc; -} -sal_uInt16 CopyFromClipContext::getInsertFlag() const -{ - return mnInsertFlag; -} void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) { mnDeleteFlag = nFlag; } -sal_uInt16 CopyFromClipContext::getDeleteFlag() const -{ - return mnDeleteFlag; -} ScCellValue& CopyFromClipContext::getSingleCell() { @@ -116,25 +92,13 @@ void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondForma mpCondFormatList = pCondFormatList; } -ScConditionalFormatList* CopyFromClipContext::getCondFormatList() -{ - return mpCondFormatList; -} -const ScPatternAttr* CopyFromClipContext::getSingleCellPattern() const -{ - return mpSinglePattern; -} void CopyFromClipContext::setSingleCellPattern( const ScPatternAttr* pAttr ) { mpSinglePattern = pAttr; } -const ScPostIt* CopyFromClipContext::getSingleCellNote() const -{ - return mpSingleNote; -} void CopyFromClipContext::setSingleCellNote( const ScPostIt* pNote ) { @@ -146,25 +110,9 @@ void CopyFromClipContext::setTableProtected( bool b ) mbTableProtected = b; } -bool CopyFromClipContext::isTableProtected() const -{ - return mbTableProtected; -} -bool CopyFromClipContext::isAsLink() const -{ - return mbAsLink; -} -bool CopyFromClipContext::isSkipAttrForEmptyCells() const -{ - return mbSkipAttrForEmptyCells; -} -bool CopyFromClipContext::isCloneNotes() const -{ - return mbCloneNotes; -} bool CopyFromClipContext::isDateCell( const ScColumn& rCol, SCROW nRow ) const { @@ -179,15 +127,7 @@ CopyToClipContext::CopyToClipContext( CopyToClipContext::~CopyToClipContext() {} -bool CopyToClipContext::isKeepScenarioFlags() const -{ - return mbKeepScenarioFlags; -} -bool CopyToClipContext::isCloneNotes() const -{ - return mbCloneNotes; -} CopyToDocContext::CopyToDocContext(ScDocument& rDoc) : ClipContextBase(rDoc) {} CopyToDocContext::~CopyToDocContext() {} diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c5001497e0dc..fe8eff879695 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -343,10 +343,6 @@ void ScColorScaleEntry::SetType( ScColorScaleEntryType eType ) } } -ScColorScaleEntryType ScColorScaleEntry::GetType() const -{ - return meType; -} double ScColorScaleFormat::GetMinValue() const { diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 80a2b53c26dd..2fb8cf125d6c 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1775,10 +1775,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType meType = eType; } -condformat::ScCondFormatDateType ScCondDateFormatEntry::GetDateType() const -{ - return meType; -} const OUString& ScCondDateFormatEntry::GetStyleName() const { diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index d65c42c16cb3..a1bc567efb9d 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -368,10 +368,6 @@ void ScDocument::SetExpandRefs( bool bVal ) bExpandRefs = bVal; } -bool ScDocument::IsExpandRefs() const -{ - return bExpandRefs; -} void ScDocument::StartTrackTimer() { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 051c0d1faef7..2a4bde6506ba 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -229,10 +229,6 @@ const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* return pData; } -ScDBCollection* ScDocument::GetDBCollection() const -{ - return pDBCollection; -} void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter ) { @@ -362,10 +358,6 @@ ScDPObject* ScDocument::GetDPAtBlock( const ScRange & rBlock ) const return NULL; } -ScChartCollection* ScDocument::GetChartCollection() const -{ - return pChartCollection; -} void ScDocument::StopTemporaryChartLock() { @@ -373,10 +365,6 @@ void ScDocument::StopTemporaryChartLock() apTemporaryChartLock->StopLocking(); } -ScChartListenerCollection* ScDocument::GetChartListenerCollection() const -{ - return pChartListenerCollection; -} void ScDocument::SetChartListenerCollection( ScChartListenerCollection* pNewChartListenerCollection, @@ -466,10 +454,6 @@ formula::FormulaGrammar::AddressConvention ScDocument::GetAddressConvention() co return formula::FormulaGrammar::extractRefConvention(eGrammar); } -formula::FormulaGrammar::Grammar ScDocument::GetGrammar() const -{ - return eGrammar; -} void ScDocument::SetGrammar( formula::FormulaGrammar::Grammar eGram ) { @@ -1628,10 +1612,6 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) } -bool ScDocument::IsEmbedded() const -{ - return bIsEmbedded; -} void ScDocument::GetEmbedded( ScRange& rRange ) const { diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 1247563867de..54f1508f9298 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1184,10 +1184,6 @@ SfxBindings* ScDocument::GetViewBindings() return NULL; } -ScDrawLayer* ScDocument::GetDrawLayer() -{ - return pDrawLayer; -} void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 87451de19fea..928a478e4480 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4508,10 +4508,6 @@ const ScValidationDataList* ScDocument::GetValidationList() const return pValidationList; } -ScValidationDataList* ScDocument::GetValidationList() -{ - return pValidationList; -} void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) { @@ -6083,10 +6079,6 @@ void ScDocument::EnableUndo( bool bVal ) mbUndoEnabled = bVal; } -bool ScDocument::IsUserInteractionEnabled() const -{ - return mbUserInteractionEnabled; -} void ScDocument::EnableUserInteraction( bool bVal ) { diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 478fc0a3e53e..bf402f5beb4d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -829,10 +829,6 @@ size_t ScDPCache::GetGroupFieldCount() const return maGroupFields.size(); } -SCROW ScDPCache::GetRowCount() const -{ - return mnRowCount; -} SCROW ScDPCache::GetDataSize() const { @@ -912,10 +908,6 @@ void ScDPCache::RemoveReference(ScDPObject* pObj) const mpDoc->GetDPCollection()->RemoveCache(this); } -const ScDPCache::ObjectSetType& ScDPCache::GetAllReferences() const -{ - return maRefObjects; -} SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const { @@ -1154,15 +1146,8 @@ SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const return nIndex; } -ScDocument* ScDPCache::GetDoc() const -{ - return mpDoc; -}; +; -long ScDPCache::GetColumnCount() const -{ - return mnColumnCount; -} #if DEBUG_PIVOT_TABLE diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index f2a68f56af83..e2eeea7a0971 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -434,10 +434,6 @@ void ScDPGroupDimension::SetDateDimension() mbDateDimension = true; } -bool ScDPGroupDimension::IsDateDimension() const -{ - return mbDateDimension; -} ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} @@ -460,10 +456,6 @@ void ScDPNumGroupDimension::DisposeData() maMemberEntries.clear(); } -bool ScDPNumGroupDimension::IsDateDimension() const -{ - return mbDateDimension; -} ScDPNumGroupDimension::~ScDPNumGroupDimension() { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 97b1a153fc0b..df40306ab97b 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -408,10 +408,6 @@ void ScDPObject::SetHeaderLayout (bool bUseGrid) mbHeaderLayout = bUseGrid; } -bool ScDPObject::GetHeaderLayout() const -{ - return mbHeaderLayout; -} void ScDPObject::SetOutRange(const ScRange& rRange) { diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 21e958f555d9..0cec6affe9ac 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1229,10 +1229,6 @@ void ScDPOutput::SetHeaderLayout(bool bUseGrid) bSizesValid = false; } -bool ScDPOutput::GetHeaderLayout() const -{ - return mbHeaderLayout; -} namespace { diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 6382ae2ea311..976c991099bf 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -315,25 +315,9 @@ ScDPRunningTotalState::ScDPRunningTotalState( ScDPResultMember* pColRoot, ScDPRe maRowSorted.push_back(-1); } -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetColVisible() const -{ - return maColVisible; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetColSorted() const -{ - return maColSorted; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetRowVisible() const -{ - return maRowVisible; -} -const ScDPRunningTotalState::IndexArray& ScDPRunningTotalState::GetRowSorted() const -{ - return maRowSorted; -} void ScDPRunningTotalState::AddColIndex( long nVisible, long nSorted ) { @@ -907,10 +891,6 @@ bool ScDPResultData::HasCommonElement( SCROW nFirstDataId, long nFirstIndex, return false; } -const ScDPSource& ScDPResultData::GetSource() const -{ - return mrSource; -} ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const { @@ -1227,14 +1207,6 @@ bool ScDPResultMember::IsValid() const return true; } -bool ScDPResultMember::HasHiddenDetails() const -{ - // bHasHiddenDetails is set only if the "show details" flag is off, - // and there was a child dimension to skip - - return bHasHiddenDetails; -} - long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const { if ( pUserSubStart ) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index d746eadcb279..8355ff48c5d3 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1426,20 +1426,12 @@ bool ScDPDimension::getIsDataLayoutDimension() const return pSource->GetData()->getIsDataLayoutDimension( nDim ); } -sal_uInt16 ScDPDimension::getFunction() const -{ - return nFunction; -} void ScDPDimension::setFunction(sal_uInt16 nNew) { nFunction = nNew; } -long ScDPDimension::getUsedHierarchy() const -{ - return nUsedHier; -} void ScDPDimension::setUsedHierarchy(long /* nNew */) { @@ -2207,10 +2199,6 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const return aSubTotals; } -bool ScDPLevel::getShowEmpty() const -{ - return bShowEmpty; -} // XPropertySet @@ -2447,10 +2435,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e // end of XNameAccess implementation -long ScDPMembers::getCount() const -{ - return nMbrCount; -} long ScDPMembers::getMinMembers() const { @@ -2645,10 +2629,6 @@ const OUString* ScDPMember::GetLayoutName() const return mpLayoutName.get(); } -long ScDPMember::GetDim() const -{ - return nDim; -} OUString ScDPMember::GetNameStr() const { @@ -2668,15 +2648,7 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R OSL_FAIL("not implemented"); //! exception? } -bool ScDPMember::isVisible() const -{ - return bVisible; -} -bool ScDPMember::getShowDetails() const -{ - return bShowDet; -} // XPropertySet diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 7891500cdfb0..c7e9aeb6006e 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -991,9 +991,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) } } -bool ScFormulaCell::GetDirty() const { return bDirty; } void ScFormulaCell::ResetDirty() { bDirty = bTableOpDirty = mbPostponedDirty = false; } -bool ScFormulaCell::NeedsListening() const { return bNeedListening; } void ScFormulaCell::SetNeedsListening( bool bVar ) { bNeedListening = bVar; } void ScFormulaCell::SetNeedsDirty( bool bVar ) @@ -1003,12 +1001,7 @@ void ScFormulaCell::SetNeedsDirty( bool bVar ) void ScFormulaCell::SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat = bVal; } -bool ScFormulaCell::NeedsNumberFormat() const -{ - return mbNeedsNumberFormat; -} -short ScFormulaCell::GetFormatType() const { return nFormatType; } void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) @@ -1582,8 +1575,6 @@ void ScFormulaCell::Interpret() } } -bool ScFormulaCell::IsIterCell() const { return bIsIterCell; } -sal_uInt16 ScFormulaCell::GetSeenInIteration() const { return nSeenInIteration; } void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) { @@ -1908,10 +1899,6 @@ void ScFormulaCell::SetCompile( bool bVal ) bCompile = bVal; } -ScDocument* ScFormulaCell::GetDocument() const -{ - return pDocument; -} void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) { @@ -1945,10 +1932,6 @@ void ScFormulaCell::SetInChangeTrack( bool bVal ) bInChangeTrack = bVal; } -bool ScFormulaCell::IsInChangeTrack() const -{ - return bInChangeTrack; -} void ScFormulaCell::Notify( const SfxHint& rHint ) { @@ -3398,30 +3381,14 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() ); } -bool ScFormulaCell::IsSubTotal() const -{ - return bSubTotal; -} -bool ScFormulaCell::IsChanged() const -{ - return bChanged; -} void ScFormulaCell::SetChanged(bool b) { bChanged = b; } -sal_uInt8 ScFormulaCell::GetMatrixFlag() const -{ - return cMatrixFlag; -} -ScTokenArray* ScFormulaCell::GetCode() -{ - return pCode; -} const ScTokenArray* ScFormulaCell::GetCode() const { @@ -3435,10 +3402,6 @@ void ScFormulaCell::SetCode( ScTokenArray* pNew ) pCode = pNew; // takes ownership. } -bool ScFormulaCell::IsRunning() const -{ - return bRunning; -} void ScFormulaCell::SetRunning( bool bVal ) { @@ -3526,12 +3489,8 @@ void ScFormulaCell::CompileColRowNameFormula( sc::CompileFormulaContext& rCxt ) } } -ScFormulaCell* ScFormulaCell::GetPrevious() const { return pPrevious; } -ScFormulaCell* ScFormulaCell::GetNext() const { return pNext; } void ScFormulaCell::SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } void ScFormulaCell::SetNext( ScFormulaCell* pF ) { pNext = pF; } -ScFormulaCell* ScFormulaCell::GetPreviousTrack() const { return pPreviousTrack; } -ScFormulaCell* ScFormulaCell::GetNextTrack() const { return pNextTrack; } void ScFormulaCell::SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } void ScFormulaCell::SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } @@ -4090,9 +4049,5 @@ void ScFormulaCell::SyncSharedCode() pCode = mxGroup->mpCode; } -bool ScFormulaCell::IsPostponedDirty() const -{ - return mbPostponedDirty; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index dcdffac65710..d6b92ebe0ef6 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -49,10 +49,6 @@ ScDocument& EndListeningContext::getDoc() return mrDoc; } -ScTokenArray* EndListeningContext::getOldCode() -{ - return mpOldCode; -} ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const { diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 605c80d9def5..fb420674283a 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -41,29 +41,13 @@ ScOutlineEntry::ScOutlineEntry( const ScOutlineEntry& rEntry ) : { } -SCCOLROW ScOutlineEntry::GetStart() const -{ - return nStart; -} -SCSIZE ScOutlineEntry::GetSize() const -{ - return nSize; -} SCCOLROW ScOutlineEntry::GetEnd() const { return nStart+nSize-1; } -bool ScOutlineEntry::IsHidden() const -{ - return bHidden; -} -bool ScOutlineEntry::IsVisible() const -{ - return bVisible; -} void ScOutlineEntry::Move( SCsCOLROW nDelta ) { @@ -305,10 +289,6 @@ bool ScOutlineArray::Insert( return true; } -size_t ScOutlineArray::GetDepth() const -{ - return nDepth; -} bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const @@ -884,10 +864,6 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext() return pEntry; // nSubLevel gueltig, wenn pEntry != 0 } -size_t ScSubOutlineIterator::LastLevel() const -{ - return nSubLevel; -} size_t ScSubOutlineIterator::LastEntry() const { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index a3459af1c2ce..703dc8aaa506 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -509,10 +509,6 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const return bCloneCaption ? new ScPostIt( rDestDoc, rDestPos, *this ) : new ScPostIt( rDestDoc, rDestPos, maNoteData, false ); } -const ScNoteData& ScPostIt::GetNoteData() const -{ - return maNoteData; -} const OUString& ScPostIt::GetDate() const { diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 9fa96d130ec0..408bf4df759a 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -22,15 +22,7 @@ RowHeightContext::RowHeightContext( RowHeightContext::~RowHeightContext() {} -double RowHeightContext::getPPTX() const -{ - return mfPPTX; -} -double RowHeightContext::getPPTY() const -{ - return mfPPTY; -} const Fraction& RowHeightContext::getZoomX() const { @@ -42,30 +34,18 @@ const Fraction& RowHeightContext::getZoomY() const return maZoomY; } -OutputDevice* RowHeightContext::getOutputDevice() -{ - return mpOutDev; -} void RowHeightContext::setExtraHeight( sal_uInt16 nH ) { mnExtraHeight = nH; } -sal_uInt16 RowHeightContext::getExtraHeight() const -{ - return mnExtraHeight; -} void RowHeightContext::setForceAutoSize( bool b ) { mbForceAutoSize = b; } -bool RowHeightContext::isForceAutoSize() const -{ - return mbForceAutoSize; -} } diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index caf7201c9422..a5bf3c833d4e 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -291,10 +291,6 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal) return true; } -SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const -{ - return mnLastPos; -} ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) @@ -460,10 +456,6 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16& return true; } -SCROW ScFlatUInt16RowSegments::ForwardIterator::getLastPos() const -{ - return mnLastPos; -} ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) : mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault)) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index b7e020f5a04b..fe407e0db71c 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2076,10 +2076,6 @@ ScRefCellValue ScTable::VisibleDataCellIterator::next() return ScRefCellValue(); } -SCROW ScTable::VisibleDataCellIterator::getRow() const -{ - return mnCurRow; -} void ScTable::SetAnonymousDBData(ScDBData* pDBData) { @@ -2087,10 +2083,6 @@ void ScTable::SetAnonymousDBData(ScDBData* pDBData) pDBDataNoName = pDBData; } -ScDBData* ScTable::GetAnonymousDBData() -{ - return pDBDataNoName; -} sal_uLong ScTable::AddCondFormat( ScConditionalFormat* pNew ) { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 73b03c567d87..8d19ab9ac5c3 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -94,11 +94,11 @@ public: explicit ScTableProtectionImpl(SCSIZE nOptSize); explicit ScTableProtectionImpl(const ScTableProtectionImpl& r); - bool isProtected() const; + bool isProtected() const { return mbProtected;} bool isProtectedWithPass() const; void setProtected(bool bProtected); - bool isPasswordEmpty() const; + bool isPasswordEmpty() const { return mbEmptyPass;} bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; void setPassword(const OUString& aPassText); ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( @@ -189,10 +189,6 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) : { } -bool ScTableProtectionImpl::isProtected() const -{ - return mbProtected; -} bool ScTableProtectionImpl::isProtectedWithPass() const { @@ -224,10 +220,6 @@ void ScTableProtectionImpl::setPassword(const OUString& aPassText) } } -bool ScTableProtectionImpl::isPasswordEmpty() const -{ - return mbEmptyPass; -} bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const { diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 3ae711a30518..1ca4d1cf0b69 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -71,7 +71,7 @@ public: protected: ScDBRangeBase(ScDocument* pDoc, RefType eType); - ScDocument* getDoc() const; + ScDocument* getDoc() const { return mpDoc;} /** * Populate query options that are always the same for all database diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 642699a5a0be..37d7f6053c02 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -140,7 +140,7 @@ public: NOT_VOLATILE }; - VolatileType GetVolatileType() const; + VolatileType GetVolatileType() const { return meVolatileType;} private: static ScCalcConfig maGlobalConfig; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index bbc709ea1b4f..d8539b9d76aa 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1346,10 +1346,6 @@ ScUnoAddInCall::~ScUnoAddInCall() // pFuncData is deleted with ScUnoAddInCollection } -bool ScUnoAddInCall::ValidParamCount() -{ - return bValidCount; -} ScAddInArgumentType ScUnoAddInCall::GetArgType( long nPos ) { diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index d8c9e86a4d3a..b2097a119d42 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -883,8 +883,6 @@ bool ScChangeActionDel::IsTabDeleteCol() const return p && p->GetType() == SC_CAT_DELETE_TABS; } -SCsCOL ScChangeActionDel::GetDx() const { return nDx; } -SCsROW ScChangeActionDel::GetDy() const { return nDy; } ScChangeActionDelMoveEntry* ScChangeActionDel::AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 4b8887cc1adf..66a9edbbc043 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -266,10 +266,6 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) pParam->bDuplicate = true; } -ScDocument* ScDBRangeBase::getDoc() const -{ - return mpDoc; -} ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) diff --git a/sc/source/core/tool/editdataarray.cxx b/sc/source/core/tool/editdataarray.cxx index b3946d4c011c..a635d64a465e 100644 --- a/sc/source/core/tool/editdataarray.cxx +++ b/sc/source/core/tool/editdataarray.cxx @@ -72,19 +72,7 @@ const EditTextObject* ScEditDataArray::Item::GetNewData() const return mpNewData.get(); } -SCTAB ScEditDataArray::Item::GetTab() const -{ - return mnTab; -} -SCCOL ScEditDataArray::Item::GetCol() const -{ - return mnCol; -} -SCROW ScEditDataArray::Item::GetRow() const -{ - return mnRow; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 2205ed7d9320..a49e87c3847e 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -334,10 +334,6 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty) return pMat; } -ScInterpreter::VolatileType ScInterpreter::GetVolatileType() const -{ - return meVolatileType; -} ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index a282f4dce500..455c8c6617cb 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -84,10 +84,6 @@ ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() return maQueryItems; } -const ScQueryEntry::QueryItemsType& ScQueryEntry::GetQueryItems() const -{ - return maQueryItems; -} void ScQueryEntry::SetQueryByEmpty() { diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 26cb756b85d3..295d952af67e 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -394,10 +394,6 @@ ScDBQueryParamBase::~ScDBQueryParamBase() { } -ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const -{ - return meType; -} ScDBQueryParamInternal::ScDBQueryParamInternal() : ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL), diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 0e70b4f22ac3..56e21e41d035 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -14,7 +14,6 @@ namespace sc { RefHint::RefHint( Type eType ) : SfxSimpleHint(SC_HINT_REFERENCE), meType(eType) {} RefHint::~RefHint() {} -RefHint::Type RefHint::getType() const { return meType; } RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefHint(Moved), maRange(rRange), maMoveDelta(rMove) {} @@ -41,20 +40,8 @@ const sc::ColReorderMapType& RefColReorderHint::getColMap() const return mrColMap; } -SCTAB RefColReorderHint::getTab() const -{ - return mnTab; -} -SCROW RefColReorderHint::getStartRow() const -{ - return mnRow1; -} -SCROW RefColReorderHint::getEndRow() const -{ - return mnRow2; -} } diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8b3cc2581029..84e3c2a02470 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -206,7 +206,7 @@ public: void Clear(); void SetImmutable(bool bVal); - bool IsImmutable() const; + bool IsImmutable() const { return mbCloneIfConst;} void Resize(SCSIZE nC, SCSIZE nR); void Resize(SCSIZE nC, SCSIZE nR, double fVal); void SetErrorInterpreter( ScInterpreter* p); @@ -314,10 +314,6 @@ void ScMatrixImpl::SetImmutable(bool bVal) mbCloneIfConst = bVal; } -bool ScMatrixImpl::IsImmutable() const -{ - return mbCloneIfConst; -} void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR) { diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 4ac537f45155..92900583f69a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1675,15 +1675,7 @@ void ScTokenArray::GenHash() mnHashValue = nHash; } -size_t ScTokenArray::GetHash() const -{ - return mnHashValue; -} -ScFormulaVectorState ScTokenArray::GetVectorState() const -{ - return meVectorState; -} bool ScTokenArray::IsInvariant() const { diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index 31bca19b7aea..de23ddb7e7d4 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -128,10 +128,6 @@ void CompileFormulaContext::updateTabNames() } } -formula::FormulaGrammar::Grammar CompileFormulaContext::getGrammar() const -{ - return meGram; -} void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) { @@ -146,10 +142,6 @@ const std::vector<OUString>& CompileFormulaContext::getTabNames() const return maTabNames; } -ScDocument* CompileFormulaContext::getDoc() -{ - return mpDoc; -} } diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index ad0142beb02a..b13e49a4af6a 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -104,20 +104,12 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } -bool ScTypedStrData::IsDate() const -{ - return mbIsDate; -} const OUString& ScTypedStrData::GetString() const { return maStrValue; } -ScTypedStrData::StringType ScTypedStrData::GetStringType() const -{ - return meStrType; -} FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : maVal(rVal), mbCaseSens(bCaseSens) {} diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 8b8468395351..87f4c8d96d44 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -41,10 +41,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} -double ScUnitConverterData::GetValue() const -{ - return mfValue; -} const OUString& ScUnitConverterData::GetIndexString() const { diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 5a391a6ec792..4c5bdb98bab9 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -473,11 +473,6 @@ XclExpBiff8Encrypter::~XclExpBiff8Encrypter() { } -bool XclExpBiff8Encrypter::IsValid() const -{ - return mbValid; -} - void XclExpBiff8Encrypter::GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const { if ( sizeof( mpnSaltDigest ) == 16 ) diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 0c75adfd41b1..3cda3814c0aa 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -203,11 +203,6 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : InsertName(pTokArr); } -bool XclImpName::IsMacro() const -{ - return mbMacro; -} - void XclImpName::ConvertTokens() { if (!mpTokensData) diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index da208ffdd54a..a94e35dc26a6 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -346,7 +346,7 @@ public: /** Returns the source column index of the pivot field with the passed index, or -1. */ sal_Int32 getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const; - ScDPObject* getDPObject(); + ScDPObject* getDPObject() { return mpDPObject; } private: typedef RefVector< PivotTableField > PivotTableFieldVector; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 13a225b9a735..d5744f87f6de 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -201,7 +201,7 @@ public: explicit XclExpBiff8Encrypter( const XclExpRoot& rRoot ); ~XclExpBiff8Encrypter(); - bool IsValid() const; + bool IsValid() const { return mbValid; } void GetSaltDigest( sal_uInt8 pnSaltDigest[16] ) const; void GetSalt( sal_uInt8 pnSalt[16] ) const; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index e41630befffe..75a5936b9b22 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -55,7 +55,7 @@ public: inline const ScRangeData* GetScRangeData() const { return mpScData; } inline bool IsGlobal() const { return mnScTab == SCTAB_MAX; } inline bool IsVBName() const { return mbVBName; } - bool IsMacro() const; + bool IsMacro() const { return mbMacro; } void ConvertTokens(); private: diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 9bf341e4ab99..a1966560946b 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -1291,11 +1291,6 @@ sal_Int32 PivotTable::getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const return mpPivotCache ? mpPivotCache->getCacheDatabaseIndex( nFieldIdx ) : -1; } -ScDPObject* PivotTable::getDPObject() -{ - return mpDPObject; -} - // private -------------------------------------------------------------------- PivotTableField* PivotTable::getTableField( sal_Int32 nFieldIdx ) diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 19e5be3285d7..6d8da1aa6de6 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -75,7 +75,6 @@ ScCollection::~ScCollection() } -sal_uInt16 ScCollection::GetCount() const { return nCount; } bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 9f6258a207e7..45f1e093db8e 100644 --- a/sc/source/filter/starcalc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -48,7 +48,7 @@ public: bool Insert(ScDataObject* pScDataObject); ScDataObject* At(sal_uInt16 nIndex) const; - sal_uInt16 GetCount() const; + sal_uInt16 GetCount() const { return nCount; } ScDataObject* operator[]( const sal_uInt16 nIndex) const { return At(nIndex); } ScCollection& operator= ( const ScCollection& rCol ); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 8f394d2f7308..74ac1deefdbc 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -255,10 +255,6 @@ bool ScSheetSaveData::AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) cons return true; // success } -bool ScSheetSaveData::IsInSupportedSave() const -{ - return mbInSupportedSave; -} void ScSheetSaveData::SetInSupportedSave( bool bSet ) { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 91280264ff96..acc062027607 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1944,10 +1944,6 @@ void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) mpPostProcessData = p; } -sc::ImportPostProcessData* ScXMLImport::GetPostProcessData() -{ - return mpPostProcessData; -} sc::PivotTableSources& ScXMLImport::GetPivotTableSources() { diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 1f449827f951..8f28ea9c648d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1111,7 +1111,7 @@ public: const SvXMLTokenMap& GetDataStreamAttrTokenMap(); void SetPostProcessData( sc::ImportPostProcessData* p ); - sc::ImportPostProcessData* GetPostProcessData(); + sc::ImportPostProcessData* GetPostProcessData() { return mpPostProcessData;} sc::PivotTableSources& GetPivotTableSources(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index a881971f8856..040a2a1d0a72 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -89,7 +89,7 @@ public: ~ScNotesChildren(); void Init(const Rectangle& rVisRect, sal_Int32 nOffset); - sal_Int32 GetChildrenCount() const; + sal_Int32 GetChildrenCount() const { return mnParagraphs;} uno::Reference<XAccessible> GetChild(sal_Int32 nIndex) const; uno::Reference<XAccessible> GetAt(const awt::Point& rPoint) const; @@ -212,10 +212,6 @@ void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset) } } -sal_Int32 ScNotesChildren::GetChildrenCount() const -{ - return mnParagraphs; -} struct ScParaFound { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a05c3a501c23..947ae2f05757 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1723,10 +1723,6 @@ void ScTextWnd::UpdateAutoCorrFlag() } } -ScTabViewShell* ScTextWnd::GetViewShell() -{ - return mpViewShell; -} void ScTextWnd::StartEditEngine() { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index dc97b247a015..951b43fb0d1b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1472,10 +1472,6 @@ void ScModule::SetRefInputHdl( ScInputHandler* pNew ) pRefInputHandler = pNew; } -ScInputHandler* ScModule::GetRefInputHdl() -{ - return pRefInputHandler; -} void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 8462d1ae20d9..c011a673a13f 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -100,10 +100,6 @@ void ScInputStatusItem::SetMisspellRanges( const std::vector<editeng::MisspellRa mpMisspellRanges = pRanges; } -const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges() const -{ - return mpMisspellRanges; -} // ScPaintHint was moved to schints.cxx diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 1b05eff304be..c4c6be5810fb 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -476,10 +476,6 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, fireMenuHighlightedEvent(); } -size_t ScMenuFloatingWindow::getSelectedMenuItem() const -{ - return mnSelectedMenu; -} void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer) { @@ -741,10 +737,6 @@ void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rS rSize = Size(aWndSize.Width() - nLeftMargin*2, nH); } -ScMenuFloatingWindow* ScMenuFloatingWindow::getParentMenuWindow() const -{ - return mpParentMenu; -} size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const { @@ -850,10 +842,6 @@ void ScMenuFloatingWindow::terminateAllPopupMenus() mpParentMenu->terminateAllPopupMenus(); } -ScDocument* ScMenuFloatingWindow::getDoc() -{ - return mpDoc; -} ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index dfcbb4bc7971..0810ea2bbb41 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -124,10 +124,6 @@ void ScCondFrmtEntry::Deselect() SetHeight(); } -bool ScCondFrmtEntry::IsSelected() const -{ - return mbActive; -} IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 053fd9c8f04b..888d7e4c810a 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -146,10 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() return pList; } -bool ScCondFormatManagerDlg::CondFormatsChanged() -{ - return mbModified; -} IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) { diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 3b1f4263813d..5b9951c6769a 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -378,15 +378,7 @@ ScRange DataStream::GetRange() const return aRange; } -bool DataStream::IsRefreshOnEmptyLine() const -{ - return mbRefreshOnEmptyLine; -} -DataStream::MoveType DataStream::GetMove() const -{ - return meOrigMove; -} void DataStream::Decode(const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, MoveType eMove, const sal_uInt32 nSettings) diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index cbf967aaf74c..216599f8c43b 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -60,10 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } -bool ScDocShell::IsEmpty() const -{ - return bIsEmpty; -} void ScDocShell::SetEmpty(bool bSet) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index f297c53d45d1..22d295e68295 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -280,11 +280,6 @@ void ScDocShell::UnlockDocument_Impl(sal_uInt16 nNew) } } -sal_uInt16 ScDocShell::GetLockCount() const -{ - return nDocumentLock; -} - void ScDocShell::SetLockCount(sal_uInt16 nNew) { if (nNew) // setzen @@ -390,11 +385,6 @@ void ScDocShell::CalcOutputFactor() } } -double ScDocShell::GetOutputFactor() const -{ - return nPrtToScreenFactor; -} - void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index cce3e2fba694..a4d03f29b080 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -274,10 +274,6 @@ void ScExternalRefCache::Table::setReferenced( bool bReferenced ) meReferenced = (bReferenced ? REFERENCED_MARKED : UNREFERENCED); } -ScExternalRefCache::Table::ReferencedFlag ScExternalRefCache::Table::getReferencedFlag() const -{ - return meReferenced; -} bool ScExternalRefCache::Table::isReferenced() const { diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index b98a9028df91..d64c7015cd1b 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -65,14 +65,14 @@ public: void clearSelectedMenuItem(); ScMenuFloatingWindow* getSubMenuWindow(size_t nPos) const; bool isMenuItemSelected(size_t nPos) const; - size_t getSelectedMenuItem() const; + size_t getSelectedMenuItem() const { return mnSelectedMenu;} void setName(const OUString& rName); const OUString& getName() const; void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; - ScMenuFloatingWindow* getParentMenuWindow() const; + ScMenuFloatingWindow* getParentMenuWindow() const { return mpParentMenu;} protected: virtual void handlePopupEnd(); @@ -90,7 +90,7 @@ protected: void fillMenuItemsToAccessible(ScAccessibleFilterMenu* pAccMenu) const; - ScDocument* getDoc(); + ScDocument* getDoc() { return mpDoc;} protected: ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 1b54fa3e049e..aa38d0d0a7d4 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -69,7 +69,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - bool IsSelected() const; + bool IsSelected() const { return mbActive;} void SetIndex(sal_Int32 nIndex); sal_Int32 GetIndex() const { return mnIndex; } void SetHeight(); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 381eb65ffbe7..4531b9defc96 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -53,7 +53,7 @@ public: ScConditionalFormatList* GetConditionalFormatList(); - bool CondFormatsChanged(); + bool CondFormatsChanged() { return mbModified;} virtual bool IsInRefMode() const; diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 055460de23ac..d7320ecefe04 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -81,9 +81,9 @@ public: ScRange GetRange() const; const OUString& GetURL() const { return msURL; } const sal_Int32& GetLimit() const { return mnLimit; } - MoveType GetMove() const; + MoveType GetMove() const { return meOrigMove;} const sal_uInt32& GetSettings() const { return mnSettings; } - bool IsRefreshOnEmptyLine() const; + bool IsRefreshOnEmptyLine() const { return mbRefreshOnEmptyLine;} void Decode( const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 89706d2fd5b4..16d84bb09852 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -353,7 +353,7 @@ public: void LockPaint(); void UnlockPaint(); - sal_uInt16 GetLockCount() const; + sal_uInt16 GetLockCount() const { return nDocumentLock;} void SetLockCount(sal_uInt16 nNew); void LockDocument(); @@ -364,14 +364,14 @@ public: virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; void SetInplace( bool bInplace ); - bool IsEmpty() const; + bool IsEmpty() const { return bIsEmpty; } void SetEmpty(bool bSet); bool IsInUndo() const { return bIsInUndo; } void SetInUndo(bool bSet); void CalcOutputFactor(); - double GetOutputFactor() const; + double GetOutputFactor() const { return nPrtToScreenFactor;} void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, SCTAB nCurTab, bool& rbHeader, diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 2a5fd8b1f5c0..68d39e422676 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -107,7 +107,7 @@ protected: void ImplInitSettings(); void UpdateAutoCorrFlag(); - ScTabViewShell* GetViewShell(); + ScTabViewShell* GetViewShell() { return mpViewShell;} typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index e0f8addead60..9a59e93b5832 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -34,10 +34,10 @@ public: ScMoveTableDlg(Window* pParent, const OUString& rDefault); virtual ~ScMoveTableDlg(); - sal_uInt16 GetSelectedDocument () const; - SCTAB GetSelectedTable () const; - bool GetCopyTable () const; - bool GetRenameTable () const; + sal_uInt16 GetSelectedDocument () const { return nDocument; } + SCTAB GetSelectedTable () const { return nTable; } + bool GetCopyTable () const { return bCopyTable; } + bool GetRenameTable () const { return bRenameTable; } void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); void EnableCopyTable (bool bFlag=true); diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index e2147cd19f75..c83a234c9898 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -292,7 +292,7 @@ public: ScPrintHFParam GetHeader(){return aHdr;} ScPrintHFParam GetFooter(){return aFtr;} - bool HasPrintRange() const; + bool HasPrintRange() const { return mbHasPrintRange;} private: void Construct( const ScPrintOptions* pOptions ); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index dfb8e8be5568..d624759ba9f7 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -259,7 +259,7 @@ public: /** Returns the current tab bar width relative to the frame window width (0.0 ... 1.0). */ SC_DLLPUBLIC double GetRelTabBarWidth() const; /** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */ - double GetPendingRelTabBarWidth() const; + double GetPendingRelTabBarWidth() const { return mfPendingTabBarWidth;} void DoResize( const Point& rOffset, const Size& rSize, bool bInner = false ); void RepeatResize( bool bUpdateFix = true ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 9eeb6f825dfe..aa22c2ffabb9 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -252,7 +252,7 @@ public: bool IsRefInputMode() const; void ExecuteInputDirect(); - ScInputHandler* GetInputHandler() const; + ScInputHandler* GetInputHandler() const { return pInputHandler;} void UpdateInputHandler( bool bForce = false, bool bStopEditing = true ); void UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ); bool TabKeyInput(const KeyEvent& rKEvt); @@ -330,7 +330,7 @@ public: void SetFormShellAtTop( bool bSet ); - ObjectSelectionType GetCurObjectSelectionType(); + ObjectSelectionType GetCurObjectSelectionType() { return eCurOST; } virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; virtual void Initialize() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 249c0a0ce134..5ca8953e0ced 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -123,7 +123,7 @@ public: void SetPopupMenu(PopupMenu* pPopUp); - sal_uInt16 GetSelected() const; + sal_uInt16 GetSelected() const { return nSelected;} OString GetSelectedIdent() const; void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 88dae719cbd7..976d54b30f20 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -83,7 +83,7 @@ public: const EditTextObject* GetEditData() const { return pEditData; } void SetMisspellRanges( const std::vector<editeng::MisspellRanges>* pRanges ); - const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const; + const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const { return mpMisspellRanges;} }; diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index ecf5b609bf9f..9d57e0574323 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -70,13 +70,9 @@ ScMoveTableDlg::~ScMoveTableDlg() { } -sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } -SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; } -bool ScMoveTableDlg::GetCopyTable () const { return bCopyTable; } -bool ScMoveTableDlg::GetRenameTable () const { return bRenameTable; } void ScMoveTableDlg::GetTabNameString( OUString& rString ) const { diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index da277055e6f8..2c92ccc7bbe3 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -350,10 +350,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) pPopupMenu=pPopUp; } -sal_uInt16 ScExtIButton::GetSelected() const -{ - return nSelected; -} OString ScExtIButton::GetSelectedIdent() const { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index bdc61d7d7371..5545c03d1131 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -372,10 +372,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } -SfxBindings* AlignmentPropertyPanel::GetBindings() -{ - return mpBindings; -} void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 8552e25b8615..c67e17f047e5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -56,7 +56,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 0b244106622e..d6c091448a80 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -656,10 +656,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } -SfxBindings* CellAppearancePropertyPanel::GetBindings() -{ - return mpBindings; -} void CellAppearancePropertyPanel::SetStyleIcon() { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 028d067eb33f..4224e39f683b 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -65,7 +65,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 145beb9e0ee2..6fda69ac8b7d 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -316,10 +316,6 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( } } -SfxBindings* NumberFormatPropertyPanel::GetBindings() -{ - return mpBindings; -} }} // end of namespace ::sc::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 69f1cbc94270..4a0dc7ca7437 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -54,7 +54,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - SfxBindings* GetBindings(); + SfxBindings* GetBindings() { return mpBindings;} private: //ui controls diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 4792d86b4b78..3da876a99c3a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3016,10 +3016,6 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListener::getAllFileIds() -{ - return maFileIds; -} uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index e91cfe10b652..8021562df8a0 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -1187,10 +1187,6 @@ SvxFieldItem ScEditFieldObj::CreateFieldItem() return SvxFieldItem(*getData(), EE_FEATURE_FIELD); } -sal_Int32 ScEditFieldObj::GetFieldType() const -{ - return meType; -} void ScEditFieldObj::DeleteField() { diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 14bcecac00d4..6d4107401305 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -491,10 +491,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -bool ScNamedRangesObj::IsModifyAndBroadcast() const -{ - return mbModifyAndBroadcast; -} // sheet::XNamedRanges diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 6a1bbf184b07..9381ffeee91e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -155,7 +155,9 @@ public: const Size& GetTextSize() const { return aTextSize; } long GetOriginalWidth() const { return nOriginalWidth; } - sal_uLong GetResultValueFormat() const; + // Get the effective number format, including formula result types. + // This assumes that a formula cell has already been calculated. + sal_uLong GetResultValueFormat() const { return nValueFormat;} sal_uLong GetValueFormat() const { return nValueFormat; } bool GetLineBreak() const { return bLineBreak; } @@ -794,14 +796,6 @@ bool ScDrawStringsVars::HasEditCharacters() const return false; } -sal_uLong ScDrawStringsVars::GetResultValueFormat() const -{ - // Get the effective number format, including formula result types. - // This assumes that a formula cell has already been calculated. - - return nValueFormat; -} - double ScOutputData::GetStretch() { if ( mpRefDevice->IsMapMode() ) diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index f3cb9b60d2d1..9988884e7c5e 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -312,10 +312,6 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState ) rState.nDocPages = nDocPages; } -bool ScPrintFunc::HasPrintRange() const -{ - return mbHasPrintRange; -} bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 286f1c1fef12..caaee2278c04 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -858,10 +858,6 @@ double ScTabView::GetRelTabBarWidth() const return 0.0; } -double ScTabView::GetPendingRelTabBarWidth() const -{ - return mfPendingTabBarWidth; -} ScGridWindow* ScTabView::GetActiveWin() { diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 80b7e77347e5..14ed4aec4bb7 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1059,10 +1059,6 @@ IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) return 0; } -ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType() -{ - return eCurOST; -} // GetMySubShell / SetMySubShell: altes Verhalten simulieren, // dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 712520ff0360..122e24cac482 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -98,10 +98,6 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } -ScInputHandler* ScTabViewShell::GetInputHandler() const -{ - return pInputHandler; -} OUString ScTabViewShell::GetDescription() const { |