diff options
author | Noel Grandin <noel@peralex.com> | 2016-01-14 16:32:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-15 09:36:42 +0200 |
commit | 098462c6f69c40422c74cef8f052b7b1ff0c90e8 (patch) | |
tree | b8d3e6f848b18753c9fbd91468b8094b029af742 /sc/inc | |
parent | f19e32b101d56ceb7215a6a9d45d39a2cd264189 (diff) |
loplugin:unusedmethods unused return value in sc
Change-Id: I3ccc98d2e042120093e2e8508518681588692393
Diffstat (limited to 'sc/inc')
38 files changed, 54 insertions, 122 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 8ac565c2ac65..3aa0ba1f1157 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -426,14 +426,6 @@ struct ScAddressHashFunctor } }; -struct ScAddressEqualFunctor -{ - bool operator()( const ScAddress & rAdr1, const ScAddress & rAdr2 ) const - { - return rAdr1 == rAdr2; - } -}; - inline bool ValidAddress( const ScAddress& rAddress ) { return ValidCol(rAddress.Col()) && ValidRow(rAddress.Row()) && ValidTab(rAddress.Tab()); @@ -506,7 +498,7 @@ public: const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); SC_DLLPUBLIC sal_uInt16 ParseCols( const OUString&, ScDocument* = nullptr, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); - SC_DLLPUBLIC sal_uInt16 ParseRows( const OUString&, ScDocument* = nullptr, + SC_DLLPUBLIC void ParseRows( const OUString&, ScDocument* = nullptr, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); /** Parse an Excel style reference up to and including the sheet name @@ -682,22 +674,6 @@ inline size_t ScRange::hashStartColumn() const static_cast<size_t>(aEnd.Row()); } -struct ScRangeHashAreaFunctor -{ - size_t operator()( const ScRange & rRange ) const - { - return rRange.hashArea(); - } -}; - -struct ScRangeEqualFunctor -{ - bool operator()( const ScRange & rRange1, const ScRange & rRange2 ) const - { - return rRange1 == rRange2; - } -}; - inline bool ValidRange( const ScRange& rRange ) { return ValidAddress(rRange.aStart) && ValidAddress(rRange.aEnd); diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 6dd84817b134..bf6a916ee304 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -125,7 +125,7 @@ public: void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray = nullptr ); - bool SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize); + void SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize); void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ); @@ -154,11 +154,11 @@ public: bool Search( SCROW nRow, SCSIZE& nIndex ) const; bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const; - bool IsMerged( SCROW nRow ) const; + bool IsMerged( SCROW nRow ) const; bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, bool bRefresh ); - bool RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); + void RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 0b403d663989..070f1f04a7de 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -126,13 +126,13 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; bool GetProtection() const { return bProtection; } - bool SetProtection( bool bProtect); + void SetProtection( bool bProtect); bool GetHideFormula() const { return bHideFormula; } - bool SetHideFormula( bool bHFormula); + void SetHideFormula( bool bHFormula); bool GetHideCell() const { return bHideCell; } - bool SetHideCell( bool bHCell); + void SetHideCell( bool bHCell); bool GetHidePrint() const { return bHidePrint; } - bool SetHidePrint( bool bHPrint); + void SetHidePrint( bool bHPrint); inline ScProtectionAttr& operator=(const ScProtectionAttr& rProtection) { bProtection = rProtection.bProtection; diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 9a03d91c213c..11d4295bb556 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -327,7 +327,7 @@ public: ScAutoFormat(); ScAutoFormat(const ScAutoFormat& r); ~ScAutoFormat(); - bool Load(); + void Load(); bool Save(); void SetSaveLater( bool bSet ); diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 584c1d17634b..409c95db46c1 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -76,13 +76,13 @@ public: 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); + void Call(void** ppParam) const; + void Unadvice(double nHandle); /** name and description of parameter nParam. nParam==0 => Desc := function description, Name := n/a */ - bool getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const; + void getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const; }; class LegacyFuncCollection diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 0cd54ede3892..0e2c255b4312 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -104,8 +104,6 @@ public: bool empty() const; ScChartArray* operator[](size_t nIndex); const ScChartArray* operator[](size_t nIndex) const; - - bool operator==(const ScChartCollection& rCmp) const; }; #endif diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 8671f182e5e8..fcbc1339f3bd 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -193,7 +193,6 @@ public: void UpdateChartsContainingTab( SCTAB nTab ); bool operator==( const ScChartListenerCollection& r ) const; - bool operator!=( const ScChartListenerCollection& r ) const; /** * Start listening on hide/show change within specified cell range. A diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 2cdc14b2d1c2..a7b85b9ac3df 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -256,14 +256,12 @@ protected: ScBigRange& GetBigRange() { return aBigRange; } - ScChangeActionLinkEntry* AddLink( - ScChangeAction* p, ScChangeActionLinkEntry* pL ) + void AddLink( ScChangeAction* p, ScChangeActionLinkEntry* pL ) { ScChangeActionLinkEntry* pLnk = new ScChangeActionLinkEntry( &pLinkAny, p ); pLnk->SetLink( pL ); - return pLnk; } void RemoveAllAnyLinks(); diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 5c0615cd8ad5..0aaaeaf641fd 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -266,7 +266,7 @@ public: void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn& rDestCol ); bool InitBlockPosition( sc::ColumnBlockPosition& rBlockPos ); - bool InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const; + void InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const; void DeleteBeforeCopyFromClip( sc::CopyFromClipContext& rCxt, const ScColumn& rClipCol, sc::ColumnSpanSet& rBroadcastSpans ); @@ -331,7 +331,7 @@ public: ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, sc::StartListeningType eListenType = sc::SingleCellListening ); - ScFormulaCell* SetFormulaCell( + void SetFormulaCell( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, ScFormulaCell* pCell, sc::StartListeningType eListenType = sc::SingleCellListening ); diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index d33ecc6fd8aa..5114bd2d2c91 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -362,8 +362,6 @@ public: virtual void SetParent( ScConditionalFormat* ) override {} - bool operator==( const ScFormatEntry& ) const; - virtual void startRendering() override; virtual void endRendering() override; @@ -433,8 +431,6 @@ public: bool MarkUsedExternalReferences() const; // sorted (via std::set) by Index - // operator== only for sorting - bool operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } bool operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } void startRendering(); @@ -484,8 +480,6 @@ public: void SourceChanged( const ScAddress& rAddr ); - bool operator==( const ScConditionalFormatList& r ) const; // for Ref-Undo - typedef ConditionalFormatContainer::iterator iterator; typedef ConditionalFormatContainer::const_iterator const_iterator; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 466503fbfd7a..0ea046cafec5 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -36,7 +36,6 @@ public: ScDefaultsOptions& operator= ( const ScDefaultsOptions& rCpy ); bool operator== ( const ScDefaultsOptions& rOpt ) const; - bool operator!= ( const ScDefaultsOptions& rOpt ) const; }; diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 271b936bba0e..665acbd635c9 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -51,9 +51,6 @@ public: // for UpdateRef: void SetPos(const ScAddress& rNew) { aPos=rNew; } - - bool operator== ( const ScDetOpData& r ) const - { return eOperation == r.eOperation && aPos == r.aPos; } }; // list of operators diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 7792b5a82373..14fb1b19f779 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -116,7 +116,7 @@ class SC_DLLPUBLIC ScDetectiveFunc sal_uInt16 FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nLevel, sal_uInt16 nDeleteLevel ); - bool FindFrameForObject( SdrObject* pObject, ScRange& rRange ); + void FindFrameForObject( SdrObject* pObject, ScRange& rRange ); void Modified(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 37a71a7d172b..f334e3fdab53 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -989,17 +989,17 @@ public: bool IsMerged( const ScAddress& rPos ) const; - bool ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, + void ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark, bool bRefresh = false ); SC_DLLPUBLIC bool ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, bool bRefresh = false ); bool ExtendMerge( ScRange& rRange, bool bRefresh = false ); - bool ExtendTotalMerge( ScRange& rRange ) const; - SC_DLLPUBLIC bool ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, + void ExtendTotalMerge( ScRange& rRange ) const; + SC_DLLPUBLIC void ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const; - SC_DLLPUBLIC bool ExtendOverlapped( ScRange& rRange ) const; + SC_DLLPUBLIC void ExtendOverlapped( ScRange& rRange ) const; bool RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); @@ -1653,7 +1653,7 @@ public: // returns whether to export a Default style for this col or not // nDefault is setted to one position in the current row where the Default style is - bool GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); + void GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); bool UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bShow ); bool UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bShow ); @@ -1746,17 +1746,17 @@ public: * data range to use to populate the filter entries is inferred from the * database range that contains the specified cell position. */ - bool GetFilterEntries( + void GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates); - SC_DLLPUBLIC bool GetFilterEntriesArea( + SC_DLLPUBLIC void GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool& rHasDates); - bool GetDataEntries( + void GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool bLimit = false ); - bool GetFormulaEntries( ScTypedCaseStrSet& rStrings ); + void GetFormulaEntries( ScTypedCaseStrSet& rStrings ); bool HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); @@ -1773,7 +1773,7 @@ public: bool GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, bool bInSel, const ScMarkData& rMark) const; - bool ReplaceStyle(const SvxSearchItem& rSearchItem, + void ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, SCTAB nTab, ScMarkData& rMark, bool bIsUndo); @@ -2215,7 +2215,7 @@ private: SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol ) const; SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const; - bool ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve ); + void ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve ); void SharePooledResources( ScDocument* pSrcDoc ); diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index d500214acf01..a724cbe29dc5 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -57,7 +57,7 @@ public: bool updateDdeLinks( vcl::Window* pWin ); - bool updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ); + void updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ); size_t getDdeLinkCount() const; diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 2329f76a2f78..0926ba25c317 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -156,7 +156,7 @@ public: const IndexArrayType* GetFieldIndexArray( size_t nDim ) const; const ScDPItemDataVec& GetDimMemberValues( SCCOL nDim ) const; - bool InitFromDoc(ScDocument* pDoc, const ScRange& rRange); + void InitFromDoc(ScDocument* pDoc, const ScRange& rRange); bool InitFromDataBase(DBConnector& rDB); /** diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx index 1b586060627d..224421058fa0 100644 --- a/sc/inc/dpitemdata.hxx +++ b/sc/inc/dpitemdata.hxx @@ -42,11 +42,6 @@ public: sal_Int32 mnValue; }; - struct Hash - { - size_t operator() (const ScDPItemData& rVal) const; - }; - private: union { @@ -83,7 +78,6 @@ public: // exact equality bool operator==(const ScDPItemData& r) const; - bool operator!=(const ScDPItemData& r) const; bool operator< (const ScDPItemData& r) const; ScDPItemData& operator= (const ScDPItemData& r); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 610cf8e89a70..a2fd066349bf 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -193,12 +193,12 @@ public: void ToggleDetails(const css::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - bool FillOldParam(ScPivotParam& rParam) const; - bool FillLabelData(sal_Int32 nDim, ScDPLabelData& Labels); - bool FillLabelData(ScPivotParam& rParam); + void FillOldParam(ScPivotParam& rParam) const; + void FillLabelData(sal_Int32 nDim, ScDPLabelData& Labels); + void FillLabelData(ScPivotParam& rParam); bool GetHierarchiesNA( sal_Int32 nDim, css::uno::Reference< css::container::XNameAccess >& xHiers ); - bool GetHierarchies( sal_Int32 nDim, css::uno::Sequence< OUString >& rHiers ); + void GetHierarchies( sal_Int32 nDim, css::uno::Sequence< OUString >& rHiers ); sal_Int32 GetUsedHierarchy( sal_Int32 nDim ); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index a80a56ae69f5..14f2a2b83faa 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -513,11 +513,10 @@ public: /** * Mark all tables as referenced that are used by any LinkListener, used * only during store-to-file. - * @returns <TRUE/> if ALL tables of ALL external documents are marked. */ - bool markUsedByLinkListeners(); + void markUsedByLinkListeners(); - bool markUsedExternalRefCells(); + void markUsedExternalRefCells(); /** * Set a table as referenced, used only during store-to-file. diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 9de700bf76e0..d7fc6b6f8445 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -103,13 +103,13 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { // various export filters virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) = 0; - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, + virtual void ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0; - virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, + virtual void ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) = 0; - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) = 0; + virtual void ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) = 0; virtual ScOrcusFilters* GetOrcusFilters() = 0; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 5424cb48252f..b98be9677039 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -273,7 +273,7 @@ public: void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ); void UpdateInsertTabAbs(SCTAB nTable); - bool UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); + void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo ); bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 2e18cced06ec..7ee6d596e30b 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -73,7 +73,6 @@ struct FormulaGroupContext : boost::noncopyable ColKey( SCTAB nTab, SCCOL nCol ); bool operator== ( const ColKey& r ) const; - bool operator!= ( const ColKey& r ) const; }; struct ColArray diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index deb2d2d8b0ab..17e752e5fbbb 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -51,9 +51,9 @@ public: css::uno::Sequence< css::uno::Any> GetProperties(const css::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } - bool PutProperties( const css::uno::Sequence< OUString >& rNames, + void PutProperties( const css::uno::Sequence< OUString >& rNames, const css::uno::Sequence< css::uno::Any>& rValues) - { return ConfigItem::PutProperties( rNames, rValues ); } + { ConfigItem::PutProperties( rNames, rValues ); } using ConfigItem::EnableNotification; using ConfigItem::GetNodeNames; diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index 2df40a6f6fb5..58e6fcb18361 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -52,9 +52,9 @@ class ScOrcusXMLContext public: virtual ~ScOrcusXMLContext() {} - virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) = 0; + virtual void loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) = 0; - virtual bool importXML(const ScOrcusImportXMLParam& rParam) = 0; + virtual void importXML(const ScOrcusImportXMLParam& rParam) = 0; }; #endif diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index 881dc4d3859d..23ba00169d7d 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -51,7 +51,6 @@ struct ScPageTableParam ScPageTableParam(); ~ScPageTableParam(); - bool operator== ( const ScPageTableParam& r ) const; void Reset (); }; @@ -67,7 +66,6 @@ struct ScPageAreaParam ScPageAreaParam(); ~ScPageAreaParam(); - bool operator== ( const ScPageAreaParam& r ) const; void Reset (); }; diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 4080e76fab2b..fb07b5a9d7ae 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -163,8 +163,6 @@ public: return *this; } - operator FontToSubsFontConverter() const - { return h; } }; #endif diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 073fab2f9e4d..a3583a7ac4b0 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -151,7 +151,6 @@ struct ScPivotParam ~ScPivotParam(); ScPivotParam& operator= ( const ScPivotParam& r ); - bool operator== ( const ScPivotParam& r ) const; void SetLabelData(const ScDPLabelDataVector& r); }; @@ -166,8 +165,6 @@ struct ScPivotFuncData explicit ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ); - bool operator== (const ScPivotFuncData& r) const; - #if DEBUG_PIVOT_TABLE void Dump() const; #endif diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 7c363a8cd209..baf68850a66d 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -47,7 +47,6 @@ public: const ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); bool operator== ( const ScPrintOptions& rOpt ) const; - bool operator!= ( const ScPrintOptions& rOpt ) const; }; // item for the dialog / options page diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index 4b6acb861e44..113467697c1b 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -124,13 +124,12 @@ public: return SetState( nVal ); return true; } - bool SetStateCountDownOnPercent( sal_uLong nVal ) + void SetStateCountDownOnPercent( sal_uLong nVal ) { /// only if percentage increased if ( nGlobalRange && ((nGlobalRange - nVal) * 100 / nGlobalRange) > nGlobalPercent ) - return SetStateCountDown( nVal ); - return true; + SetStateCountDown( nVal ); } sal_uLong GetState() { diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 9eae5b95e80f..7d19174cbe43 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -115,16 +115,15 @@ public: maPairs.push_back( pR ); } void Join( const ScRangePair&, bool bIsInList = false ); - bool UpdateReference( UpdateRefMode, ScDocument*, + void UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void DeleteOnTab( SCTAB nTab ); ScRangePair* Find( const ScAddress& ) const; ScRangePair* Find( const ScRange& ) const; ScRangePair** CreateNameSortedArray( size_t& nCount, ScDocument* ) const; - bool operator==( const ScRangePairList& ) const; - ScRangePair* Remove(size_t nPos); + void Remove(size_t nPos); ScRangePair* Remove(ScRangePair* pAdr); size_t size() const; diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 4db3e39d320a..f6afd6b292b0 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -164,8 +164,6 @@ inline bool ScRangeData::HasType( RangeType nType ) const extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* ); -bool operator< (const ScRangeData& left, const ScRangeData& right); - class ScRangeName { private: diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index fb129017b5a8..4b6ca43c82ff 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -256,7 +256,6 @@ public: ScArea& operator= ( const ScArea& r ); bool operator== ( const ScArea& r ) const; - bool operator!= ( const ScArea& r ) const { return !( operator==(r) ); } public: SCTAB nTab; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 285a3feee9de..69ee32e81c92 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -251,8 +251,8 @@ public: void SetInSharedDocSaving( bool bNew ) { mbIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return mbIsInSharedDocSaving; } - SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC void RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC void UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); }; diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx index 00f5673337ba..fcc873f3294a 100644 --- a/sc/inc/spellcheckcontext.hxx +++ b/sc/inc/spellcheckcontext.hxx @@ -36,7 +36,6 @@ struct SpellCheckContext bool isValid() const; void reset(); - bool operator< (const CellPos& r) const; bool operator== (const CellPos& r) const; }; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 0efff488773c..d2672fe3ff36 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -801,7 +801,7 @@ public: bool HasHiddenRows(SCROW nStartRow, SCROW nEndRow) const; bool ColHidden(SCCOL nCol, SCCOL* pFirstCol = nullptr, SCCOL* pLastCol = nullptr) const; bool SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden); - bool SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden); + void SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden); void CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol); void CopyRowHidden(ScTable& rTable, SCROW nStartRow, SCROW nEndRow); void CopyRowHeight(ScTable& rSrcTable, SCROW nStartRow, SCROW nEndRow, SCROW nSrcOffset); @@ -1071,7 +1071,7 @@ private: bool GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel, const ScMarkData& rMark) const; bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ) const; - bool TestTabRefAbs(SCTAB nTable) const; + void TestTabRefAbs(SCTAB nTable) const; void CompileDBFormula( sc::CompileFormulaContext& rCxt ); void CompileColRowNameFormula( sc::CompileFormulaContext& rCxt ); diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 1644264fdc0f..26d6ca48b0bf 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -98,7 +98,7 @@ public: formula::FormulaToken* AddRangeName( sal_uInt16 n, bool bGlobal ); formula::FormulaToken* AddDBRange( sal_uInt16 n ); formula::FormulaToken* AddExternalName( sal_uInt16 nFileId, const OUString& rName ); - formula::FormulaToken* AddExternalSingleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef ); + void AddExternalSingleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef ); formula::FormulaToken* AddExternalDoubleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef ); formula::FormulaToken* AddMatrix( const ScMatrixRef& p ); /** ScSingleRefOpToken with ocColRowName. */ @@ -106,10 +106,8 @@ public: virtual formula::FormulaToken* MergeArray( ) override; /** Merge very last SingleRef+ocRange+SingleRef combination into DoubleRef - and adjust pCode array, or do nothing if conditions not met. - Unconditionally returns last token from the resulting pCode array, or - NULL if there is no pCode (which actually would be caller's fault). */ - formula::FormulaToken* MergeRangeReference( const ScAddress & rPos ); + and adjust pCode array, or do nothing if conditions not met. */ + void MergeRangeReference( const ScAddress & rPos ); /// Assign XML string placeholder to the array void AssignXMLString( const OUString &rText, const OUString &rFormulaNmsp ); diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 523c8e7bc3d6..22173f7377c3 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -57,7 +57,6 @@ public: bool operator() (const ScTypedStrData& left, const ScTypedStrData& right) const; }; - bool operator== (const ScTypedStrData& r) const; bool operator< (const ScTypedStrData& r) const; private: diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index f27bf34bb862..34f42bc0cd14 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -143,8 +143,6 @@ public: bool EqualEntries( const ScValidationData& r ) const; // for undo // sort (using std::set) by index - // operator== only for sorting - bool operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } bool operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } private: @@ -205,8 +203,6 @@ public: void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ); - bool operator==( const ScValidationDataList& r ) const; // for ref-undo - void clear(); }; |