diff options
54 files changed, 40 insertions, 454 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 0c210f5661a2..9c930d199846 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -169,12 +169,6 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - const ScRange& GetRange() const { return aRange; } - void SetRange( const ScRange& rNew ) { aRange = rNew; } - - sal_uInt16 GetFlags() const { return nFlags; } - void SetFlags( sal_uInt16 nNew ) { nFlags = nNew; } - private: ScRange aRange; sal_uInt16 nFlags; @@ -306,10 +300,6 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; - double GetValue() const { return nValue; } - - void SetValue( const double nVal ) { nValue = nVal;} - private: double nValue; }; @@ -343,7 +333,6 @@ public: inline void SetHeight( sal_uInt16 nHeight ) { mnHeight = nHeight; } inline void Set( sal_uInt16 nWidth, sal_uInt16 nHeight ) { mnWidth = nWidth; mnHeight = nHeight; } - inline void SetInvalid() { mnWidth = mnHeight = 0; } virtual bool GetPresentation( SfxItemPresentation ePresentation, diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 938ef5e8dd56..658e44a5e479 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -207,7 +207,6 @@ public: const SvxLineItem& GetTLBR() const { return aTLBR; } const SvxLineItem& GetBLTR() const { return aBLTR; } const SvxBrushItem& GetBackground() const { return aBackground; } - const SvxAdjustItem& GetAdjust() const { return aAdjust; } const SfxInt32Item& GetRotateAngle() const { return aRotateAngle; } const SvxRotateModeItem& GetRotateMode() const { return aRotateMode; } @@ -329,9 +328,7 @@ public: const ScAutoFormatData* findByIndex(size_t nIndex) const; ScAutoFormatData* findByIndex(size_t nIndex); - const_iterator find(const ScAutoFormatData* pData) const; iterator find(const ScAutoFormatData* pData); - const_iterator find(const OUString& rName) const; iterator find(const OUString& rName); bool insert(ScAutoFormatData* pNew); diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index a11ebbd4e5d4..5dfdb8f46837 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -34,7 +34,6 @@ public: ScHint( sal_uLong n, const ScAddress& a ); const ScAddress& GetAddress() const { return aAddress; } ScAddress& GetAddress() { return aAddress; } - void SetAddress( const ScAddress& rAdr ) { aAddress = rAdr; } }; class ScAreaChangedHint : public SfxHint diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 8e1957295ea0..a24122c2b381 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -72,13 +72,11 @@ public: const OUString& GetModuleName() const; const OUString& GetInternalName() const { return aInternalName; } - const OUString& GetFuncName() const { return aFuncName; } - sal_uInt16 GetParamCount() const { return nParamCount; } - ParamType GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; } - ParamType GetReturnType() const { return eParamType[0]; } - ParamType GetAsyncType() const { return eAsyncType; } - bool Call(void** ppParam) const; - bool Unadvice(double nHandle); + sal_uInt16 GetParamCount() const { return nParamCount; } + ParamType GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; } + ParamType GetAsyncType() const { return eAsyncType; } + bool Call(void** ppParam) const; + bool Unadvice(double nHandle); /** name and description of parameter nParam. nParam==0 => Desc := function description, diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx index 3a2d3c8678d1..6d16928d63f0 100644 --- a/sc/inc/cellvalue.hxx +++ b/sc/inc/cellvalue.hxx @@ -48,7 +48,6 @@ struct SC_DLLPUBLIC ScCellValue void clear(); - void set( const ScRefCellValue& rCell ); void set( double fValue ); void set( const svl::SharedString& rStr ); void set( const EditTextObject& rEditText ); diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx index 53f3a4c39670..83f8f784f1bc 100644 --- a/sc/inc/cellvalues.hxx +++ b/sc/inc/cellvalues.hxx @@ -59,7 +59,6 @@ public: */ void transferFrom( ScColumn& rCol, SCROW nRow, size_t nLen ); - void transferTo( ScColumn& rCol, SCROW nRow ); void copyTo( ScColumn& rCol, SCROW nRow ) const; void swapNonEmpty( ScColumn& rCol ); diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 4dcda4091b2b..4cefe81aad3a 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -76,15 +76,11 @@ public: ~ScChartArray(); const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } - void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } - void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } void SetHeaders(bool bCol, bool bRow) { aPositioner.SetHeaders(bCol, bRow); } bool HasColHeaders() const { return aPositioner.HasColHeaders(); } bool HasRowHeaders() const { return aPositioner.HasRowHeaders(); } - bool IsValid() const { return bValid; } - void SetName(const OUString& rNew) { aName = rNew; } const OUString& GetName() const { return aName; } bool operator==(const ScChartArray& rCmp) const; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 667e5ea978fd..98d3850ffd2e 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -107,7 +107,6 @@ public: void UpdateChartIntersecting( const ScRange& rRange ); // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab) - void ScheduleSeriesRanges() { bSeriesRangesScheduled = true; } void UpdateScheduledSeriesRanges(); void UpdateSeriesRanges(); diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 44aa987d302a..08d3a6114915 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -52,8 +52,6 @@ class ScChartPositionMap ScChartPositionMap& operator=( const ScChartPositionMap& ) SAL_DELETED_FUNCTION; public: - - sal_uLong GetCount() const { return nCount; } SCCOL GetColCount() const { return nColCount; } SCROW GetRowCount() const { return nRowCount; } @@ -135,9 +133,6 @@ public: void SetHeaders(bool bCol, bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } bool HasColHeaders() const { return bColHeaders; } bool HasRowHeaders() const { return bRowHeaders; } - void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } - void SetStartCol(SCCOL nNew) { nStartCol = nNew; } - void SetStartRow(SCROW nNew) { nStartRow = nNew; } bool operator==(const ScChartPositioner& rCmp) const; diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 7f9eccfdbd6c..3f7bb8cb9055 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -161,19 +161,6 @@ public: } } - void Insert( ScChangeActionLinkEntry** ppPrevP ) - { - if ( !ppPrev ) - { - ppPrev = ppPrevP; - if ( (pNext = *ppPrevP) ) - pNext->ppPrev = &pNext; - *ppPrevP = this; - } - } - - const ScChangeActionLinkEntry* GetLink() const { return pLink; } - ScChangeActionLinkEntry* GetLink() { return pLink; } const ScChangeActionLinkEntry* GetNext() const { return pNext; } ScChangeActionLinkEntry* GetNext() { return pNext; } const ScChangeAction* GetAction() const { return pAction; } @@ -202,9 +189,6 @@ class ScChangeActionCellListEntry {} public: - const ScChangeActionCellListEntry* GetNext() const { return pNext; } // this is only for the XML Export public - const ScChangeActionContent* GetContent() const { return pContent; } // this is only for the XML Export public - DECL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry ) }; @@ -540,8 +524,6 @@ public: SCsROW GetDy() const { return nDy; } ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) - const ScChangeActionCellListEntry* GetFirstCellEntry() const - { return pFirstCell; } const ScChangeActionDelMoveEntry* GetFirstMoveEntry() const { return pLinkMove; } const ScChangeActionIns* GetCutOffInsert() const { return pCutOff; } @@ -615,9 +597,6 @@ public: const ScBigRange& aFromBigRange, ScChangeTrack* pTrack); // only to use in the XML import - const ScChangeActionCellListEntry* GetFirstCellEntry() const - { return pFirstCell; } // only to use in the XML export - const ScBigRange& GetFromRange() const { return aFromRange; } SC_DLLPUBLIC void GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const; @@ -954,7 +933,6 @@ class ScChangeTrack : public utl::ConfigurationListener void Init(); void DtorClear(); - void SetLoadSave( bool bVal ) { bLoadSave = bVal; } void SetInDeleteRange( const ScRange& rRange ) { aInDeleteRange = rRange; } void SetInDelete( bool bVal ) @@ -1202,14 +1180,13 @@ public: // ScChangeTrackMsgQueue void SetModifiedLink( const Link<>& r ) { aModifiedLink = r; ClearMsgQueue(); } - const Link<>& GetModifiedLink() const { return aModifiedLink; } ScChangeTrackMsgQueue& GetMsgQueue(); void NotifyModified( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction, sal_uLong nEndAction ); - sal_uLong AddLoadedGenerated( - const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ); // only to use in the XML import + sal_uLong AddLoadedGenerated( const ScCellValue& rNewCell, + const ScBigRange& aBigRange, const OUString& sNewValue ); // only to use in the XML import void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected void SetActionMax(sal_uLong nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 55440e8bd639..94c10c787ae1 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -108,7 +108,6 @@ public: bool IsValidComment(const OUString* pCommentStr) const; bool IsEveryoneButMe() const {return bEveryoneButMe;} - void SetEveryoneButMe(bool nFlag) {bEveryoneButMe=nFlag;} bool HasRange() const {return bIsRange;} void SetHasRange(bool nFlag) {bIsRange=nFlag;} diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 423d1fa8a442..668d3e55473d 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -219,10 +219,8 @@ public: ScColorFormat(ScDocument* pDoc); virtual ~ScColorFormat(); - void SetRange(const ScRangeList& rList); const ScRangeList& GetRange() const; - virtual void DataChanged(const ScRange& rRange) = 0; virtual void SetParent(ScConditionalFormat* pParent) SAL_OVERRIDE; virtual void startRendering() SAL_OVERRIDE; @@ -268,7 +266,6 @@ public: Color* GetColor(const ScAddress& rAddr) const; void AddEntry(ScColorScaleEntry* pEntry); - virtual void DataChanged(const ScRange& rRange) SAL_OVERRIDE; virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; @@ -309,7 +306,6 @@ public: const ScDataBarFormatData* GetDataBarData() const; ScDataBarFormatData* GetDataBarData(); - virtual void DataChanged(const ScRange& rRange) SAL_OVERRIDE; virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; @@ -368,7 +364,6 @@ public: const ScIconSetFormatData* GetIconSetData() const; ScIconSetFormatData* GetIconSetData(); - virtual void DataChanged(const ScRange& rRange) SAL_OVERRIDE; virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx index 741b85508a88..92c78c948467 100644 --- a/sc/inc/columnspanset.hxx +++ b/sc/inc/columnspanset.hxx @@ -105,8 +105,6 @@ public: void executeAction(Action& ac) const; void executeColumnAction(ScDocument& rDoc, ColumnAction& ac) const; void executeColumnAction(ScDocument& rDoc, ColumnAction& ac, double& fMem) const; - - void swap( ColumnSpanSet& r ); }; /** diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 2dfa2f7247b1..f6267a493aeb 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -175,7 +175,6 @@ public: void SetExternalSingleRef( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef ); void SetExternalDoubleRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef ); void SetExternalName( sal_uInt16 nFileId, const OUString& rName ); - void SetMatrix( ScMatrix* p ); void SetExternal(const sal_Unicode* pStr); /** If the token is a non-external reference, determine if the reference is @@ -186,13 +185,10 @@ public: bool IsValidReference() const; formula::FormulaToken* CreateToken() const; // create typified token - void Load( SvStream&, sal_uInt16 nVer ); static sal_Int32 GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array static size_t GetStrLenBytes( sal_Int32 nLen ) { return nLen * sizeof(sal_Unicode); } - static size_t GetStrLenBytes( const sal_Unicode* pStr ) - { return GetStrLenBytes( GetStrLen( pStr ) ); } }; class SC_DLLPUBLIC ScCompiler : public formula::FormulaCompiler @@ -445,7 +441,6 @@ public: */ ScTokenArray* CompileString( const OUString& rFormula ); ScTokenArray* CompileString( const OUString& rFormula, const OUString& rFormulaNmsp ); - const ScDocument* GetDoc() const { return pDoc; } const ScAddress& GetPos() const { return aPos; } void MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow ); diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 4a813c998844..a694f97e7ec8 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -398,8 +398,6 @@ public: // don't use the same name as for the const version ScRangeList& GetRangeList() { return maRanges; } - ScDocument* GetDocument() { return pDoc; } - bool IsEmpty() const; size_t size() const; diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index fdcf678c6a2b..a5d67656f5de 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -96,7 +96,6 @@ public: SC_DLLPUBLIC void GetArea(ScRange& rRange) const; void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - bool IsByRow() const { return bByRow; } void SetByRow(bool bByR) { bByRow = bByR; } bool HasHeader() const { return bHasHeader; } void SetHeader(bool bHasH) { bHasHeader = bHasH; } @@ -266,9 +265,6 @@ public: SCsCOL nDx, SCsROW nDy, SCsTAB nDz); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - sal_uInt16 GetEntryIndex() { return nEntryIndex; } - void SetEntryIndex(sal_uInt16 nInd) { nEntryIndex = nInd; } - void SetRefreshHandler( const Link<Timer *, void>& rLink ) { aRefreshHandler = rLink; } const Link<Timer *, void>& GetRefreshHandler() const { return aRefreshHandler; } diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 57b455bbda7d..7792b5a82373 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -84,8 +84,6 @@ class SC_DLLPUBLIC ScDetectiveFunc bool HasError( const ScRange& rRange, ScAddress& rErrPos ); - void FillAttributes( ScDetectiveData& rData ); - /// called from DrawEntry/DrawAlienEntry and InsertObject bool InsertArrow( SCCOL nCol, SCROW nRow, SCCOL nRefStartCol, SCROW nRefStartRow, diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 74f25b8f10d6..052f1d83b78f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -478,7 +478,6 @@ public: SfxObjectShell* pDocShell = NULL ); SC_DLLPUBLIC ~ScDocument(); - SC_DLLPUBLIC const OUString& GetName() const { return aDocName; } void SetName( const OUString& r ) { aDocName = r; } const OUString& GetCodeName() const { return aDocCodeName; } void SetCodeName( const OUString& r ) { aDocCodeName = r; } @@ -1133,16 +1132,6 @@ public: SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const; /** - * Return the cell position representing the bottom-right corner of the - * smallest range that includes all non-empty cells for specified sheet. - * - * @param nTab sheet index. - * - * @return address of the last data position. - */ - ScAddress GetLastDataPos( SCTAB nTab ) const; - - /** * Return the smallest area containing at least all contiguous cells * having data. This area is a square containing also empty cells. It may * shrink or extend the area given as input Flags as modifiers: @@ -1462,7 +1451,6 @@ public: SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ); void DeleteConditionalFormat( sal_uLong nIndex, SCTAB nTab ); - void ConditionalChanged( sal_uLong nKey, SCTAB nTab ); void SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab ); @@ -1723,9 +1711,7 @@ public: SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); - rtl_TextEncoding GetSrcCharSet() const { return eSrcSet; } sal_uLong GetSrcVersion() const { return nSrcVer; } - SCROW GetSrcMaxRow() const { return nSrcMaxRow; } void SetSrcCharSet( rtl_TextEncoding eNew ) { eSrcSet = eNew; } void UpdateFontCharSet(); @@ -1802,9 +1788,6 @@ public: bool IsDetectiveDirty() const { return bDetectiveDirty; } void SetDetectiveDirty(bool bSet) { bDetectiveDirty = bSet; } - sal_uInt8 GetMacroCallMode() const { return nMacroCallMode; } - void SetMacroCallMode(sal_uInt8 nNew) { nMacroCallMode = nNew; } - bool GetHasMacroFunc() const { return bHasMacroFunc; } void SetHasMacroFunc(bool bSet) { bHasMacroFunc = bSet; } @@ -1820,7 +1803,6 @@ public: void SetLoadingMedium( bool bVal ); void SetImportingXML( bool bVal ); bool IsImportingXML() const { return bImportingXML; } - void SetCalcingAfterLoad( bool bVal ) { bCalcingAfterLoad = bVal; } bool IsCalcingAfterLoad() const { return bCalcingAfterLoad; } void SetNoListening( bool bVal ) { bNoListening = bVal; } bool GetNoListening() const { return bNoListening; } @@ -1965,21 +1947,18 @@ public: void AppendToFormulaTrack( ScFormulaCell* pCell ); void RemoveFromFormulaTrack( ScFormulaCell* pCell ); void TrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED ); - sal_uInt16 GetFormulaTrackCount() const { return nFormulaTrackCount; } bool IsInFormulaTree( ScFormulaCell* pCell ) const; bool IsInFormulaTrack( ScFormulaCell* pCell ) const; bool GetHardRecalcState() { return bHardRecalcState; } void SetHardRecalcState( bool bVal ) { bHardRecalcState = bVal; } void StartAllListeners(); - void StartNeededListeners(); - void StartAllListeners( const ScRange& rRange ); - void EndAllListeners( const ScRange& rRange ); - const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } - bool HasForcedFormulas() const { return bHasForcedFormulas; } + void StartNeededListeners(); + void StartAllListeners( const ScRange& rRange ); + void SetForcedFormulas( bool bVal ) { bHasForcedFormulas = bVal; } - sal_uLong GetFormulaCodeInTree() const { return nFormulaCodeInTree; } + sal_uLong GetFormulaCodeInTree() const { return nFormulaCodeInTree; } bool IsInInterpreter() const { return nInterpretLevel != 0; } - sal_uInt16 GetInterpretLevel() { return nInterpretLevel; } + void IncInterpretLevel() { if ( nInterpretLevel < USHRT_MAX ) @@ -1990,8 +1969,7 @@ public: if ( nInterpretLevel ) nInterpretLevel--; } - bool IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } - sal_uInt16 GetMacroInterpretLevel() { return nMacroInterpretLevel; } + sal_uInt16 GetMacroInterpretLevel() { return nMacroInterpretLevel; } void IncMacroInterpretLevel() { if ( nMacroInterpretLevel < USHRT_MAX ) @@ -2003,7 +1981,6 @@ public: nMacroInterpretLevel--; } bool IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } - sal_uInt16 GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } void IncInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel < USHRT_MAX ) @@ -2088,8 +2065,6 @@ public: SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); - ScRefreshTimerControl* GetRefreshTimerControl() const - { return pRefreshTimerControl; } ScRefreshTimerControl * const & GetRefreshTimerControlAddress() const { return pRefreshTimerControl; } diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index 3c410643336d..f3bc3b24006a 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -112,7 +112,6 @@ public: long GetGroupCount() const; const ScDPSaveGroupItem& GetGroupByIndex( long nIndex ) const; - ScDPSaveGroupItem& GetGroupAccByIndex( long nIndex ); void Rename( const OUString& rNewName ); diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index c10a9bfda40e..e59b38a44a4c 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -147,8 +147,6 @@ public: void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup ); long GetDimensionIndex( const OUString& rName ); - ScDocument* GetDocument() { return pDoc; } - virtual long GetColumnCount() SAL_OVERRIDE; virtual long GetMembersCount( long nDim ) SAL_OVERRIDE; virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) SAL_OVERRIDE ; diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index e0085da3072b..8a923307fa38 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -306,21 +306,19 @@ public: void SetDataLayoutOrientation( sal_uInt16 nOrient ); void SetLateInit( bool bSet ); - long GetMeasureCount() const { return maMeasureFuncs.size(); } + long GetMeasureCount() const { return maMeasureFuncs.size(); } ScSubTotalFunc GetMeasureFunction(long nMeasure) const; - OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; - OUString GetMeasureDimensionName(long nMeasure) const; + OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; + OUString GetMeasureDimensionName(long nMeasure) const; const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; - sal_uInt16 GetMeasureRefOrient(long nMeasure) const; + sal_uInt16 GetMeasureRefOrient(long nMeasure) const; - bool IsDataAtCol() const { return bDataAtCol; } - bool IsDataAtRow() const { return bDataAtRow; } bool IsLateInit() const { return bLateInit; } long GetColStartMeasure() const; long GetRowStartMeasure() const; - long GetCountForMeasure( long nMeas ) const { return (nMeas == SC_DPMEASURE_ALL) ? maMeasureFuncs.size() : 1; } + long GetCountForMeasure( long nMeas ) const { return (nMeas == SC_DPMEASURE_ALL) ? maMeasureFuncs.size() : 1; } bool IsBaseForGroup( long nDim ) const; // any group long GetGroupBase( long nGroupDim ) const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 11f071b7d803..e2fb1b5f6b54 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -165,7 +165,6 @@ public: OUString GetDataDimName(long nIndex); const ScDPCache* GetCache(); const ScDPItemData* GetItemDataById( long nDim, long nId ); - long GetDataLayoutDim(){ return pData->GetColumnCount(); } SCROW GetMemberId( long nDim, const ScDPItemData& rData ); bool IsDataLayoutDimension(long nDim); sal_uInt16 GetDataLayoutOrientation(); @@ -714,15 +713,14 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - long getCount() const { return nMbrCount;} - ScDPMember* getByIndex(long nIndex) const; + long getCount() const { return nMbrCount;} + ScDPMember* getByIndex(long nIndex) const; long getMinMembers() const; sal_Int32 GetIndexFromName( const OUString& rName ) const; // <0 if not found - const std::vector<sal_Int32>& GetGlobalOrder(); - const ScDPItemData* GetSrcItemDataByIndex( SCROW nIndex); - SCROW GetSrcItemsCount(); + const ScDPItemData* GetSrcItemDataByIndex( SCROW nIndex); + SCROW GetSrcItemsCount(); }; class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper3< diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 66f4c9b03cc5..dbafa1b1166e 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -286,23 +286,22 @@ public: void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ); + void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ); void UpdateInsertTabAbs(SCTAB nTable); - bool UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); - void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo ); - void UpdateRenameTab(SCTAB nTable, const OUString& rName); + bool UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); + void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo ); bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; - bool IsSubTotal() const { return bSubTotal;} + bool IsSubTotal() const { return bSubTotal;} bool IsChanged() const { return bChanged;} - void SetChanged(bool b); + void SetChanged(bool b); bool IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result bool IsEmptyDisplayedAsString(); bool IsValue(); // also true if formula::svEmptyCell - bool IsValueNoError(); - bool IsValueNoError() const; + bool IsValueNoError(); + bool IsValueNoError() const; bool IsHybridValueCell(); // for cells after import to deal with inherited number formats double GetValue(); svl::SharedString GetString(); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index c7e250fedb77..7744d7b4fc5a 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -610,10 +610,8 @@ public: static void InitTextHeight(SfxItemPool* pPool); static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } static SvxBrushItem* GetButtonBrushItem(); - static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } SC_DLLPUBLIC static const OUString& GetEmptyOUString(); - static const OUString& GetScDocString(); /** Returns the specified image list with outline symbols. */ static ImageList* GetOutlineSymbols(); diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 15a0c4dcf9bf..cedbb00fb6c0 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -37,8 +37,6 @@ public: virtual ~ScPaintHint(); void SetPrintFlag(bool bSet) { bPrint = bSet; } - - const ScRange& GetRange() const { return aRange; } SCCOL GetStartCol() const { return aRange.aStart.Col(); } SCROW GetStartRow() const { return aRange.aStart.Row(); } SCTAB GetStartTab() const { return aRange.aStart.Tab(); } @@ -113,7 +111,6 @@ public: const OUString& GetDdeAppl() const { return aDdeAppl; } const OUString& GetDdeTopic() const { return aDdeTopic; } const OUString& GetDdeItem() const { return aDdeItem; } - sal_uInt8 GetDdeMode() const { return nDdeMode; } const ScAddress& GetDestPos() const { return aDestPos; } }; diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 6748ef00c7c9..8c566a463d7d 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -91,14 +91,6 @@ public: mfVal = fVal; } - void setString( const OUString * pStr ) - { - deleteString(); - mbAlloc = false; - mbString = true; - mpStr = pStr; - } - void setString( const OUString & rStr ) { deleteString(); diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index 340c4c18655f..e9bd5afef8e7 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -63,15 +63,11 @@ private: } public: - static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } static bool IsUserBreak() { return !bGlobalNoUserBreak; } static void CreateInterpretProgress( ScDocument* pDoc, bool bWait = true ); static ScProgress* GetInterpretProgress() { return pInterpretProgress; } static void DeleteInterpretProgress(); - static sal_uLong GetInterpretCount() { return nInterpretProgress; } - static sal_uLong GetGlobalRange() { return nGlobalRange; } - static sal_uLong GetGlobalPercent() { return nGlobalPercent; } ScProgress( SfxObjectShell* pObjSh, const OUString& rText, @@ -83,8 +79,6 @@ public: /// for DummyInterpret only, never use otherwise!!! ScProgress(); #endif - /// might be NULL! - SfxProgress* GetSfxProgress() const { return pProgress; } bool SetStateText( sal_uLong nVal, const OUString &rVal, sal_uLong nNewRange = 0 ) { diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 1190895f2277..53e244978f09 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -113,9 +113,6 @@ public: const ScTokenArray* GetCode() const { return pCode; } SC_DLLPUBLIC sal_uInt16 GetErrCode() const; bool HasReferences() const; - void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } - ScDocument* GetDocument() const { return pDoc; } - void SetType( RangeType nType ) { eType = nType; } void AddType( RangeType nType ) { eType = eType|nType; } RangeType GetType() const { return eType; } bool HasType( RangeType nType ) const; diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 952b8191997c..a0e0d9ce0362 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -42,11 +42,6 @@ public: ScDLL(); ~ScDLL(); - /// static-init/exit-code must be linked to the application - static void LibInit(); ///< called from SfxApplication-subclass::Init() - static void LibExit(); ///< called from SfxApplication-subclass::Exit() - static void PreExit(); // muss vor LibExit gerufen werden - /// DLL-init/exit-code must be linked to the DLL only static SC_DLLPUBLIC void Init(); ///< called directly after loading the DLL }; diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index f1fbe8e7bbac..3882390fbb67 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -232,7 +232,6 @@ public: void GetDimensions( SCSIZE& rC, SCSIZE& rR) const; SCSIZE GetElementCount() const; bool ValidColRow( SCSIZE nC, SCSIZE nR) const; - SCSIZE CalcOffset( SCSIZE nC, SCSIZE nR) const; /** For a row vector or column vector, if the position does not point into the vector but is a valid column or row offset it is adapted such that diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 2eb1f5dff769..482a6e625b4c 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -162,7 +162,6 @@ public: bool GetIsWaterCan() const { return bIsWaterCan; } void SetInEditCommand( bool bNew ) { bIsInEditCommand = bNew; } - bool IsInEditCommand() const { return bIsInEditCommand; } void SetInExecuteDrop( bool bNew ) { bIsInExecuteDrop = bNew; } bool IsInExecuteDrop() const { return bIsInExecuteDrop; } diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 8bbf7df98f13..183fde607ec0 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -357,22 +357,16 @@ public: svl::SharedString GetSharedString( SCCOL nCol, SCROW nRow ) const; void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); - void SetValues( SCCOL nCol, SCROW nRow, const std::vector<double>& rVals ); + void SetValues( SCCOL nCol, SCROW nRow, const std::vector<double>& rVals ); void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError); SCSIZE GetPatternCount( SCCOL nCol ) const; SCSIZE GetPatternCount( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const; bool ReservePatternCount( SCCOL nCol, SCSIZE nReserve ); - void SetRawString( SCCOL nCol, SCROW nRow, const svl::SharedString& rStr ); + void SetRawString( SCCOL nCol, SCROW nRow, const svl::SharedString& rStr ); void GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const; - double* GetValueCell( SCCOL nCol, SCROW nRow ); + double* GetValueCell( SCCOL nCol, SCROW nRow ); void GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const; - double GetValue( const ScAddress& rPos ) const - { - return ValidColRow(rPos.Col(),rPos.Row()) ? - aCol[rPos.Col()].GetValue( rPos.Row() ) : - 0.0; - } double GetValue( SCCOL nCol, SCROW nRow ) const; const EditTextObject* GetEditText( SCCOL nCol, SCROW nRow ) const; void RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); @@ -584,17 +578,12 @@ public: void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uInt16 nFormatNo ); void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); - void ScReplaceTabsStr( OUString& rStr, const OUString& rSrch, const OUString& rRepl ); // from sw bool SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); - void GetBorderLines( SCCOL nCol, SCROW nRow, - const ::editeng::SvxBorderLine** ppLeft, const ::editeng::SvxBorderLine** ppTop, - const ::editeng::SvxBorderLine** ppRight, const ::editeng::SvxBorderLine** ppBottom ) const; - bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const; bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const; bool IsMerged( SCCOL nCol, SCROW nRow ) const; diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 823bec4a3b3e..6d096cec35b2 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -58,7 +58,6 @@ public: const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh ); void SetInCreate(bool bSet) { bInCreate = bSet; } void SetAddUndo(bool bSet) { bAddUndo = bSet; } - void SetPaint(bool bSet) { bDoPaint = bSet; } const OUString& GetFileName() const { return aFileName; } const OUString& GetFilterName() const { return aFilterName; } diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index cfa4d3a07804..3223c066f081 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -386,7 +386,6 @@ public: ScDocShell* GetDocShell() const { return pDocShell; } const ScAddress& GetCellPos() const { return aCellPos; } - void SetDirty(bool bValue) { bDirty = bValue; } bool IsDirty() const { return bDirty; } void SetDoUpdate(bool bValue) { bDoUpdate = bValue; } }; diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 8ed86971beec..b4b81288f457 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -61,9 +61,6 @@ public: void ClearScTokenArray(); ScTokenArray* Clone() const; /// True copy! - // An estimate of the number of cells referenced by the token array - sal_Int32 GetWeight() const; - void GenHash(); size_t GetHash() const { return mnHashValue;} diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx index e03870c274e5..c44701dff99d 100644 --- a/sc/source/core/data/cellvalue.cxx +++ b/sc/source/core/data/cellvalue.cxx @@ -246,30 +246,6 @@ void ScCellValue::clear() mfValue = 0.0; } -void ScCellValue::set( const ScRefCellValue& rCell ) -{ - clear(); - - meType = rCell.meType; - switch (meType) - { - case CELLTYPE_VALUE: - mfValue = rCell.mfValue; - break; - case CELLTYPE_STRING: - mpString = new svl::SharedString(*rCell.mpString); - break; - case CELLTYPE_EDIT: - mpEditText = rCell.mpEditText->Clone(); - break; - case CELLTYPE_FORMULA: - mpFormula = rCell.mpFormula->Clone(); - break; - default: - ; - } -} - void ScCellValue::set( double fValue ) { clear(); diff --git a/sc/source/core/data/cellvalues.cxx b/sc/source/core/data/cellvalues.cxx index 725c5b9fe526..54ead9618f90 100644 --- a/sc/source/core/data/cellvalues.cxx +++ b/sc/source/core/data/cellvalues.cxx @@ -73,14 +73,7 @@ void CellValues::transferFrom( ScColumn& rCol, SCROW nRow, size_t nLen ) rCol.maCellTextAttrs.transfer(nRow, nRow+nLen-1, mpImpl->maCellTextAttrs, 0); } -void CellValues::transferTo( ScColumn& rCol, SCROW nRow ) -{ - assert(mpImpl->maCells.size() == mpImpl->maCellTextAttrs.size()); - size_t nLen = mpImpl->maCells.size(); - mpImpl->maCells.transfer(0, nLen-1, rCol.maCells, nRow); - mpImpl->maCellTextAttrs.transfer(0, nLen-1, rCol.maCellTextAttrs, nRow); -} void CellValues::copyTo( ScColumn& rCol, SCROW nRow ) const { diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 9be59b7333e8..165532cd7d97 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -637,15 +637,6 @@ bool ScColorScaleFormat::CheckEntriesForRel(const ScRange& rRange) const return bNeedUpdate; } -void ScColorScaleFormat::DataChanged(const ScRange& rRange) -{ - bool bNeedUpdate = CheckEntriesForRel(rRange); - if(bNeedUpdate) - { - mpDoc->RepaintRange(GetRange()); - } -} - condformat::ScFormatEntryType ScColorScaleFormat::GetType() const { return condformat::COLORSCALE; @@ -766,37 +757,6 @@ bool ScDataBarFormat::NeedsRepaint() const mpFormatData->mpLowerLimit->NeedsRepaint(); } -namespace { - -bool NeedUpdate(ScColorScaleEntry* pEntry) -{ - switch(pEntry->GetType()) - { - case COLORSCALE_MIN: - case COLORSCALE_MAX: - case COLORSCALE_FORMULA: - case COLORSCALE_AUTO: - return true; - default: - return false; - } -} - -} - -void ScDataBarFormat::DataChanged(const ScRange& rRange) -{ - bool bNeedUpdate = NeedUpdate(mpFormatData->mpUpperLimit.get()); - bNeedUpdate |= NeedUpdate(mpFormatData->mpLowerLimit.get()); - - bNeedUpdate &= GetRange().Intersects(rRange); - - if(bNeedUpdate) - { - mpDoc->RepaintRange(GetRange()); - } -} - double ScDataBarFormat::getMin(double nMin, double nMax) const { switch(mpFormatData->mpLowerLimit->GetType()) @@ -1097,10 +1057,6 @@ condformat::ScFormatEntryType ScIconSetFormat::GetType() const return condformat::ICONSET; } -void ScIconSetFormat::DataChanged( const ScRange& ) -{ -} - void ScIconSetFormat::UpdateReference( sc::RefUpdateContext& rCxt ) { for(iterator itr = begin(); itr != end(); ++itr) diff --git a/sc/source/core/data/columnspanset.cxx b/sc/source/core/data/columnspanset.cxx index e128a3d40ea4..8ef96d622ff6 100644 --- a/sc/source/core/data/columnspanset.cxx +++ b/sc/source/core/data/columnspanset.cxx @@ -270,12 +270,6 @@ void ColumnSpanSet::executeColumnAction(ScDocument& rDoc, ColumnAction& ac, doub } } -void ColumnSpanSet::swap( ColumnSpanSet& r ) -{ - maDoc.swap(r.maDoc); - std::swap(mbInit, r.mbInit); -} - namespace { class Scanner diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index c0f83ca17ef2..febf0df43f88 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1059,18 +1059,6 @@ SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW nL return pTab->GetLastDataRow(nCol1, nCol2, nLastRow); } -ScAddress ScDocument::GetLastDataPos( SCTAB nTab ) const -{ - const ScTable* pTab = FetchTable(nTab); - if (!pTab) - return ScAddress(ScAddress::INITIALIZE_INVALID); - - SCCOL nCol; - SCROW nRow; - pTab->GetLastDataPos(nCol, nRow); - return ScAddress(nCol, nRow, nTab); -} - // connected area void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index 977a0dba5be0..46825d25f5f9 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -429,20 +429,4 @@ void ScDocument::StartAllListeners( const ScRange& rRange ) } } -void ScDocument::EndAllListeners( const ScRange& rRange ) -{ - sc::EndListeningContext aEndCxt(*this); - - for (SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); ++nTab) - { - ScTable* pTab = FetchTable(nTab); - if (!pTab) - continue; - - pTab->EndListeningFormulaCells( - aEndCxt, - rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row()); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 629c1a544dd9..d98dc3f9cff8 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -212,10 +212,6 @@ const ScDPSaveGroupItem& ScDPSaveGroupDimension::GetGroupByIndex( long nIndex ) return aGroups[nIndex]; } -ScDPSaveGroupItem& ScDPSaveGroupDimension::GetGroupAccByIndex( long nIndex ) -{ - return aGroups[nIndex]; -} void ScDPSaveGroupDimension::RemoveFromGroups( const OUString& rItemName ) { diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index f4d28c9a7e76..e91b067020f5 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -72,8 +72,6 @@ public: inline void UpdateRange( const ScRange& rNewRange ) { aRange = rNewRange; } inline const ScRange& GetRange() const { return aRange; } - inline const ScAddress& GetStart() const { return aRange.aStart; } - inline const ScAddress& GetEnd() const { return aRange.aEnd; } inline void IncRef() { ++nRefCount; } inline sal_uLong DecRef() { return nRefCount ? --nRefCount : 0; } inline sal_uLong GetRef() { return nRefCount; } @@ -184,8 +182,6 @@ public: ScBroadcastAreaSlot( ScDocument* pDoc, ScBroadcastAreaSlotMachine* pBASM ); ~ScBroadcastAreaSlot(); - const ScBroadcastAreas& GetBroadcastAreas() const - { return aBroadcastAreaTbl; } /** Only here new ScBroadcastArea objects are created, prevention of dupes. @@ -331,7 +327,6 @@ public: /// @return: how many removed size_t RemoveBulkArea( const ScBroadcastArea* p ); - inline ScBroadcastArea* GetUpdateChain() const { return pUpdateChain; } inline void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; } inline ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; } inline void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; } @@ -366,14 +361,6 @@ public: if (pBASM) pBASM->LeaveBulkBroadcast(); } - void LeaveBulkBroadcast() - { - if (pBASM) - { - pBASM->LeaveBulkBroadcast(); - pBASM = NULL; - } - } }; #endif diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 14118da00d89..7367ea7489b9 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -368,7 +368,6 @@ void ScTableOp(); // repeated operations // common helper functions -void SetMaxIterationCount(sal_uInt16 n); inline void CurFmtToFuncFmt() { nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; } @@ -574,7 +573,6 @@ void ScExternal(); void ScMissing(); void ScMacro(); bool SetSbxVariable( SbxVariable* pVar, const ScAddress& ); -bool SetSbxVariable( SbxVariable* pVar, SCCOL nCol, SCROW nRow, SCTAB nTab ); sal_uInt16 GetErrorType(); void ScErrorType(); void ScErrorType_ODF(); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 522e95591418..004235860a69 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -934,17 +934,6 @@ ScAutoFormatData* ScAutoFormat::findByIndex(size_t nIndex) return it->second; } -ScAutoFormat::const_iterator ScAutoFormat::find(const ScAutoFormatData* pData) const -{ - MapType::const_iterator it = maData.begin(), itEnd = maData.end(); - for (; it != itEnd; ++it) - { - if (it->second == pData) - return it; - } - return itEnd; -} - ScAutoFormat::iterator ScAutoFormat::find(const ScAutoFormatData* pData) { MapType::iterator it = maData.begin(), itEnd = maData.end(); @@ -956,11 +945,6 @@ ScAutoFormat::iterator ScAutoFormat::find(const ScAutoFormatData* pData) return itEnd; } -ScAutoFormat::const_iterator ScAutoFormat::find(const OUString& rName) const -{ - return maData.find(rName); -} - ScAutoFormat::iterator ScAutoFormat::find(const OUString& rName) { return maData.find(rName); diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 4235ef772f22..c021dc24b609 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -667,8 +667,7 @@ class MatchByRange : public unary_function<ScRangeData, bool> const ScRange& mrRange; public: MatchByRange(const ScRange& rRange) : mrRange(rRange) {} - template < typename Pair > - bool operator() ( Pair const& r) const + bool operator() ( boost::ptr_container_detail::ref_pair<OUString, const ScRangeData* const> const& r) const { return r.second->IsRangeAtBlock(mrRange); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 95e951e3236d..e9a9afab6595 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1582,33 +1582,6 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo return bIs; } -sal_Int32 ScTokenArray::GetWeight() const -{ - sal_Int32 result(1); - - FormulaToken** p = pCode; - FormulaToken** pEnd = p + static_cast<size_t>(nLen); - for (; p != pEnd; ++p) - { - switch ((*p)->GetType()) - { - case svDoubleRef : - case svExternalDoubleRef: - { - const ScComplexRefData& rRef = *(*p)->GetDoubleRef(); - result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) * (rRef.Ref2.Col() - rRef.Ref1.Col() + 1) ); - } - break; - default: - break; - } - } - // Just print out the this pointer. It turns out to be quite complicated to get - // a symbolic printout of the ScTokenArray here. - SAL_INFO("sc.token", "GetWeight(" << this << "): " << result); - return result; -} - namespace { // we want to compare for similar not identical formulae diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 1630a5cc61df..ce1d3125e144 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -231,15 +231,12 @@ public: ScDocument& GetDocument() { return aDocument; } ScDocFunc& GetDocFunc() { return *pDocFunc; } - void SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; } SfxPrinter* GetPrinter( bool bCreateIfNotExist = true ); sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ); void UpdateFontList(); - OUString CreateObjectName( const OUString& rPrefix ); - ScDrawLayer* MakeDrawLayer(); void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); @@ -381,7 +378,6 @@ public: SfxBindings* GetViewBindings(); ScTabViewShell* GetBestViewShell( bool bOnlyVisible = true ); - ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; } void SetDocumentModifiedPending( bool bVal ) { bDocumentModifiedPending = bVal; } diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 80d8d6860cd0..74ea6cead460 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -44,7 +44,8 @@ namespace sf_misc class MiscUtils { public: - static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) + +static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) { css::uno::Sequence< OUString > result; try @@ -62,8 +63,8 @@ public: return result; } - static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::uno::XComponentContext >& xContext ) +static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, + const css::uno::Reference< css::uno::XComponentContext >& xContext ) { css::uno::Reference< css::lang::XMultiComponentFactory > xMCF( xContext->getServiceManager() ); @@ -102,7 +103,8 @@ public: OSL_FAIL( "Unable to obtain URL for document model!" ); return OUString(); } - static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& url ) + +static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& url ) { css::uno::Any result; @@ -128,7 +130,7 @@ public: } - static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, OUString& prop ) +static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, OUString& prop ) { css::uno::Any result; try @@ -141,18 +143,6 @@ public: return result; } -private: -static OUString parseLocationName( const OUString& location ) -{ - // strip out the last leaf of location name - // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - OUString temp = location; - INetURLObject aURLObj( temp ); - if ( !aURLObj.HasError() ) - temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - return temp; -} - }; } // namespace sf_misc #endif diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx deleted file mode 100644 index ea0e4371d916..000000000000 --- a/scripting/source/inc/util/scriptingconstants.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SCRIPTING_SOURCE_INC_UTIL_SCRIPTINGCONSTANTS_HXX -#define INCLUDED_SCRIPTING_SOURCE_INC_UTIL_SCRIPTINGCONSTANTS_HXX - -namespace scripting_constants -{ - -class ScriptingConstantsPool -{ -public: - const OUString DOC_REF; - const OUString DOC_STORAGE_ID; - const OUString DOC_URI; - const OUString RESOLVED_STORAGE_ID; - const OUString SCRIPT_INFO; - const OUString SCRIPTSTORAGEMANAGER_SERVICE; - const sal_Int32 SHARED_STORAGE_ID; - const sal_Int32 USER_STORAGE_ID; - const sal_Int32 DOC_STORAGE_ID_NOT_SET; - - static ScriptingConstantsPool& instance() - { - static ScriptingConstantsPool *pPool = 0; - if( ! pPool ) - { - ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); - if( ! pPool ) - { - static ScriptingConstantsPool pool; - pPool = &pool; - } - } - return *pPool; - } -private: - ScriptingConstantsPool( const ScriptingConstantsPool & ) SAL_DELETED_FUNCTION; - ScriptingConstantsPool& operator = ( const ScriptingConstantsPool & ) SAL_DELETED_FUNCTION; - ScriptingConstantsPool() - : DOC_REF( "SCRIPTING_DOC_REF" ), - DOC_STORAGE_ID( "SCRIPTING_DOC_STORAGE_ID" ), - DOC_URI( "SCRIPTING_DOC_URI" ), - RESOLVED_STORAGE_ID( "SCRIPTING_RESOLVED_STORAGE_ID" ), - SCRIPT_INFO( "SCRIPT_INFO" ), - SCRIPTSTORAGEMANAGER_SERVICE( - "/singletons/com.sun.star.script.framework.storage.theScriptStorageManager" ), - SHARED_STORAGE_ID( 0 ), USER_STORAGE_ID( 1 ), - DOC_STORAGE_ID_NOT_SET( -1 ) - {} -}; - -} -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 2df8ed325cdc..e3d3e71d6882 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -21,7 +21,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <util/scriptingconstants.hxx> #include <util/MiscUtils.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 5c8422e41a7b..d7321bbb8528 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp> -#include <util/scriptingconstants.hxx> #include <util/MiscUtils.hxx> #include "ActiveMSPList.hxx" diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 74523bbae442..47fa67939213 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -115,8 +115,6 @@ private: static OUString parseLocationName( const OUString& location ); void createPkgProvider(); bool isValid() { return m_bIsValid;} - OUString getURLForModel(); - const css::uno::Sequence< OUString >& getProviderNames(); ProviderCache* providerCache(); /* to obtain other services if needed */ diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index d02550e3ea87..6a133e15de6b 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -21,8 +21,6 @@ #include <cppuhelper/factory.hxx> #include <tools/diagnose_ex.h> -#include <util/scriptingconstants.hxx> - #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include "ProviderCache.hxx" |