[Libreoffice-commits] core.git: 7 commits - include/xmloff l10ntools/inc l10ntools/source lingucomponent/source linguistic/source lotuswordpro/source oox/inc oox/source package/inc package/source reportdesign/source rsc/inc rsc/source salhelper/source sc/inc sc/source xmloff/source
Noel Grandin
noel at peralex.com
Thu Jan 14 23:37:18 PST 2016
include/xmloff/GradientStyle.hxx | 4 -
include/xmloff/HatchStyle.hxx | 4 -
include/xmloff/ImageStyle.hxx | 2
include/xmloff/MarkerStyle.hxx | 2
include/xmloff/ProgressBarHelper.hxx | 2
include/xmloff/XMLEventsImportContext.hxx | 2
include/xmloff/i18nmap.hxx | 6 --
include/xmloff/nmspmap.hxx | 2
include/xmloff/prstylei.hxx | 4 -
include/xmloff/xmlexp.hxx | 2
include/xmloff/xmlnume.hxx | 2
l10ntools/inc/cfgmerge.hxx | 2
l10ntools/inc/export.hxx | 7 +--
l10ntools/inc/xrmmerge.hxx | 2
l10ntools/source/cfgmerge.cxx | 35 ++++++++++-------
l10ntools/source/export.cxx | 21 +++-------
l10ntools/source/merge.cxx | 7 ---
l10ntools/source/xrmmerge.cxx | 3 -
lingucomponent/source/languageguessing/guess.cxx | 11 -----
lingucomponent/source/languageguessing/guess.hxx | 2
linguistic/source/lngsvcmgr.cxx | 5 --
lotuswordpro/source/filter/bencont.cxx | 16 ++-----
lotuswordpro/source/filter/bento.hxx | 6 +-
lotuswordpro/source/filter/benval.cxx | 11 ++---
lotuswordpro/source/filter/lwpfilehdr.cxx | 12 -----
lotuswordpro/source/filter/lwpfilehdr.hxx | 2
lotuswordpro/source/filter/lwpfoundry.cxx | 3 -
lotuswordpro/source/filter/lwpfoundry.hxx | 2
lotuswordpro/source/filter/lwpfribsection.cxx | 7 +--
lotuswordpro/source/filter/lwpfribsection.hxx | 2
lotuswordpro/source/filter/lwpobjid.cxx | 13 ++----
lotuswordpro/source/filter/lwpobjid.hxx | 4 -
lotuswordpro/source/filter/lwpobjstrm.cxx | 4 -
lotuswordpro/source/filter/lwpobjstrm.hxx | 2
lotuswordpro/source/filter/lwppara.cxx | 5 --
lotuswordpro/source/filter/lwppara.hxx | 2
lotuswordpro/source/filter/lwpsvstream.cxx | 4 -
lotuswordpro/source/filter/lwpsvstream.hxx | 2
lotuswordpro/source/filter/lwptblformula.cxx | 28 ++-----------
lotuswordpro/source/filter/lwptblformula.hxx | 6 +-
oox/inc/drawingml/chart/converterbase.hxx | 5 --
oox/source/drawingml/chart/converterbase.cxx | 4 -
package/inc/ByteGrabber.hxx | 2
package/inc/ZipFile.hxx | 2
package/source/xstor/xstorage.cxx | 4 -
package/source/xstor/xstorage.hxx | 2
package/source/zipapi/ByteGrabber.cxx | 3 -
package/source/zipapi/ZipFile.cxx | 6 --
reportdesign/source/filter/xml/xmlExport.cxx | 5 --
reportdesign/source/filter/xml/xmlExport.hxx | 2
rsc/inc/rscclobj.hxx | 4 -
rsc/inc/rscconst.hxx | 2
rsc/inc/rscdb.hxx | 8 +--
rsc/inc/rscdef.hxx | 4 -
rsc/inc/rsckey.hxx | 2
rsc/inc/rscrange.hxx | 7 +--
rsc/source/parser/rscdb.cxx | 7 +--
rsc/source/parser/rscibas.cxx | 3 -
rsc/source/parser/rsckey.cxx | 4 -
rsc/source/res/rscconst.cxx | 4 -
rsc/source/res/rscrange.cxx | 8 ---
rsc/source/tools/rscdef.cxx | 13 +-----
salhelper/source/timer.cxx | 18 +++-----
sc/inc/address.hxx | 26 ------------
sc/inc/attarray.hxx | 6 +-
sc/inc/attrib.hxx | 8 +--
sc/inc/autoform.hxx | 2
sc/inc/callform.hxx | 6 +-
sc/inc/chartarr.hxx | 2
sc/inc/chartlis.hxx | 1
sc/inc/chgtrack.hxx | 4 -
sc/inc/column.hxx | 4 -
sc/inc/conditio.hxx | 6 --
sc/inc/defaultsoptions.hxx | 1
sc/inc/detdata.hxx | 3 -
sc/inc/detfunc.hxx | 2
sc/inc/document.hxx | 22 +++++-----
sc/inc/documentlinkmgr.hxx | 2
sc/inc/dpcache.hxx | 2
sc/inc/dpitemdata.hxx | 6 --
sc/inc/dpobject.hxx | 8 +--
sc/inc/externalrefmgr.hxx | 5 --
sc/inc/filter.hxx | 6 +-
sc/inc/formulacell.hxx | 2
sc/inc/formulagroup.hxx | 1
sc/inc/optutil.hxx | 4 -
sc/inc/orcusfilters.hxx | 4 -
sc/inc/pagepar.hxx | 2
sc/inc/patattr.hxx | 2
sc/inc/pivot.hxx | 3 -
sc/inc/printopt.hxx | 1
sc/inc/progress.hxx | 5 --
sc/inc/rangelst.hxx | 5 --
sc/inc/rangenam.hxx | 2
sc/inc/rangeutl.hxx | 1
sc/inc/scmod.hxx | 4 -
sc/inc/spellcheckcontext.hxx | 1
sc/inc/table.hxx | 4 -
sc/inc/tokenarray.hxx | 8 +--
sc/inc/typedstrdata.hxx | 1
sc/inc/validat.hxx | 4 -
sc/source/core/data/attarray.cxx | 8 ---
sc/source/core/data/attrib.cxx | 12 +----
sc/source/core/data/column3.cxx | 6 --
sc/source/core/data/conditio.cxx | 26 ------------
sc/source/core/data/documen3.cxx | 32 ++++-----------
sc/source/core/data/documen4.cxx | 6 --
sc/source/core/data/document.cxx | 32 ++-------------
sc/source/core/data/dpcache.cxx | 7 +--
sc/source/core/data/dpitemdata.cxx | 32 ---------------
sc/source/core/data/dpobject.cxx | 26 ++++--------
sc/source/core/data/formulacell.cxx | 8 +--
sc/source/core/data/pagepar.cxx | 24 -----------
sc/source/core/data/pivot2.cxx | 29 --------------
sc/source/core/data/table4.cxx | 5 --
sc/source/core/data/table5.cxx | 4 -
sc/source/core/data/validat.cxx | 13 ------
sc/source/core/inc/adiasync.hxx | 1
sc/source/core/tool/address.cxx | 6 --
sc/source/core/tool/autoform.cxx | 3 -
sc/source/core/tool/callform.cxx | 31 +--------------
sc/source/core/tool/chartarr.cxx | 5 --
sc/source/core/tool/chartlis.cxx | 5 --
sc/source/core/tool/defaultsoptions.cxx | 5 --
sc/source/core/tool/detfunc.cxx | 9 +---
sc/source/core/tool/formulagroup.cxx | 5 --
sc/source/core/tool/printopt.cxx | 5 --
sc/source/core/tool/rangelst.cxx | 25 +-----------
sc/source/core/tool/token.cxx | 9 +---
sc/source/core/tool/typedstrdata.cxx | 7 ---
sc/source/filter/dif/difexp.cxx | 4 -
sc/source/filter/excel/excform.cxx | 10 +---
sc/source/filter/excel/excform8.cxx | 13 ++----
sc/source/filter/excel/namebuff.cxx | 6 --
sc/source/filter/excel/xestream.cxx | 4 -
sc/source/filter/excel/xetable.cxx | 3 -
sc/source/filter/excel/xistream.cxx | 6 --
sc/source/filter/excel/xladdress.cxx | 3 -
sc/source/filter/excel/xltoolbar.cxx | 7 +--
sc/source/filter/excel/xltoolbar.hxx | 2
sc/source/filter/ftools/fapihelper.cxx | 10 +---
sc/source/filter/html/htmlexp.cxx | 11 +----
sc/source/filter/html/htmlpars.cxx | 6 --
sc/source/filter/inc/biffinputstream.hxx | 2
sc/source/filter/inc/excform.hxx | 8 +--
sc/source/filter/inc/fapihelper.hxx | 4 -
sc/source/filter/inc/formel.hxx | 4 -
sc/source/filter/inc/formulabase.hxx | 1
sc/source/filter/inc/ftools.hxx | 6 +-
sc/source/filter/inc/htmlexp.hxx | 2
sc/source/filter/inc/htmlpars.hxx | 5 --
sc/source/filter/inc/lotattr.hxx | 4 -
sc/source/filter/inc/lotform.hxx | 2
sc/source/filter/inc/lotimpop.hxx | 2
sc/source/filter/inc/lotrange.hxx | 8 ---
sc/source/filter/inc/namebuff.hxx | 2
sc/source/filter/inc/numberformatsbuffer.hxx | 2
sc/source/filter/inc/orcusfiltersimpl.hxx | 4 -
sc/source/filter/inc/orcusinterface.hxx | 2
sc/source/filter/inc/scflt.hxx | 2
sc/source/filter/inc/tablecolumnsbuffer.hxx | 5 --
sc/source/filter/inc/tokstack.hxx | 7 ---
sc/source/filter/inc/tool.h | 10 ----
sc/source/filter/inc/xestream.hxx | 2
sc/source/filter/inc/xetable.hxx | 4 -
sc/source/filter/inc/xistream.hxx | 5 --
sc/source/filter/inc/xladdress.hxx | 4 -
sc/source/filter/lotus/lotform.cxx | 6 --
sc/source/filter/lotus/lotimpop.cxx | 4 -
sc/source/filter/oox/biffinputstream.cxx | 3 -
sc/source/filter/oox/numberformatsbuffer.cxx | 3 -
sc/source/filter/oox/tablecolumnsbuffer.cxx | 5 --
sc/source/filter/orcus/interface.cxx | 5 --
sc/source/filter/orcus/xmlcontext.cxx | 11 +----
sc/source/filter/rtf/rtfexp.cxx | 4 -
sc/source/filter/starcalc/collect.hxx | 1
sc/source/filter/xml/XMLStylesExportHelper.cxx | 5 --
sc/source/filter/xml/XMLStylesExportHelper.hxx | 2
sc/source/ui/app/inputhdl.cxx | 14 ------
sc/source/ui/app/scmod.cxx | 12 +----
sc/source/ui/cctrl/checklistmenu.cxx | 3 -
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 7 +--
sc/source/ui/dbgui/asciiopt.cxx | 24 -----------
sc/source/ui/docshell/dbdocfun.cxx | 26 +++---------
sc/source/ui/docshell/docfunc.cxx | 47 ++++++-----------------
sc/source/ui/docshell/docsh6.cxx | 4 -
sc/source/ui/docshell/documentlinkmgr.cxx | 9 +---
sc/source/ui/docshell/externalrefmgr.cxx | 8 +--
sc/source/ui/docshell/impex.cxx | 8 +--
sc/source/ui/docshell/olinefun.cxx | 14 +-----
sc/source/ui/inc/PivotLayoutDialog.hxx | 2
sc/source/ui/inc/anyrefdg.hxx | 3 -
sc/source/ui/inc/asciiopt.hxx | 2
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/content.hxx | 2
sc/source/ui/inc/dbdocfun.hxx | 6 +-
sc/source/ui/inc/dbfunc.hxx | 2
sc/source/ui/inc/docfunc.hxx | 16 +++----
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/drawview.hxx | 6 +-
sc/source/ui/inc/imoptdlg.hxx | 12 -----
sc/source/ui/inc/inputhdl.hxx | 4 -
sc/source/ui/inc/namedlg.hxx | 2
sc/source/ui/inc/olinefun.hxx | 6 +-
sc/source/ui/inc/prevloc.hxx | 2
sc/source/ui/inc/redcom.hxx | 2
sc/source/ui/inc/tabvwsh.hxx | 2
sc/source/ui/inc/validate.hxx | 12 +----
sc/source/ui/inc/viewdata.hxx | 2
sc/source/ui/inc/viewfunc.hxx | 6 +-
sc/source/ui/miscdlgs/anyrefdg.cxx | 5 --
sc/source/ui/miscdlgs/redcom.cxx | 4 -
sc/source/ui/namedlg/namedlg.cxx | 3 -
sc/source/ui/vba/vbaborders.cxx | 5 --
sc/source/ui/vba/vbarange.cxx | 4 -
sc/source/ui/view/dbfunc3.cxx | 16 +++----
sc/source/ui/view/drawvie4.cxx | 6 --
sc/source/ui/view/drawview.cxx | 11 ++---
sc/source/ui/view/prevloc.cxx | 4 -
sc/source/ui/view/spellcheckcontext.cxx | 8 ---
sc/source/ui/view/tabvwshb.cxx | 4 -
sc/source/ui/view/viewdata.cxx | 4 -
sc/source/ui/view/viewfun2.cxx | 14 +-----
xmloff/source/core/ProgressBarHelper.cxx | 3 -
xmloff/source/core/nmspmap.cxx | 6 --
xmloff/source/core/xmlexp.cxx | 8 +--
xmloff/source/script/XMLEventsImportContext.cxx | 5 --
xmloff/source/style/GradientStyle.cxx | 18 +-------
xmloff/source/style/HatchStyle.cxx | 17 +-------
xmloff/source/style/ImageStyle.cxx | 4 -
xmloff/source/style/MarkerStyle.cxx | 4 -
xmloff/source/style/prstylei.cxx | 14 ------
xmloff/source/style/xmlnume.cxx | 6 --
233 files changed, 464 insertions(+), 1148 deletions(-)
New commits:
commit ed373ea7efd34ca6baab8ddbf809e6f2a06f1a9e
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 15 09:36:20 2016 +0200
loplugin:unusedmethods unused return value in include/xmloff
Change-Id: I6615a467152a50e9c65f04fd0d6c8cc128517bdb
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 84fdb9b..58cc2e8 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -42,7 +42,7 @@ public:
XMLGradientStyleImport( SvXMLImport& rImport );
~XMLGradientStyleImport();
- bool importXML(
+ void importXML(
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
css::uno::Any& rValue,
OUString& rStrName );
@@ -57,7 +57,7 @@ public:
XMLGradientStyleExport( SvXMLExport& rExport );
~XMLGradientStyleExport();
- bool exportXML(
+ void exportXML(
const OUString& rStrName,
const css::uno::Any& rValue );
};
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index e5e9e40..6fe2dac 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -42,7 +42,7 @@ public:
XMLHatchStyleImport( SvXMLImport& rImport );
~XMLHatchStyleImport();
- bool importXML(
+ void importXML(
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
css::uno::Any& rValue,
OUString& rStrName );
@@ -56,7 +56,7 @@ public:
XMLHatchStyleExport( SvXMLExport& rExport );
~XMLHatchStyleExport();
- bool exportXML( const OUString& rStrName, const css::uno::Any& rValue );
+ void exportXML( const OUString& rStrName, const css::uno::Any& rValue );
};
#endif // _XMLOFF_HATCHELEMENT_HXX
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 6bf6471..62becb8 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -38,7 +38,7 @@ public:
~XMLImageStyle();
void exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport );
- bool importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
+ void importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
private:
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 3779202c..679c470 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -42,7 +42,7 @@ public:
XMLMarkerStyleImport( SvXMLImport& rImport );
~XMLMarkerStyleImport();
- bool importXML(
+ void importXML(
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
css::uno::Any& rValue,
OUString& rStrName );
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index 7eeed4e..521ee4c 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -57,7 +57,7 @@ public:
// set the new reference and returns the new value which gives the
// Progress Bar the sam position as before
- sal_Int32 ChangeReference(sal_Int32 nNewReference);
+ void ChangeReference(sal_Int32 nNewReference);
sal_Int32 GetReference() { return nReference; }
sal_Int32 GetValue() { return nValue; }
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 5a5c1c2..0209965 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -98,7 +98,7 @@ public:
/// if the import operates in delayed mode, you can use this method
/// to obtain the value sequence for a specific event
- bool GetEventSequence(
+ void GetEventSequence(
const OUString& rName,
css::uno::Sequence<css::beans::PropertyValue> & rSequence );
diff --git a/include/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx
index c790aff..3d97063 100644
--- a/include/xmloff/i18nmap.hxx
+++ b/include/xmloff/i18nmap.hxx
@@ -36,12 +36,6 @@ public:
{
}
- bool operator==( const SvI18NMapEntry_Key& r ) const
- {
- return nKind == r.nKind &&
- aName == r.aName;
- }
-
bool operator<( const SvI18NMapEntry_Key& r ) const
{
return nKind < r.nKind ||
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index 36d78f7..7bba1a6 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -134,7 +134,7 @@ public:
static bool NormalizeW3URI( OUString& rName );
static bool NormalizeURI( OUString& rName );
-/* deprecated */ bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
+/* deprecated */ void AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
/* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey );
/* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const;
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index ba32702..da5278c 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -68,14 +68,14 @@ protected:
// the given OldFillStyleDefinitionSet) in the local maProperties. Deactivation
// is done setting theindex to -1. It returns true when actually old fill
// definitions existed and were deactivated
- bool deactivateOldFillStyleDefinitions(
+ void deactivateOldFillStyleDefinitions(
const OldFillStyleDefinitionSet& rHashSetOfTags);
//UUUU Helper to translate new DrawingLayer FillStyle values which are name-based
// from ODF internal name to style display names which can be found in the current
// document model (using NameOrIndex Items). The change is executed on the internal
// maProperties. The return value is true when actually names were changed
- bool translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames();
+ void translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames();
//UUUU provider for often used sets
static const OldFillStyleDefinitionSet& getStandardSet();
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index f1cf97e..a6e97f7 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -496,7 +496,7 @@ public:
// get export flags
SvXMLExportFlags getExportFlags() const { return mnExportFlags; }
- bool ExportEmbeddedOwnObject(
+ void ExportEmbeddedOwnObject(
css::uno::Reference<css::lang::XComponent >& rComp );
OUString GetRelativeReference(const OUString& rValue);
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index d522399..e343865 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -59,7 +59,7 @@ protected:
/// Override this to add attributes to the <list-style> element.
SAL_DLLPRIVATE void AddListStyleAttributes();
- SAL_DLLPRIVATE bool exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
+ SAL_DLLPRIVATE void exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
SAL_DLLPRIVATE void exportOutline();
SvXMLExport& GetExport() { return rExport; }
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index d5a550a..ef7292f 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -44,7 +44,7 @@ ProgressBarHelper::~ProgressBarHelper()
{
}
-sal_Int32 ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
+void ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
{
if((nNewReference > 0) && (nNewReference != nReference))
{
@@ -61,7 +61,6 @@ sal_Int32 ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
nValue = 0;
}
}
- return nValue;
}
void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index c5bfce1..fe4e74f 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -380,11 +380,9 @@ sal_uInt16 SvXMLNamespaceMap::GetNextIndex( sal_uInt16 nOldIdx ) const
return (++aIter == aNameMap.end()) ? USHRT_MAX : (*aIter).second->nKey;
}
-bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
+void SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
const OUString& rName, sal_uInt16 nKey )
{
- bool bRet = false;
-
if( XML_NAMESPACE_UNKNOWN == nKey )
nKey = GetKeyByName( rName );
@@ -392,9 +390,7 @@ bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix
if( XML_NAMESPACE_NONE != nKey && ! ( aNameHash.count ( rPrefix ) ) )
{
_Add( rPrefix, rName, nKey );
- bRet = true;
}
- return bRet;
}
OUString SvXMLNamespaceMap::GetAttrNameByIndex( sal_uInt16 nIdx ) const
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 389cb7e..f910b09 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2141,7 +2141,7 @@ sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& r
return 0;
}
-bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
+void SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
{
OUString sFilterService;
@@ -2168,7 +2168,7 @@ bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
SAL_WARN_IF( !sFilterService.getLength(), "xmloff.core", "no export filter for own object" );
if( sFilterService.isEmpty() )
- return false;
+ return;
Reference < XDocumentHandler > xHdl =
new XMLEmbeddedObjectExportFilter( mxHandler );
@@ -2181,14 +2181,14 @@ bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
UNO_QUERY);
SAL_WARN_IF( !xExporter.is(), "xmloff.core", "can't instantiate export filter component for own object" );
if( !xExporter.is() )
- return false;
+ return;
xExporter->setSourceDocument( rComp );
Reference<XFilter> xFilter( xExporter, UNO_QUERY );
Sequence < PropertyValue > aMediaDesc( 0 );
- return xFilter->filter( aMediaDesc );
+ xFilter->filter( aMediaDesc );
}
OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index e9dfc24..3e60c2d 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -157,7 +157,7 @@ void XMLEventsImportContext::SetEvents(
}
}
-bool XMLEventsImportContext::GetEventSequence(
+void XMLEventsImportContext::GetEventSequence(
const OUString& rName,
Sequence<PropertyValue> & rSequence )
{
@@ -176,10 +176,7 @@ bool XMLEventsImportContext::GetEventSequence(
if (aIter != aCollectEvents.end())
{
rSequence = aIter->second;
- return true;
}
-
- return false;
}
void XMLEventsImportContext::AddEventValues(
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 0ad8c74..3c33b46 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -77,7 +77,7 @@ XMLGradientStyleImport::~XMLGradientStyleImport()
{
}
-bool XMLGradientStyleImport::importXML(
+void XMLGradientStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -101,7 +101,6 @@ bool XMLGradientStyleImport::importXML(
bool bHasName = false;
bool bHasStyle = false;
bool bHasStartColor = false;
- bool bHasEndColor = false;
OUString aDisplayName;
awt::Gradient aGradient;
@@ -201,10 +200,6 @@ bool XMLGradientStyleImport::importXML(
aDisplayName );
rStrName = aDisplayName;
}
-
- bool bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor;
-
- return bRet;
}
// Export
@@ -219,11 +214,10 @@ XMLGradientStyleExport::~XMLGradientStyleExport()
{
}
-bool XMLGradientStyleExport::exportXML(
+void XMLGradientStyleExport::exportXML(
const OUString& rStrName,
const uno::Any& rValue )
{
- bool bRet = false;
awt::Gradient aGradient;
if( !rStrName.isEmpty() )
@@ -234,11 +228,7 @@ bool XMLGradientStyleExport::exportXML(
OUStringBuffer aOut;
// Style
- if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
- {
- bRet = false;
- }
- else
+ if( SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
{
// Name
bool bEncoded = false;
@@ -304,8 +294,6 @@ bool XMLGradientStyleExport::exportXML(
}
}
}
-
- return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 3dbbb45..9b76e19 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -68,7 +68,7 @@ XMLHatchStyleImport::~XMLHatchStyleImport()
{
}
-bool XMLHatchStyleImport::importXML(
+void XMLHatchStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -158,10 +158,6 @@ bool XMLHatchStyleImport::importXML(
aDisplayName );
rStrName = aDisplayName;
}
-
- bool bRet = bHasName && bHasStyle && bHasColor && bHasDist;
-
- return bRet;
}
// Export
@@ -175,11 +171,10 @@ XMLHatchStyleExport::~XMLHatchStyleExport()
{
}
-bool XMLHatchStyleExport::exportXML(
+void XMLHatchStyleExport::exportXML(
const OUString& rStrName,
const uno::Any& rValue )
{
- bool bRet = false;
drawing::Hatch aHatch;
if( !rStrName.isEmpty() )
@@ -193,11 +188,7 @@ bool XMLHatchStyleExport::exportXML(
rExport.GetMM100UnitConverter();
// Style
- if( !SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
- {
- bRet = false;
- }
- else
+ if( SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
{
// Name
bool bEncoded = false;
@@ -232,8 +223,6 @@ bool XMLHatchStyleExport::exportXML(
}
}
}
-
- return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 4be9fa0..64c76f2 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -99,9 +99,9 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal
}
}
-bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
+void XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
{
- return ImpImportXML( xAttrList, rValue, rStrName, rImport );
+ ImpImportXML( xAttrList, rValue, rStrName, rImport );
}
bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList,
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index ba2a7f4..bd0f35b 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -48,7 +48,7 @@ XMLMarkerStyleImport::~XMLMarkerStyleImport()
{
}
-bool XMLMarkerStyleImport::importXML(
+void XMLMarkerStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -137,8 +137,6 @@ bool XMLMarkerStyleImport::importXML(
}
delete pViewBox;
-
- return bHasViewBox && bHasPathData;
}
// Export
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 44229af..f80f4e0 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -553,11 +553,9 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist(
}
//UUUU
-bool XMLPropStyleContext::deactivateOldFillStyleDefinitions(
+void XMLPropStyleContext::deactivateOldFillStyleDefinitions(
const OldFillStyleDefinitionSet& rHashSetOfTags)
{
- bool bRetval(false);
-
if(!rHashSetOfTags.empty() && maProperties.size())
{
const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper();
@@ -574,21 +572,16 @@ bool XMLPropStyleContext::deactivateOldFillStyleDefinitions(
{
// mark entry as inactive
a->mnIndex = -1;
- bRetval = true;
}
}
}
}
}
-
- return bRetval;
}
//UUUU
-bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames()
+void XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames()
{
- bool bRetval(false);
-
if(maProperties.size())
{
const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper();
@@ -627,14 +620,11 @@ bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToSt
a->maValue >>= sStyleName;
sStyleName = GetImport().GetStyleDisplayName( aStyleFamily, sStyleName );
a->maValue <<= sStyleName;
- bRetval = true;
}
}
}
}
}
-
- return bRetval;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 54ab42c..5293539 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -696,7 +696,7 @@ void SvxXMLNumRuleExport::exportNumberingRule(
}
}
-bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
+void SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
@@ -709,7 +709,7 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
aAny = xPropSet->getPropertyValue( sIsPhysical );
if( !*static_cast<sal_Bool const *>(aAny.getValue()) )
- return false;
+ return;
}
aAny = xPropSet->getPropertyValue( sNumberingRules );
@@ -726,8 +726,6 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
}
exportNumberingRule( sName, bHidden, xNumRule );
-
- return true;
}
void SvxXMLNumRuleExport::exportOutline()
commit 098462c6f69c40422c74cef8f052b7b1ff0c90e8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 14 16:32:07 2016 +0200
loplugin:unusedmethods unused return value in sc
Change-Id: I3ccc98d2e042120093e2e8508518681588692393
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 8ac565c..3aa0ba1 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 6dd8481..bf6a916 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 0b403d6..070f1f0 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 9a03d91..11d4295 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 584c1d1..409c95d 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 0cd54ed..0e2c255 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 8671f18..fcbc133 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 2cdc14b..a7b85b9 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 5c0615c..0aaaeaf 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 d33ecc6..5114bd2 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 466503f..0ea046c 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 271b936..665acbd 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 7792b5a..14fb1b1 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 37a71a7..f334e3f 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 d500214..a724cbe 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 2329f76..0926ba2 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 1b58606..2244210 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 610cf8e..a2fd0663 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 a80a56a..14f2a2b 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 9de700b..d7fc6b6 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 5424cb4..b98be96 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 2e18cce..7ee6d59 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 deb2d2d..17e752e 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 2df40a6..58e6fcb 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 881dc4d..23ba001 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 4080e76..fb07b5a 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 073fab2..a3583a7 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 7c363a8..baf6885 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 4b6acb8..1134676 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 9eae5b9..7d19174 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 4db3e39..f6afd6b 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 fb12901..4b6ca43 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 285a3fe..69ee32e 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 00f5673..fcc873f 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 0efff48..d2672fe 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 1644264..26d6ca4 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 523c8e7..22173f7 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 f27bf34..34f42bc 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();
};
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 12cb386..8839444 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -855,7 +855,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
#endif
}
-bool ScAttrArray::SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize)
+void ScAttrArray::SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize)
{
ScDocumentPool* pDocPool = pDocument->GetPool();
for (SCSIZE i=0; i<nCount; i++)
@@ -865,7 +865,6 @@ bool ScAttrArray::SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize)
pData = pNewData;
nCount = nLimit = nSize;
- return true;
}
static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
@@ -1407,9 +1406,8 @@ bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
return bFound;
}
-bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
+void ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
{
- bool bFound = false;
const ScPatternAttr* pPattern;
const ScMergeAttr* pItem;
SCSIZE nIndex;
@@ -1462,8 +1460,6 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
else
nThisStart = MAXROW+1; // End
}
-
- return bFound;
}
/**
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 9072410..3693605 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -353,28 +353,24 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) c
return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint);
}
-bool ScProtectionAttr::SetProtection( bool bProtect)
+void ScProtectionAttr::SetProtection( bool bProtect)
{
bProtection = bProtect;
- return true;
}
-bool ScProtectionAttr::SetHideFormula( bool bHFormula)
+void ScProtectionAttr::SetHideFormula( bool bHFormula)
{
bHideFormula = bHFormula;
- return true;
}
-bool ScProtectionAttr::SetHideCell( bool bHCell)
+void ScProtectionAttr::SetHideCell( bool bHCell)
{
bHideCell = bHCell;
- return true;
}
-bool ScProtectionAttr::SetHidePrint( bool bHPrint)
+void ScProtectionAttr::SetHidePrint( bool bHPrint)
{
bHidePrint = bHPrint;
- return true;
}
/**
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5a59657..516453d 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -720,13 +720,12 @@ bool ScColumn::InitBlockPosition( sc::ColumnBlockPosition& rBlockPos )
return true;
}
-bool ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const
+void ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const
{
rBlockPos.miBroadcasterPos = maBroadcasters.begin();
rBlockPos.miCellNotePos = maCellNotes.begin();
rBlockPos.miCellTextAttrPos = maCellTextAttrs.begin();
rBlockPos.miCellPos = maCells.begin();
- return true;
}
namespace {
@@ -1892,7 +1891,7 @@ ScFormulaCell* ScColumn::SetFormulaCell(
return pCell;
}
-ScFormulaCell* ScColumn::SetFormulaCell(
+void ScColumn::SetFormulaCell(
sc::ColumnBlockPosition& rBlockPos, SCROW nRow, ScFormulaCell* pCell,
sc::StartListeningType eListenType )
{
@@ -1907,7 +1906,6 @@ ScFormulaCell* ScColumn::SetFormulaCell(
CellStorageModified();
AttachNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell, true, eListenType);
- return pCell;
}
bool ScColumn::SetFormulaCells( SCROW nRow, std::vector<ScFormulaCell*>& rCells )
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index e27a533..d2402a3 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1781,19 +1781,6 @@ ScFormatEntry* ScCondDateFormatEntry::Clone( ScDocument* pDoc ) const
return new ScCondDateFormatEntry( pDoc, *this );
}
-bool ScCondDateFormatEntry::operator==( const ScFormatEntry& r ) const
-{
- if(r.GetType() != condformat::DATE)
- return false;
-
- const ScCondDateFormatEntry& rEntry = static_cast<const ScCondDateFormatEntry&>(r);
-
- if(rEntry.meType != meType)
- return false;
-
- return rEntry.maStyleName == maStyleName;
-}
-
void ScCondDateFormatEntry::startRendering()
{
mpCache.reset();
@@ -2171,19 +2158,6 @@ void ScConditionalFormatList::InsertNew( ScConditionalFormat* pNew )
m_ConditionalFormats.insert(std::unique_ptr<ScConditionalFormat>(pNew));
}
-bool ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const
-{
- // For Ref Undo - internal variables are not compared
- sal_uInt16 nCount = size();
- bool bEqual = ( nCount == r.size() );
- const_iterator locIterator = begin();
- for(const_iterator itr = r.begin(); itr != r.end() && bEqual; ++itr, ++locIterator)
- if (!(*locIterator)->EqualEntries(**itr)) // Entries differ?
- bEqual = false;
-
- return bEqual;
-}
-
ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )
{
//FIXME: Binary search
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index c96eb59..48f01cf 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1467,7 +1467,7 @@ bool ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
/**
* Entries for AutoFilter listbox
*/
-bool ScDocument::GetFilterEntries(
+void ScDocument::GetFilterEntries(
SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates)
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && pDBCollection )
@@ -1514,17 +1514,14 @@ bool ScDocument::GetFilterEntries(
}
sortAndRemoveDuplicates(rStrings, aParam.bCaseSens);
- return true;
}
}
-
- return false;
}
/**
* Entries for Filter dialog
*/
-bool ScDocument::GetFilterEntriesArea(
+void ScDocument::GetFilterEntriesArea(
SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens,
std::vector<ScTypedStrData>& rStrings, bool& rHasDates)
{
@@ -1532,16 +1529,13 @@ bool ScDocument::GetFilterEntriesArea(
{
maTabs[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
sortAndRemoveDuplicates(rStrings, bCaseSens);
- return true;
}
-
- return false;
}
/**
* Entries for selection list listbox (no numbers/formulas)
*/
-bool ScDocument::GetDataEntries(
+void ScDocument::GetDataEntries(
SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens,
std::vector<ScTypedStrData>& rStrings, bool bLimit )
{
@@ -1559,29 +1553,27 @@ bool ScDocument::GetDataEntries(
if (pData->GetListType() == css::sheet::TableValidationVisibility::SORTEDASCENDING)
sortAndRemoveDuplicates(rStrings, bCaseSens);
- return true;
+ return;
}
}
}
if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()))
- return false;
+ return;
if (!maTabs[nTab])
- return false;
+ return;
std::set<ScTypedStrData> aStrings;
- bool bRet = maTabs[nTab]->GetDataEntries(nCol, nRow, aStrings, bLimit);
+ maTabs[nTab]->GetDataEntries(nCol, nRow, aStrings, bLimit);
rStrings.insert(rStrings.end(), aStrings.begin(), aStrings.end());
sortAndRemoveDuplicates(rStrings, bCaseSens);
-
- return bRet;
}
/**
* Entries for Formula auto input
*/
-bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings )
+void ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings )
{
// Range name
@@ -1626,8 +1618,6 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings )
}
}
}
-
- return true;
}
void ScDocument::GetEmbedded( ScRange& rRange ) const
@@ -2037,12 +2027,10 @@ SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW n
return 0;
}
-bool ScDocument::ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve )
+void ScDocument::ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve )
{
if( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
- return maTabs[nTab]->ReservePatternCount( nCol, nReserve );
- else
- return false;
+ maTabs[nTab]->ReservePatternCount( nCol, nReserve );
}
void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index afe6469..adf38d3 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -530,15 +530,13 @@ bool ScDocument::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
return false;
}
-bool ScDocument::ReplaceStyle(const SvxSearchItem& rSearchItem,
+void ScDocument::ReplaceStyle(const SvxSearchItem& rSearchItem,
SCCOL nCol, SCROW nRow, SCTAB nTab,
ScMarkData& rMark,
bool bIsUndoP)
{
if (nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
- return maTabs[nTab]->ReplaceStyle(rSearchItem, nCol, nRow, rMark, bIsUndoP);
- else
- return false;
+ maTabs[nTab]->ReplaceStyle(rSearchItem, nCol, nRow, rMark, bIsUndoP);
}
void ScDocument::CompileDBFormula()
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index b8206422..7abd034 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -4506,9 +4506,8 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCa
return MAXROW+1;
}
-bool ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault)
+void ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault)
{
- bool bRet(false);
nDefault = 0;
ScDocAttrIterator aDocAttrItr(this, nTab, nCol, 0, nCol, nLastRow);
SCCOL nColumn;
@@ -4551,11 +4550,7 @@ bool ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& n
++aItr;
}
nDefault = aDefaultItr->nFirst;
- bRet = true;
}
- else
- bRet = true;
- return bRet;
}
void ScDocument::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab )
@@ -5316,10 +5311,9 @@ bool ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMat
return true;
}
-bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
+void ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const
{
- bool bFound = false;
if ( ValidColRow(rStartCol,rStartRow) && ValidColRow(nEndCol,nEndRow) && ValidTab(nTab) )
{
if (nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
@@ -5366,17 +5360,14 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
{
OSL_FAIL("ExtendOverlapped: invalid range");
}
-
- return bFound;
}
-bool ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
+void ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
SCCOL& rEndCol, SCROW& rEndRow,
const ScMarkData& rMark, bool bRefresh )
{
// use all selected sheets from rMark
- bool bFound = false;
SCCOL nOldEndCol = rEndCol;
SCROW nOldEndRow = rEndRow;
@@ -5387,15 +5378,12 @@ bool ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
{
SCCOL nThisEndCol = nOldEndCol;
SCROW nThisEndRow = nOldEndRow;
- if ( ExtendMerge( nStartCol, nStartRow, nThisEndCol, nThisEndRow, *itr, bRefresh ) )
- bFound = true;
+ ExtendMerge( nStartCol, nStartRow, nThisEndCol, nThisEndRow, *itr, bRefresh );
if ( nThisEndCol > rEndCol )
rEndCol = nThisEndCol;
if ( nThisEndRow > rEndRow )
rEndRow = nThisEndRow;
}
-
- return bFound;
}
bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
@@ -5448,10 +5436,9 @@ bool ScDocument::ExtendMerge( ScRange& rRange, bool bRefresh )
return bFound;
}
-bool ScDocument::ExtendTotalMerge( ScRange& rRange ) const
+void ScDocument::ExtendTotalMerge( ScRange& rRange ) const
{
// Extend range to merged cells without including any new non-overlapped cells
- bool bRet = false;
ScRange aExt = rRange;
// ExtendMerge() is non-const, but called withouth refresh.
if (const_cast<ScDocument*>(this)->ExtendMerge( aExt ))
@@ -5471,15 +5458,12 @@ bool ScDocument::ExtendTotalMerge( ScRange& rRange ) const
aExt.aEnd.SetCol(rRange.aEnd.Col());
}
- bRet = ( aExt.aEnd != rRange.aEnd );
rRange = aExt;
}
- return bRet;
}
-bool ScDocument::ExtendOverlapped( ScRange& rRange ) const
+void ScDocument::ExtendOverlapped( ScRange& rRange ) const
{
- bool bFound = false;
SCTAB nStartTab = rRange.aStart.Tab();
SCTAB nEndTab = rRange.aEnd.Tab();
SCCOL nStartCol = rRange.aStart.Col();
@@ -5495,19 +5479,15 @@ bool ScDocument::ExtendOverlapped( ScRange& rRange ) const
if (nExtendCol < nStartCol)
{
nStartCol = nExtendCol;
- bFound = true;
}
if (nExtendRow < nStartRow)
{
nStartRow = nExtendRow;
- bFound = true;
}
}
rRange.aStart.SetCol(nStartCol);
rRange.aStart.SetRow(nStartRow);
-
- return bFound;
}
bool ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 0ba46d4..be366b9 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -290,7 +290,7 @@ void processBuckets(std::vector<Bucket>& aBuckets, ScDPCache::Field& rField)
}
-bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
+void ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
{
Clear();
@@ -305,7 +305,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
// Sanity check
if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow <= nStartRow)
- return false;
+ return;
sal_uInt16 nStartCol = rRange.aStart.Col();
sal_uInt16 nEndCol = rRange.aEnd.Col();
@@ -329,7 +329,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
// possible that the new end row becomes lower than the start row
// after the shrinkage.
Clear();
- return false;
+ return;
}
maFields.reserve(mnColumnCount);
@@ -379,7 +379,6 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
}
PostInit();
- return true;
}
bool ScDPCache::InitFromDataBase(DBConnector& rDB)
diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx
index 6bd1f73..fa8021f 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -29,33 +29,6 @@
const sal_Int32 ScDPItemData::DateFirst = -1;
const sal_Int32 ScDPItemData::DateLast = 10000;
-size_t ScDPItemData::Hash::operator() (const ScDPItemData& rVal) const
-{
- switch (rVal.GetType())
- {
- case GroupValue:
- case Value:
- case RangeStart:
- return (size_t)(rVal.mfValue);
- case String:
- case Error:
- {
- if (!rVal.mpString)
- return 0;
-
- if (rVal.mbStringInterned)
- return reinterpret_cast<size_t>(rVal.mpString);
-
- OUStringHash aStrHasher;
- return aStrHasher(*rVal.mpString);
- }
- default:
- ;
- }
-
- return 0;
-}
-
sal_Int32 ScDPItemData::Compare(const ScDPItemData& rA, const ScDPItemData& rB)
{
if (rA.meType != rB.meType)
@@ -252,11 +225,6 @@ bool ScDPItemData::operator== (const ScDPItemData& r) const
return GetString() == r.GetString();
}
-bool ScDPItemData::operator!= (const ScDPItemData& r) const
-{
- return !operator== (r);
-}
-
bool ScDPItemData::operator< (const ScDPItemData& r) const
{
return Compare(*this, r) == -1;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4effa69..bff5524 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2194,12 +2194,12 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
rFields.swap(aFields);
}
-bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
+void ScDPObject::FillOldParam(ScPivotParam& rParam) const
{
const_cast<ScDPObject*>(this)->CreateObjects(); // xSource is needed for field numbers
if (!xSource.is())
- return false;
+ return;
rParam.nCol = aOutRange.aStart.Col();
rParam.nRow = aOutRange.aStart.Row();
@@ -2237,7 +2237,6 @@ bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
// no error
}
}
- return true;
}
static void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
@@ -2353,34 +2352,34 @@ bool ScDPObject::FillLabelDataForDimension(
return true;
}
-bool ScDPObject::FillLabelData(sal_Int32 nDim, ScDPLabelData& rLabels)
+void ScDPObject::FillLabelData(sal_Int32 nDim, ScDPLabelData& rLabels)
{
CreateObjects();
if (!xSource.is())
- return false;
+ return;
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
uno::Reference<container::XIndexAccess> xDims = new ScNameToIndexAccess( xDimsName );
sal_Int32 nDimCount = xDims->getCount();
if (nDimCount <= 0 || nDim >= nDimCount)
- return false;
+ return;
- return FillLabelDataForDimension(xDims, nDim, rLabels);
+ FillLabelDataForDimension(xDims, nDim, rLabels);
}
-bool ScDPObject::FillLabelData(ScPivotParam& rParam)
+void ScDPObject::FillLabelData(ScPivotParam& rParam)
{
rParam.maLabelArray.clear();
CreateObjects();
if (!xSource.is())
- return false;
+ return;
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
uno::Reference<container::XIndexAccess> xDims = new ScNameToIndexAccess( xDimsName );
sal_Int32 nDimCount = xDims->getCount();
if (nDimCount <= 0)
- return false;
+ return;
for (sal_Int32 nDim = 0; nDim < nDimCount; ++nDim)
{
@@ -2388,8 +2387,6 @@ bool ScDPObject::FillLabelData(ScPivotParam& rParam)
FillLabelDataForDimension(xDims, nDim, *pNewLabel);
rParam.maLabelArray.push_back(std::unique_ptr<ScDPLabelData>(pNewLabel));
}
-
- return true;
}
bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xHiers )
@@ -2409,16 +2406,13 @@ bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XN
return bRet;
}
-bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< OUString >& rHiers )
+void ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< OUString >& rHiers )
{
- bool bRet = false;
uno::Reference< container::XNameAccess > xHiersNA;
if( GetHierarchiesNA( nDim, xHiersNA ) )
{
rHiers = xHiersNA->getElementNames();
- bRet = true;
}
- return bRet;
}
sal_Int32 ScDPObject::GetUsedHierarchy( sal_Int32 nDim )
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f4110f5..c954b97 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3391,7 +3391,7 @@ void ScFormulaCell::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
// no StartListeningTo because the new sheets have not been inserted yet.
}
-bool ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
+void ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{
// Adjust tokens only when it's not grouped or grouped top cell.
bool bAdjustCode = !mxGroup || mxGroup->mpTopCell == this;
@@ -3400,7 +3400,7 @@ bool ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{
if (bPosChanged)
aPos.IncTab(-1*rCxt.mnSheets);
- return false;
+ return;
}
EndListeningTo( pDocument );
@@ -3410,14 +3410,12 @@ bool ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
aPos.IncTab(-1*rCxt.mnSheets);
if (!bAdjustCode)
- return false;
+ return;
sc::RefUpdateResult aRes = pCode->AdjustReferenceOnDeletedTab(rCxt, aOldPos);
if (aRes.mbNameModified)
// Re-compile after sheet(s) have been deleted.
bCompile = true;
-
- return aRes.mbReferenceModified;
}
void ScFormulaCell::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo )
diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 18b04dd..cfa5333 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -44,11 +44,6 @@ void ScPageTableParam::Reset()
nFirstPageNo = 1;
}
-bool ScPageTableParam::operator==( const ScPageTableParam& r ) const
-{
- return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 );
-}
-
// struct ScPageAreaParam:
ScPageAreaParam::ScPageAreaParam()
@@ -69,24 +64,5 @@ void ScPageAreaParam::Reset()
memset( &aRepeatCol, 0, sizeof(ScRange) );
}
-bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const
-{
- bool bEqual =
- bPrintArea == r.bPrintArea
- && bRepeatRow == r.bRepeatRow
- && bRepeatCol == r.bRepeatCol;
-
- if ( bEqual )
- if ( bPrintArea )
- bEqual = bEqual && ( aPrintArea == r.aPrintArea );
- if ( bEqual )
- if ( bRepeatRow )
- bEqual = bEqual && ( aRepeatRow == r.aRepeatRow );
- if ( bEqual )
- if ( bRepeatCol )
- bEqual = bEqual && ( aRepeatCol == r.aRepeatCol );
-
- return bEqual;
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 6b578da..801afbe 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -191,23 +191,6 @@ ScPivotParam& ScPivotParam::operator=( const ScPivotParam& rPivotParam )
return *this;
}
-bool ScPivotParam::operator==( const ScPivotParam& rPivotParam ) const
-{
- bool bEqual = (nCol == rPivotParam.nCol &&
- nRow == rPivotParam.nRow &&
- nTab == rPivotParam.nTab &&
- bIgnoreEmptyRows == rPivotParam.bIgnoreEmptyRows &&
- bDetectCategories == rPivotParam.bDetectCategories &&
- bMakeTotalCol == rPivotParam.bMakeTotalCol &&
- bMakeTotalRow == rPivotParam.bMakeTotalRow &&
- maLabelArray.size() == rPivotParam.maLabelArray.size() &&
- maPageFields == rPivotParam.maPageFields &&
- maColFields == rPivotParam.maColFields &&
- maRowFields == rPivotParam.maRowFields &&
- maDataFields == rPivotParam.maDataFields);
- return bEqual;
-}
-
// ScPivotFuncData
ScPivotFuncData::ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ) :
@@ -217,18 +200,6 @@ ScPivotFuncData::ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ) :
mnDupCount(0)
{}
-bool ScPivotFuncData::operator== (const ScPivotFuncData& rFuncData) const
-{
- if (mnCol != rFuncData.mnCol ||
- mnOriginalDim != rFuncData.mnOriginalDim ||
- mnFuncMask != rFuncData.mnFuncMask ||
- mnDupCount != rFuncData.mnDupCount)
- {
- return false;
- }
- return equals(maFieldRef, rFuncData.maFieldRef);
-}
-
#if DEBUG_PIVOT_TABLE
void ScPivotFuncData::Dump() const
{
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 7c001de..3c4cb8a 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -2206,12 +2206,11 @@ bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel,
return false;
}
-bool ScTable::TestTabRefAbs(SCTAB nTable) const
+void ScTable::TestTabRefAbs(SCTAB nTable) const
{
for (SCCOL i=0; i <= MAXCOL; i++)
if (aCol[i].TestTabRefAbs(nTable))
- return true;
- return false;
+ return;
}
void ScTable::CompileDBFormula( sc::CompileFormulaContext& rCxt )
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index cd846b6..eb18a2c 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -600,7 +600,7 @@ bool ScTable::SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden)
return bChanged;
}
-bool ScTable::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden)
+void ScTable::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden)
{
bool bChanged = false;
if (bHidden)
@@ -613,8 +613,6 @@ bool ScTable::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden)
if (IsStreamValid())
SetStreamValid(false);
}
-
- return bChanged;
}
void ScTable::CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol)
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 437434a..baf4110 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -973,19 +973,6 @@ void ScValidationDataList::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt )
(*it)->UpdateMoveTab(rCxt);
}
-bool ScValidationDataList::operator==( const ScValidationDataList& r ) const
-{
- // for Ref-Undo - internal variables can not be compared
-
- size_t nCount = maData.size();
- bool bEqual = ( nCount == r.maData.size() );
- for( const_iterator it1 = begin(), it2 = r.begin(); it1 != end() && bEqual; ++it1, ++it2 ) // Entries are sorted
- if ( !(*it1)->EqualEntries(**it2) ) // different entries ?
- bEqual = false;
-
- return bEqual;
-}
-
ScValidationDataList::iterator ScValidationDataList::begin()
{
return maData.begin();
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 337b576..237470d 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -66,7 +66,6 @@ public:
// Comparators for PtrArrSort
bool operator< ( const ScAddInAsync& r ) const { return nHandle < r.nHandle; }
- bool operator==( const ScAddInAsync& r ) const { return nHandle == r.nHandle; }
};
struct CompareScAddInAsync
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index f3df923..2229fb0 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1670,11 +1670,11 @@ sal_uInt16 ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
}
// Parse only full row references
-sal_uInt16 ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
+void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
const ScAddress::Details& rDetails )
{
if (rStr.isEmpty())
- return 0;
+ return;
const sal_Unicode* p = rStr.getStr();
sal_uInt16 nRes = 0, ignored = 0;
@@ -1724,8 +1724,6 @@ sal_uInt16 ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
}
break;
}
-
- return (p != nullptr && *p == '\0') ? nRes : 0;
}
template<typename T > static inline void lcl_ScColToAlpha( T& rBuf, SCCOL nCol )
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 3e6cc33..46db04a 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1002,7 +1002,7 @@ ScAutoFormat::iterator ScAutoFormat::end()
return m_Data.end();
}
-bool ScAutoFormat::Load()
+void ScAutoFormat::Load()
{
INetURLObject aURL;
SvtPathOptions aPathOpt;
@@ -1060,7 +1060,6 @@ bool ScAutoFormat::Load()
}
}
mbSaveLater = false;
- return bRet;
}
bool ScAutoFormat::Save()
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index d3de9e6..af214393 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -243,13 +243,11 @@ void ExitExternalFunc()
aModuleCollection.clear();
}
-bool LegacyFuncData::Call(void** ppParam) const
+void LegacyFuncData::Call(void** ppParam) const
{
#ifdef DISABLE_DYNLOADING
(void) ppParam;
- return false;
#else
- bool bRet = false;
osl::Module* pLib = pModuleData->GetInstance();
oslGenericFunction fProc = pLib->getFunctionSymbol(aFuncName);
if (fProc != nullptr)
@@ -258,104 +256,83 @@ bool LegacyFuncData::Call(void** ppParam) const
{
case 1 :
(*reinterpret_cast<ExFuncPtr1>(fProc))(ppParam[0]);
- bRet = true;
break;
case 2 :
(*reinterpret_cast<ExFuncPtr2>(fProc))(ppParam[0], ppParam[1]);
- bRet = true;
break;
case 3 :
(*reinterpret_cast<ExFuncPtr3>(fProc))(ppParam[0], ppParam[1], ppParam[2]);
- bRet = true;
break;
case 4 :
(*reinterpret_cast<ExFuncPtr4>(fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3]);
- bRet = true;
break;
case 5 :
(*reinterpret_cast<ExFuncPtr5>(fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4]);
- bRet = true;
break;
case 6 :
(*reinterpret_cast<ExFuncPtr6>(fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5]);
- bRet = true;
break;
case 7 :
(*reinterpret_cast<ExFuncPtr7>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6]);
- bRet = true;
break;
case 8 :
(*reinterpret_cast<ExFuncPtr8>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7]);
- bRet = true;
break;
case 9 :
(*reinterpret_cast<ExFuncPtr9>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8]);
- bRet = true;
break;
case 10 :
(*reinterpret_cast<ExFuncPtr10>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9]);
- bRet = true;
break;
case 11 :
(*reinterpret_cast<ExFuncPtr11>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10]);
- bRet = true;
break;
case 12:
(*reinterpret_cast<ExFuncPtr12>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11]);
- bRet = true;
break;
case 13:
(*reinterpret_cast<ExFuncPtr13>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
ppParam[12]);
- bRet = true;
break;
case 14 :
(*reinterpret_cast<ExFuncPtr14>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
ppParam[12], ppParam[13]);
- bRet = true;
break;
case 15 :
(*reinterpret_cast<ExFuncPtr15>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
ppParam[12], ppParam[13], ppParam[14]);
- bRet = true;
break;
case 16 :
(*reinterpret_cast<ExFuncPtr16>(fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
ppParam[12], ppParam[13], ppParam[14], ppParam[15]);
- bRet = true;
break;
default : break;
}
}
- return bRet;
#endif
}
-bool LegacyFuncData::Unadvice( double nHandle )
+void LegacyFuncData::Unadvice( double nHandle )
{
#ifdef DISABLE_DYNLOADING
(void) nHandle;
- return false;
#else
- bool bRet = false;
osl::Module* pLib = pModuleData->GetInstance();
oslGenericFunction fProc = pLib->getFunctionSymbol(UNADVICE);
if (fProc != nullptr)
{
reinterpret_cast< ::Unadvice>(fProc)(nHandle);
- bRet = true;
}
- return bRet;
#endif
}
@@ -364,13 +341,12 @@ const OUString& LegacyFuncData::GetModuleName() const
return pModuleData->GetName();
}
-bool LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
+void LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
{
#ifdef DISABLE_DYNLOADING
(void) aName;
(void) aDesc;
(void) nParam;
- return false;
#else
bool bRet = false;
if ( nParam <= nParamCount )
@@ -394,7 +370,6 @@ bool LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16
aName.clear();
aDesc.clear();
}
- return bRet;
#endif
}
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 69135ab..5438895 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -464,9 +464,4 @@ const ScChartArray* ScChartCollection::operator[](size_t nIndex) const
return m_Data[nIndex].get();
}
-bool ScChartCollection::operator==(const ScChartCollection& rCmp) const
-{
- return ::comphelper::ContainerUniquePtrEquals(m_Data, rCmp.m_Data);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d2e50bd..4731d1e 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -730,11 +730,6 @@ bool ScChartListenerCollection::operator==( const ScChartListenerCollection& r )
return true;
}
-bool ScChartListenerCollection::operator!=( const ScChartListenerCollection& r ) const
-{
- return !operator==(r);
-}
-
void ScChartListenerCollection::StartListeningHiddenRange( const ScRange& rRange, ScChartHiddenRangeListener* pListener )
{
maHiddenListeners.insert(std::make_pair<>(pListener, rRange));
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 1e8c981..337b16a 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -55,11 +55,6 @@ bool ScDefaultsOptions::operator==( const ScDefaultsOptions& rOpt ) const
&& rOpt.aInitTabPrefix == aInitTabPrefix;
}
-bool ScDefaultsOptions::operator!=( const ScDefaultsOptions& rOpt ) const
-{
- return !(operator==(rOpt));
-}
-
ScTpDefaultsItem::ScTpDefaultsItem( sal_uInt16 nWhichP, const ScDefaultsOptions& rOpt ) :
SfxPoolItem ( nWhichP ),
theOptions ( rOpt )
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 11810e3..d7896ec 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -1519,17 +1519,17 @@ void ScDetectiveFunc::UpdateAllArrowColors()
}
}
-bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
+void ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
{
// find the rectangle for an arrow (always the object directly before the arrow)
// rRange must be initialized to the source cell of the arrow (start of area)
ScDrawLayer* pModel = pDoc->GetDrawLayer();
- if (!pModel) return false;
+ if (!pModel) return;
SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
OSL_ENSURE(pPage,"Page ?");
- if (!pPage) return false;
+ if (!pPage) return;
// test if the object is a direct page member
if( pObject && pObject->GetPage() && (pObject->GetPage() == pObject->GetObjList()) )
@@ -1547,12 +1547,11 @@ bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
if ( pPrevData && pPrevData->maStart.IsValid() && pPrevData->maEnd.IsValid() && (pPrevData->maStart == rRange.aStart) )
{
rRange.aEnd = pPrevData->maEnd;
- return true;
+ return;
}
}
}
}
- return false;
}
ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab,
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 4cbddf3..e382e7a 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -55,11 +55,6 @@ bool FormulaGroupContext::ColKey::operator== ( const ColKey& r ) const
return mnTab == r.mnTab && mnCol == r.mnCol;
}
-bool FormulaGroupContext::ColKey::operator!= ( const ColKey& r ) const
-{
- return !operator==(r);
-}
-
FormulaGroupContext::ColArray::ColArray( NumArrayType* pNumArray, StrArrayType* pStrArray ) :
mpNumArray(pNumArray), mpStrArray(pStrArray), mnSize(0)
{
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 54d880e..9e9bc1c 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -66,11 +66,6 @@ bool ScPrintOptions::operator==( const ScPrintOptions& rOpt ) const
&& bForceBreaks == rOpt.bForceBreaks;
}
-bool ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const
-{
- return !(operator==(rOpt));
-}
-
ScTpPrintItem::ScTpPrintItem( sal_uInt16 nWhichP, const ScPrintOptions& rOpt ) :
SfxPoolItem ( nWhichP ),
theOptions ( rOpt )
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 10e7952..97edca2 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -1214,17 +1214,15 @@ ScRangePairList::~ScRangePairList()
maPairs.clear();
}
-ScRangePair* ScRangePairList::Remove(size_t nPos)
+void ScRangePairList::Remove(size_t nPos)
{
if (maPairs.size() <= nPos)
// Out-of-bound condition. Bail out.
- return nullptr;
+ return;
vector<ScRangePair*>::iterator itr = maPairs.begin();
advance(itr, nPos);
- ScRangePair* p = *itr;
maPairs.erase(itr);
- return p;
}
ScRangePair* ScRangePairList::Remove( ScRangePair* Adr)
@@ -1244,20 +1242,6 @@ ScRangePair* ScRangePairList::Remove( ScRangePair* Adr)
return p;
}
-bool ScRangePairList::operator==( const ScRangePairList& r ) const
-{
- if ( this == &r )
- return true; // identical reference
- if ( maPairs.size() != r.size() )
- return false;
- for ( size_t nIdx = 0, nCnt = maPairs.size(); nIdx < nCnt; ++nIdx )
- {
- if ( *maPairs[ nIdx ] != *r[ nIdx ] )
- return false; // auch andere Reihenfolge ist ungleich
- }
- return true;
-}
-
ScRangePair* ScRangePairList::operator [](size_t idx)
{
return maPairs[idx];
@@ -1273,11 +1257,10 @@ size_t ScRangePairList::size() const
return maPairs.size();
}
-bool ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
+void ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
ScDocument* pDoc, const ScRange& rWhere,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
{
- bool bChanged = false;
if ( !maPairs.empty() )
{
SCCOL nCol1;
@@ -1306,14 +1289,12 @@ bool ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
theCol1, theRow1, theTab1, theCol2, theRow2, theTab2 )
!= UR_NOTHING )
{
- bChanged = true;
rRange.aStart.Set( theCol1, theRow1, theTab1 );
rRange.aEnd.Set( theCol2, theRow2, theTab2 );
}
}
}
}
- return bChanged;
}
// Delete entries that have the labels (first range) on nTab
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ee6e305..f6d37a0 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2008,10 +2008,10 @@ FormulaToken* ScTokenArray::MergeArray( )
return AddMatrix( pArray );
}
-FormulaToken* ScTokenArray::MergeRangeReference( const ScAddress & rPos )
+void ScTokenArray::MergeRangeReference( const ScAddress & rPos )
{
if (!pCode || !nLen)
- return nullptr;
+ return;
sal_uInt16 nIdx = nLen;
FormulaToken *p1, *p2, *p3; // ref, ocRange, ref
// The actual types are checked in extendRangeReference().
@@ -2030,7 +2030,6 @@ FormulaToken* ScTokenArray::MergeRangeReference( const ScAddress & rPos )
pCode[ nLen-1 ] = p.get();
}
}
- return pCode[ nLen-1 ];
}
FormulaToken* ScTokenArray::AddOpCode( OpCode e )
@@ -2075,9 +2074,9 @@ FormulaToken* ScTokenArray::AddExternalName( sal_uInt16 nFileId, const OUString&
return Add( new ScExternalNameToken(nFileId, rName) );
}
-FormulaToken* ScTokenArray::AddExternalSingleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef )
+void ScTokenArray::AddExternalSingleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef )
{
- return Add( new ScExternalSingleRefToken(nFileId, rTabName, rRef) );
+ Add( new ScExternalSingleRefToken(nFileId, rTabName, rRef) );
}
FormulaToken* ScTokenArray::AddExternalDoubleReference( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef )
diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx
index 700e68b..97f571b 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -72,13 +72,6 @@ bool ScTypedStrData::EqualCaseInsensitive::operator() (const ScTypedStrData& lef
left.maStrValue, right.maStrValue) == 0;
}
-bool ScTypedStrData::operator== (const ScTypedStrData& r) const
-{
- // Case insensitive comparison by default.
- EqualCaseInsensitive aHdl;
- return aHdl(*this, r);
-}
-
bool ScTypedStrData::operator< (const ScTypedStrData& r) const
{
// Case insensitive comparison by default.
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 702ee1a..eb51674 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -32,7 +32,7 @@
#include <rtl/strbuf.hxx>
#include <osl/diagnose.h>
-FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
+void ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption )
{
SCCOL nEndCol;
@@ -43,7 +43,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p
aStart.PutInOrder( aEnd );
- return ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach, nDifOption );
+ ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach, nDifOption );
}
FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 47d7a85..201b5c92 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1354,18 +1354,16 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
return eRet;
}
-ConvErr ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpStream& /*rStrm*/, sal_Size /*nFormulaLen*/,
+void ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpStream& /*rStrm*/, sal_Size /*nFormulaLen*/,
const OUString& /*rUrl*/, const vector<OUString>& /*rTabNames*/ )
{
- // not implemented ...
- return ConvErrNi;
}
-bool ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen )
+void ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen )
{
OSL_ENSURE_BIFF( GetBiff() == EXC_BIFF5 );
if( GetBiff() != EXC_BIFF5 )
- return false;
+ return;
sal_uInt8 nOp;
sal_uInt16 nRow1, nRow2;
@@ -1574,8 +1572,6 @@ bool ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si
rStrm.Ignore( nSeek );
}
rStrm.Seek( nEndPos );
-
- return !rRangeList.empty();
}
void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz )
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 32e1932..ca1cc60 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1299,11 +1299,11 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
return eRet;
}
-ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
+void ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
const OUString& rUrl, const vector<OUString>& rTabNames )
{
if( !GetDocShell() )
- return ConvErrNi;
+ return;
OUString aFileUrl = ScGlobal::GetAbsDocName(rUrl, GetDocShell());
@@ -1316,7 +1316,7 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
if (eStatus != ConvOK)
{
rStrm.Ignore(nFormulaLen);
- return eStatus;
+ return;
}
if (nFormulaLen == 0)
@@ -1324,7 +1324,7 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
aPool.Store(OUString("-/-"));
aPool >> aStack;
rpArray = aPool[aStack.Get()];
- return ConvOK;
+ return;
}
ScExternalRefManager* pRefMgr = GetDoc().GetExternalRefManager();
@@ -1451,7 +1451,6 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
}
rStrm.Seek(nEndPos);
- return eRet;
}
void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData &rSRD, const bool bName )
@@ -1509,7 +1508,7 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData
}
// stream seeks to first byte after <nLen>
-bool ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
+void ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
{
sal_uInt8 nOp;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list