[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source filter/source formula/source framework/inc framework/source hwpfilter/source include/connectivity include/filter include/formula include/svx include/unotools include/xmloff sc/inc sc/source solenv/gbuild svx/source sw/source unotools/source xmloff/source
Noel Grandin
noel at peralex.com
Fri May 20 07:55:52 UTC 2016
connectivity/source/commontools/dbexception.cxx | 10 +++++-----
dbaccess/source/ui/inc/indexcollection.hxx | 2 +-
dbaccess/source/ui/misc/indexcollection.cxx | 2 +-
filter/source/graphicfilter/icgm/bundles.cxx | 14 +++++++-------
filter/source/graphicfilter/icgm/bundles.hxx | 14 +++++++-------
filter/source/graphicfilter/icgm/elements.cxx | 4 ++--
filter/source/graphicfilter/icgm/elements.hxx | 4 ++--
filter/source/msfilter/svdfppt.cxx | 2 +-
formula/source/ui/dlg/formula.cxx | 2 +-
framework/inc/helper/shareablemutex.hxx | 2 +-
framework/inc/jobs/jobdata.hxx | 2 +-
framework/inc/jobs/jobresult.hxx | 2 +-
framework/source/accelerators/storageholder.cxx | 3 ++-
framework/source/fwi/helper/shareablemutex.cxx | 2 +-
framework/source/inc/accelerators/storageholder.hxx | 2 +-
framework/source/jobs/jobdata.cxx | 3 ++-
framework/source/jobs/jobresult.cxx | 3 ++-
hwpfilter/source/mzstring.cxx | 2 +-
hwpfilter/source/mzstring.h | 2 +-
include/connectivity/dbexception.hxx | 10 +++++-----
include/filter/msfilter/svdfppt.hxx | 2 +-
include/formula/formdata.hxx | 2 +-
include/svx/dataaccessdescriptor.hxx | 2 +-
include/svx/fmtools.hxx | 2 +-
include/svx/rulritem.hxx | 2 +-
include/svx/svdglue.hxx | 2 +-
include/svx/svdhlpln.hxx | 4 ++--
include/svx/svdlayer.hxx | 2 +-
include/svx/svdmark.hxx | 2 +-
include/unotools/confignode.hxx | 2 +-
include/xmloff/nmspmap.hxx | 2 +-
sc/inc/appoptio.hxx | 2 +-
sc/inc/inputopt.hxx | 2 +-
sc/inc/printopt.hxx | 2 +-
sc/inc/sheetevents.hxx | 2 +-
sc/inc/viewopti.hxx | 4 ++--
sc/source/core/data/sheetevents.cxx | 2 +-
sc/source/core/tool/appoptio.cxx | 2 +-
sc/source/core/tool/inputopt.cxx | 2 +-
sc/source/core/tool/printopt.cxx | 2 +-
sc/source/core/tool/viewopti.cxx | 4 ++--
sc/source/ui/inc/printfun.hxx | 2 +-
sc/source/ui/view/printfun.cxx | 2 +-
solenv/gbuild/platform/com_MSC_defs.mk | 3 ++-
svx/source/dialog/rulritem.cxx | 2 +-
svx/source/form/dataaccessdescriptor.cxx | 2 +-
svx/source/form/fmtools.cxx | 2 +-
svx/source/svdraw/svdglue.cxx | 3 ++-
svx/source/svdraw/svdhlpln.cxx | 3 ++-
svx/source/svdraw/svdlayer.cxx | 2 +-
svx/source/svdraw/svdmark.cxx | 3 ++-
svx/source/svdraw/svdobjplusdata.cxx | 2 +-
sw/source/uibase/config/cfgitems.cxx | 9 ++++++---
sw/source/uibase/config/uinums.cxx | 2 +-
sw/source/uibase/docvw/FrameControlsManager.cxx | 2 +-
sw/source/uibase/inc/FrameControlsManager.hxx | 2 +-
sw/source/uibase/inc/cfgitems.hxx | 6 +++---
sw/source/uibase/inc/uinums.hxx | 2 +-
unotools/source/config/confignode.cxx | 2 +-
xmloff/source/core/nmspmap.cxx | 3 ++-
60 files changed, 100 insertions(+), 89 deletions(-)
New commits:
commit d09af095b52b0d9f2733ac139e6ced16837b8e4b
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 19 14:28:46 2016 +0200
remove more linking noise from VisualStudio build
Change-Id: Id6254b9b261e61e567ce3a557fa8e6cb30cfc3ae
Reviewed-on: https://gerrit.libreoffice.org/25155
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 40ca1f3..b2af97f 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -280,8 +280,9 @@ gb_LinkTarget_LDFLAGS := \
# Prevent warning spamming
# Happens because of the way we link our unit tests with our libraries.
+# LNK4049: locally defined symbol
gb_LinkTarget_LDFLAGS += \
- /ignore:4217
+ /ignore:4217 /ignore:4049
gb_DEBUGINFO_FLAGS := \
commit 8a2149c1059c70d67b4897e8a7751cf028a5136b
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 19 12:47:50 2016 +0200
clang-tidy misc-assign-operator-signature
Change-Id: I2953a88d9e2f5923732865ef17615d5928ac5f5f
Reviewed-on: https://gerrit.libreoffice.org/25154
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 67d2cf2..8cb71fb 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -82,7 +82,7 @@ SQLExceptionInfo::SQLExceptionInfo(const SQLExceptionInfo& _rCopySource)
}
-const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLException& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLException& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -90,7 +90,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc
}
-const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLWarning& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLWarning& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -98,7 +98,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc
}
-const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLContext& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLContext& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -106,7 +106,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb:
}
-const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent)
{
m_aContent = _rErrorEvent.Reason;
implDetermineType();
@@ -114,7 +114,7 @@ const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb:
}
-const SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException)
{
m_aContent = _rCaughtSQLException;
implDetermineType();
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx
index 7dbbae4..351f8e5 100644
--- a/dbaccess/source/ui/inc/indexcollection.hxx
+++ b/dbaccess/source/ui/inc/indexcollection.hxx
@@ -44,7 +44,7 @@ namespace dbaui
OIndexCollection(const OIndexCollection& _rSource);
// OIndexCollection(const css::uno::Reference< css::container::XNameAccess >& _rxIndexes);
- const OIndexCollection& operator=(const OIndexCollection& _rSource);
+ OIndexCollection& operator=(const OIndexCollection& _rSource);
// iterating through the collection
typedef OIndex* iterator;
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 971a25f..b45dbd4 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -46,7 +46,7 @@ namespace dbaui
*this = _rSource;
}
- const OIndexCollection& OIndexCollection::operator=(const OIndexCollection& _rSource)
+ OIndexCollection& OIndexCollection::operator=(const OIndexCollection& _rSource)
{
detach();
m_xIndexes = _rSource.m_xIndexes;
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index a81f6db..8381afd 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -23,7 +23,7 @@
#include <tools/stream.hxx>
#include <memory>
-Bundle& Bundle::operator=( Bundle& rSource )
+Bundle& Bundle::operator=( const Bundle& rSource )
{
mnColor = rSource.mnColor;
mnBundleIndex = rSource.mnBundleIndex;
@@ -37,7 +37,7 @@ void Bundle::SetColor( sal_uInt32 nColor )
}
-LineBundle& LineBundle::operator=( LineBundle& rSource )
+LineBundle& LineBundle::operator=( const LineBundle& rSource )
{
SetIndex( rSource.GetIndex() );
eLineType = rSource.eLineType;
@@ -45,7 +45,7 @@ LineBundle& LineBundle::operator=( LineBundle& rSource )
return *this;
};
-MarkerBundle& MarkerBundle::operator=( MarkerBundle& rSource )
+MarkerBundle& MarkerBundle::operator=( const MarkerBundle& rSource )
{
SetIndex( rSource.GetIndex() );
eMarkerType = rSource.eMarkerType;
@@ -53,7 +53,7 @@ MarkerBundle& MarkerBundle::operator=( MarkerBundle& rSource )
return *this;
};
-EdgeBundle& EdgeBundle::operator=( EdgeBundle& rSource )
+EdgeBundle& EdgeBundle::operator=( const EdgeBundle& rSource )
{
SetIndex( rSource.GetIndex() );
eEdgeType = rSource.eEdgeType;
@@ -61,7 +61,7 @@ EdgeBundle& EdgeBundle::operator=( EdgeBundle& rSource )
return *this;
};
-TextBundle& TextBundle::operator=( TextBundle& rSource )
+TextBundle& TextBundle::operator=( const TextBundle& rSource )
{
SetIndex( rSource.GetIndex() );
nTextFontIndex = rSource.nTextFontIndex;
@@ -71,7 +71,7 @@ TextBundle& TextBundle::operator=( TextBundle& rSource )
return *this;
};
-FillBundle& FillBundle::operator=( FillBundle& rSource )
+FillBundle& FillBundle::operator=( const FillBundle& rSource )
{
SetIndex( rSource.GetIndex() );
eFillInteriorStyle = rSource.eFillInteriorStyle;
@@ -108,7 +108,7 @@ CGMFList::~CGMFList()
}
-CGMFList& CGMFList::operator=( CGMFList& rSource )
+CGMFList& CGMFList::operator=( const CGMFList& rSource )
{
ImplDeleteList();
nFontsAvailable = rSource.nFontsAvailable;
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 2e6573f..abb8e04 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -44,7 +44,7 @@ public:
{};
virtual Bundle* Clone() { return new Bundle( *this ); };
- Bundle& operator=( Bundle& rBundle );
+ Bundle& operator=(const Bundle& rBundle );
virtual ~Bundle() {} ;
};
@@ -63,7 +63,7 @@ public:
{}
virtual Bundle* Clone() override { return new LineBundle( *this ); }
- LineBundle& operator=( LineBundle& rLineBundle );
+ LineBundle& operator=( const LineBundle& rLineBundle );
};
@@ -80,7 +80,7 @@ public:
{};
virtual Bundle* Clone() override { return new MarkerBundle( *this ); } ;
- MarkerBundle& operator=( MarkerBundle& rMarkerBundle );
+ MarkerBundle& operator=( const MarkerBundle& rMarkerBundle );
virtual ~MarkerBundle() {};
};
@@ -97,7 +97,7 @@ public:
, nEdgeWidth(0)
{}
virtual Bundle* Clone() override { return new EdgeBundle( *this ); }
- EdgeBundle& operator=( EdgeBundle& rEdgeBundle );
+ EdgeBundle& operator=( const EdgeBundle& rEdgeBundle );
};
@@ -118,7 +118,7 @@ public:
{};
virtual Bundle* Clone() override { return new TextBundle( *this ); } ;
- TextBundle& operator=( TextBundle& rTextBundle );
+ TextBundle& operator=( const TextBundle& rTextBundle );
virtual ~TextBundle() {};
};
@@ -137,7 +137,7 @@ public:
, nFillHatchIndex(0)
{}
virtual Bundle* Clone() override { return new FillBundle( *this ); }
- FillBundle& operator=( FillBundle& rFillBundle );
+ FillBundle& operator=( const FillBundle& rFillBundle );
};
@@ -170,7 +170,7 @@ public:
FontEntry* GetFontEntry( sal_uInt32 );
void InsertName( sal_uInt8* pSource, sal_uInt32 nSize );
void InsertCharSet( CharSetType, sal_uInt8* pSource, sal_uInt32 nSize );
- CGMFList& operator=( CGMFList& rFontList );
+ CGMFList& operator=( const CGMFList& rFontList );
};
#endif
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index b548d93..609128e 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -37,7 +37,7 @@ CGMElements::~CGMElements()
}
-CGMElements& CGMElements::operator=( CGMElements& rSource )
+CGMElements& CGMElements::operator=( const CGMElements& rSource )
{
sal_uInt32 nIndex;
@@ -299,7 +299,7 @@ void CGMElements::DeleteAllBundles( BundleList& rList )
};
-void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest )
+void CGMElements::CopyAllBundles( const BundleList& rSource, BundleList& rDest )
{
DeleteAllBundles( rDest );
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index b2a5fcd..8356e0d 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -127,13 +127,13 @@ class CGMElements
bool bSegmentCount;
explicit CGMElements();
~CGMElements();
- CGMElements& operator=( CGMElements& );
+ CGMElements& operator=( const CGMElements& );
void Init();
static Bundle* GetBundleIndex( long nIndex, BundleList&, Bundle& );
static Bundle* GetBundle( BundleList& rList, long nIndex );
static Bundle* InsertBundle( BundleList&, Bundle& );
static void DeleteAllBundles( BundleList& );
- static void CopyAllBundles( BundleList& Source, BundleList& Dest );
+ static void CopyAllBundles( const BundleList& Source, BundleList& Dest );
};
#endif
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 8708a330..9d23b39 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4395,7 +4395,7 @@ PPTParaPropSet::~PPTParaPropSet()
delete pParaSet;
}
-PPTParaPropSet& PPTParaPropSet::operator=( PPTParaPropSet& rParaPropSet )
+PPTParaPropSet& PPTParaPropSet::operator=( const PPTParaPropSet& rParaPropSet )
{
if ( this != &rParaPropSet )
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index de02639..3a83e97 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1971,7 +1971,7 @@ void FormEditData::Reset()
aUndoStr.clear();
}
-const FormEditData& FormEditData::operator=( const FormEditData& r )
+FormEditData& FormEditData::operator=( const FormEditData& r )
{
pParent = r.pParent;
nMode = r.nMode;
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index e354ab9..f28d524 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -35,7 +35,7 @@ class FWI_DLLPUBLIC ShareableMutex
public:
ShareableMutex();
ShareableMutex( const ShareableMutex& rShareableMutex );
- const ShareableMutex& operator=( const ShareableMutex& rShareableMutex );
+ ShareableMutex& operator=( const ShareableMutex& rShareableMutex );
~ShareableMutex() { m_pMutexRef->release(); }
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index e49716b..a6bd78d 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -182,7 +182,7 @@ class JobData
JobData( const JobData& rCopy );
virtual ~JobData( );
- void operator=( const JobData& rCopy );
+ JobData& operator=( const JobData& rCopy );
EMode getMode () const;
EEnvironment getEnvironment () const;
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index ef4c7cf..3b5c487 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -109,7 +109,7 @@ class JobResult
JobResult( const JobResult& rCopy );
virtual ~JobResult( );
- void operator=( const JobResult& rCopy );
+ JobResult& operator=( const JobResult& rCopy );
bool existPart ( sal_uInt32 eParts ) const;
std::vector< css::beans::NamedValue > getArguments ( ) const;
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index cf7f55c..977c700 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -393,11 +393,12 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
return css::uno::Reference< css::embed::XStorage >();
}
-void StorageHolder::operator=(const StorageHolder& rCopy)
+StorageHolder& StorageHolder::operator=(const StorageHolder& rCopy)
{
osl::MutexGuard g(m_mutex);
m_xRoot = rCopy.m_xRoot;
m_lStorages = rCopy.m_lStorages;
+ return *this;
}
css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
diff --git a/framework/source/fwi/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx
index 4f674c9..fba41f2 100644
--- a/framework/source/fwi/helper/shareablemutex.cxx
+++ b/framework/source/fwi/helper/shareablemutex.cxx
@@ -34,7 +34,7 @@ ShareableMutex::ShareableMutex( const ShareableMutex& rShareableMutex )
m_pMutexRef->acquire();
}
-const ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex )
+ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex )
{
rShareableMutex.m_pMutexRef->acquire();
m_pMutexRef->release();
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 60691c4..ce87fb8 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -139,7 +139,7 @@ class StorageHolder
/** @short TODO
*/
- void operator=(const StorageHolder& rCopy);
+ StorageHolder& operator=(const StorageHolder& rCopy);
/** @short opens a sub element of the specified base storage.
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index c3b453d..c1807a4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -71,7 +71,7 @@ JobData::JobData( const JobData& rCopy )
@param rCopy
the original instance, from which we must copy all data
*/
-void JobData::operator=( const JobData& rCopy )
+JobData& JobData::operator=( const JobData& rCopy )
{
SolarMutexGuard g;
// Please don't copy the uno service manager reference.
@@ -84,6 +84,7 @@ void JobData::operator=( const JobData& rCopy )
m_sEvent = rCopy.m_sEvent;
m_lArguments = rCopy.m_lArguments;
m_aLastExecutionResult = rCopy.m_aLastExecutionResult;
+ return *this;
}
/**
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index 01adf16..c9f5a02 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -157,7 +157,7 @@ JobResult::~JobResult()
@param rCopy
reference to the other instance, which should be used for copying.
*/
-void JobResult::operator=( const JobResult& rCopy )
+JobResult& JobResult::operator=( const JobResult& rCopy )
{
SolarMutexGuard g;
m_aPureResult = rCopy.m_aPureResult;
@@ -165,6 +165,7 @@ void JobResult::operator=( const JobResult& rCopy )
m_lArguments = rCopy.m_lArguments;
m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult;
+ return *this;
}
/**
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index 483809a..b99b9d0 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -57,7 +57,7 @@ MzString::~MzString()
}
-MzString &MzString::operator = (MzString &s)
+MzString &MzString::operator=(const MzString &s)
{
int n = s.length();
if (allocate(n))
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index 574033d..4afb0e5 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -93,7 +93,7 @@ class MzString
bool resize(int len);
// Assignment
- MzString &operator = (MzString &s);
+ MzString &operator = (const MzString &s);
MzString &operator = (const char *s);
// Appending
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index 67639ab..3a1ba71 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -116,11 +116,11 @@ public:
*/
void doThrow();
- const SQLExceptionInfo& operator=(const css::sdbc::SQLException& _rError);
- const SQLExceptionInfo& operator=(const css::sdbc::SQLWarning& _rError);
- const SQLExceptionInfo& operator=(const css::sdb::SQLContext& _rError);
- const SQLExceptionInfo& operator=(const css::sdb::SQLErrorEvent& _rErrorEvent);
- const SQLExceptionInfo& operator=(const css::uno::Any& _rCaughtSQLException);
+ SQLExceptionInfo& operator=(const css::sdbc::SQLException& _rError);
+ SQLExceptionInfo& operator=(const css::sdbc::SQLWarning& _rError);
+ SQLExceptionInfo& operator=(const css::sdb::SQLContext& _rError);
+ SQLExceptionInfo& operator=(const css::sdb::SQLErrorEvent& _rErrorEvent);
+ SQLExceptionInfo& operator=(const css::uno::Any& _rCaughtSQLException);
bool isKindOf(TYPE _eType) const;
// not just a simple comparisation ! e.g. getType() == SQL_CONTEXT implies isKindOf(SQL_EXCEPTION) == sal_True !
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 38ab5b2..4bef189 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -904,7 +904,7 @@ struct PPTParaPropSet
PPTParaPropSet( PPTParaPropSet& rParaPropSet );
~PPTParaPropSet();
- PPTParaPropSet& operator=( PPTParaPropSet& rParaPropSet );
+ PPTParaPropSet& operator=( const PPTParaPropSet& rParaPropSet );
};
struct ImplPPTCharPropSet
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index c531804..5f4877e 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -57,7 +57,7 @@ public:
protected:
void Reset();
FormEditData( const FormEditData& );
- const FormEditData& operator=( const FormEditData& r );
+ FormEditData& operator=( const FormEditData& r );
FormEditData* pParent; // fuer Verschachtelung
private:
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index 3204a86..80336b9 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -75,7 +75,7 @@ namespace svx
// allows to construct a descriptor from an Any containing either an XPropertySet or a property value sequence
ODataAccessDescriptor( const css::uno::Any& _rValues );
- const ODataAccessDescriptor& operator=(const ODataAccessDescriptor& _rSource);
+ ODataAccessDescriptor& operator=(const ODataAccessDescriptor& _rSource);
~ODataAccessDescriptor();
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 48b296d..e029b99 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -119,7 +119,7 @@ public:
operator const css::uno::Reference< css::uno::XInterface>& () const{ return m_xGeneric; }
// 'Conversions'
- const CursorWrapper& operator=(const css::uno::Reference< css::sdbc::XRowSet>& xCursor);
+ CursorWrapper& operator=(const css::uno::Reference< css::sdbc::XRowSet>& xCursor);
operator const css::uno::Reference< css::sdbc::XResultSet>& () const { return m_xMoveOperations; }
const css::uno::Reference< css::beans::XPropertySet >& getPropertySet() const { return m_xPropertyAccess; }
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 8fbe96c..bce6734 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -187,7 +187,7 @@ public:
SvxColumnItem(const SvxColumnItem& aItem);
virtual ~SvxColumnItem();
- const SvxColumnItem &operator=(const SvxColumnItem &);
+ SvxColumnItem &operator=(const SvxColumnItem &);
SvxColumnDescription& operator[](sal_uInt16 index);
const SvxColumnDescription& operator[](sal_uInt16 index) const;
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index ed82bf5..94989ae 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -123,7 +123,7 @@ public:
SdrGluePointList(const SdrGluePointList& rSrcList): aList() { *this=rSrcList; }
~SdrGluePointList() { Clear(); }
void Clear();
- void operator=(const SdrGluePointList& rSrcList);
+ SdrGluePointList& operator=(const SdrGluePointList& rSrcList);
sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); }
// At insert, the object (GluePoint) automatically gets an ID assigned.
// Return value is the index of the new GluePoint in the list.
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index e00cbb9..25c46b0 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -66,10 +66,10 @@ public:
SdrHelpLineList(const SdrHelpLineList& rSrcList): aList() { *this=rSrcList; }
~SdrHelpLineList() { Clear(); }
void Clear();
- void operator=(const SdrHelpLineList& rSrcList);
+ SdrHelpLineList& operator=(const SdrHelpLineList& rSrcList);
bool operator==(const SdrHelpLineList& rCmp) const;
bool operator!=(const SdrHelpLineList& rCmp) const { return !operator==(rCmp); }
- sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); }
+ sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); }
void Insert(const SdrHelpLine& rHL) { aList.push_back(new SdrHelpLine(rHL)); }
void Insert(const SdrHelpLine& rHL, sal_uInt16 nPos)
{
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 1f0b43c..ecb8343 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -111,7 +111,7 @@ public:
explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=nullptr);
SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin);
~SdrLayerAdmin();
- const SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin);
+ SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin);
void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; }
void SetModel(SdrModel* pNewModel);
void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos)
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index fc970289..225a0c4 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -238,7 +238,7 @@ public:
bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const;
// All Entries are copied!
- void operator=(const SdrMarkList& rLst);
+ SdrMarkList& operator=(const SdrMarkList& rLst);
};
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 264842d..015a5db 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -76,7 +76,7 @@ namespace utl
OConfigurationNode(const OConfigurationNode& _rSource);
/// assigment
- const OConfigurationNode& operator=(const OConfigurationNode& _rSource);
+ OConfigurationNode& operator=(const OConfigurationNode& _rSource);
/// dtor
virtual ~OConfigurationNode() {}
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index d182967..82e1b86 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -89,7 +89,7 @@ public:
SvXMLNamespaceMap( const SvXMLNamespaceMap& );
- void operator =( const SvXMLNamespaceMap& rCmp );
+ SvXMLNamespaceMap& operator =( const SvXMLNamespaceMap& rCmp );
bool operator ==( const SvXMLNamespaceMap& rCmp ) const;
sal_uInt16 Add( const OUString& rPrefix,
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index a3fc724..59f6255 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -78,7 +78,7 @@ public:
ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return meKeyBindingType; }
void SetKeyBindingType( ScOptionsUtil::KeyBindingType e ) { meKeyBindingType = e; }
- const ScAppOptions& operator= ( const ScAppOptions& rOpt );
+ ScAppOptions& operator= ( const ScAppOptions& rOpt );
private:
FieldUnit eMetric;
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 3536109..7f95380 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -71,7 +71,7 @@ public:
void SetLegacyCellSelection(bool bSet) { bLegacyCellSelection = bSet; }
bool GetLegacyCellSelection() const { return bLegacyCellSelection; }
- const ScInputOptions& operator= ( const ScInputOptions& rOpt );
+ ScInputOptions& operator= ( const ScInputOptions& rOpt );
};
// CfgItem for input options
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index baf6885..bf8bef2 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -45,7 +45,7 @@ public:
void SetDefaults();
- const ScPrintOptions& operator= ( const ScPrintOptions& rCpy );
+ ScPrintOptions& operator= ( const ScPrintOptions& rCpy );
bool operator== ( const ScPrintOptions& rOpt ) const;
};
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx
index c943360..267e442 100644
--- a/sc/inc/sheetevents.hxx
+++ b/sc/inc/sheetevents.hxx
@@ -38,7 +38,7 @@ public:
ScSheetEvents(const ScSheetEvents& rOther);
~ScSheetEvents();
- const ScSheetEvents& operator= (const ScSheetEvents& rOther);
+ ScSheetEvents& operator= (const ScSheetEvents& rOther);
const OUString* GetScript(ScSheetEventId nEvent) const;
void SetScript(ScSheetEventId nEvent, const OUString* pNew);
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 892e529..259653d 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -69,7 +69,7 @@ public:
ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {}
void SetDefaults();
- const ScGridOptions& operator= ( const ScGridOptions& rCpy );
+ ScGridOptions& operator= ( const ScGridOptions& rCpy );
bool operator== ( const ScGridOptions& rOpt ) const;
bool operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); }
};
@@ -98,7 +98,7 @@ public:
void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
SvxGridItem* CreateGridItem() const;
- const ScViewOptions& operator= ( const ScViewOptions& rCpy );
+ ScViewOptions& operator= ( const ScViewOptions& rCpy );
bool operator== ( const ScViewOptions& rOpt ) const;
bool operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); }
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index ddb893e..ba1d5f3 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -89,7 +89,7 @@ ScSheetEvents::ScSheetEvents(const ScSheetEvents& rOther) :
*this = rOther;
}
-const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther)
+ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther)
{
Clear();
if (rOther.mpScriptNames)
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index b8c05ae..ff73190 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -89,7 +89,7 @@ void ScAppOptions::SetDefaults()
meKeyBindingType = ScOptionsUtil::KEY_DEFAULT;
}
-const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
+ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
{
eMetric = rCpy.eMetric;
eZoomType = rCpy.eZoomType;
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 9414e9f..a1deae2 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -63,7 +63,7 @@ void ScInputOptions::SetDefaults()
bLegacyCellSelection = false;
}
-const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy )
+ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy )
{
nMoveDir = rCpy.nMoveDir;
bMoveSelection = rCpy.bMoveSelection;
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index c71ad46..877a68a 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -51,7 +51,7 @@ void ScPrintOptions::SetDefaults()
bForceBreaks = false;
}
-const ScPrintOptions& ScPrintOptions::operator=( const ScPrintOptions& rCpy )
+ScPrintOptions& ScPrintOptions::operator=( const ScPrintOptions& rCpy )
{
bSkipEmpty = rCpy.bSkipEmpty;
bAllSheets = rCpy.bAllSheets;
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index dae7c42..e7f49ba 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -62,7 +62,7 @@ void ScGridOptions::SetDefaults()
nFldDivisionY = 1;
}
-const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy )
+ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy )
{
nFldDrawX = rCpy.nFldDrawX; // UINT32
nFldDivisionX = rCpy.nFldDivisionX;
@@ -144,7 +144,7 @@ Color ScViewOptions::GetGridColor( OUString* pStrName ) const
return aGridCol;
}
-const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
+ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
{
sal_uInt16 i;
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index b30f34a..000d589 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -110,7 +110,7 @@ public:
~ScPageRowEntry() { delete[] pHidden; }
ScPageRowEntry(const ScPageRowEntry& r);
- const ScPageRowEntry& operator=(const ScPageRowEntry& r);
+ ScPageRowEntry& operator=(const ScPageRowEntry& r);
SCROW GetStartRow() const { return nStartRow; }
SCROW GetEndRow() const { return nEndRow; }
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 26851bc..292b9d1 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -109,7 +109,7 @@ ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r)
pHidden = nullptr;
}
-const ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r)
+ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r)
{
delete[] pHidden;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 88f0c1e..262c268 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -468,7 +468,7 @@ SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const
return new SvxColumnItem(*this);
}
-const SvxColumnItem& SvxColumnItem::operator=(const SvxColumnItem& rCopy)
+SvxColumnItem& SvxColumnItem::operator=(const SvxColumnItem& rCopy)
{
nLeft = rCopy.nLeft;
nRight = rCopy.nRight;
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 2a2c115..935a564 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -281,7 +281,7 @@ namespace svx
}
- const ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource)
+ ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource)
{
delete m_pImpl;
m_pImpl = new ODADescriptorImpl(*_rSource.m_pImpl);
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index daa77a3..bfd316e 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -260,7 +260,7 @@ void CursorWrapper::ImplConstruct(const Reference< css::sdbc::XResultSet>& _rxCu
}
-const CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSet>& _rxCursor)
+CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSet>& _rxCursor)
{
m_xMoveOperations.set(_rxCursor, UNO_QUERY);
m_xBookmarkOperations.set(_rxCursor, UNO_QUERY);
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 27f9f68..0b73f7f 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -285,13 +285,14 @@ void SdrGluePointList::Clear()
aList.clear();
}
-void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
+SdrGluePointList& SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
{
if (GetCount()!=0) Clear();
sal_uInt16 nCount=rSrcList.GetCount();
for (sal_uInt16 i=0; i<nCount; i++) {
Insert(rSrcList[i]);
}
+ return *this;
}
// The ID's of the glue points always increase monotonously!
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 851016e..6b33139 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -82,13 +82,14 @@ void SdrHelpLineList::Clear()
aList.clear();
}
-void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
+SdrHelpLineList& SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
{
Clear();
sal_uInt16 nCount=rSrcList.GetCount();
for (sal_uInt16 i=0; i<nCount; i++) {
Insert(rSrcList[i]);
}
+ return *this;
}
bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 9374733..329308b 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -160,7 +160,7 @@ void SdrLayerAdmin::ClearLayer()
aLayer.clear();
}
-const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmin)
+SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmin)
{
ClearLayer();
pParent=rSrcLayerAdmin.pParent;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 48299e9..bb164d7 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -297,7 +297,7 @@ void SdrMarkList::Clear()
SetNameDirty();
}
-void SdrMarkList::operator=(const SdrMarkList& rLst)
+SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst)
{
Clear();
@@ -315,6 +315,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
maGluePointName = rLst.maGluePointName;
mbGluePointNameOk = rLst.mbGluePointNameOk;
mbSorted = rLst.mbSorted;
+ return *this;
}
SdrMark* SdrMarkList::GetMark(size_t nNum) const
diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx
index b021e37..91fa577 100644
--- a/svx/source/svdraw/svdobjplusdata.cxx
+++ b/svx/source/svdraw/svdobjplusdata.cxx
@@ -60,7 +60,7 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
void SdrObjPlusData::SetGluePoints(const SdrGluePointList& rPts)
{
- return *pGluePoints = rPts;
+ *pGluePoints = rPts;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 9812268..b4605a7 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -88,7 +88,7 @@ bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const
bShowHiddenPara == rItem.bShowHiddenPara );
}
-void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
+SwDocDisplayItem& SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
{
bParagraphEnd = rDocDisplayItem.bParagraphEnd ;
bTab = rDocDisplayItem.bTab ;
@@ -99,6 +99,7 @@ void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
bFieldHiddenText = rDocDisplayItem.bFieldHiddenText ;
bManualBreak = rDocDisplayItem.bManualBreak ;
bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ;
+ return *this;
}
void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
@@ -171,7 +172,7 @@ bool SwElemItem::operator==( const SfxPoolItem& rAttr ) const
bNotes == rItem.bNotes );
}
-void SwElemItem::operator=( const SwElemItem& rElemItem)
+SwElemItem& SwElemItem::operator=( const SwElemItem& rElemItem)
{
bVertRuler = rElemItem. bVertRuler ;
bVertRulerRight = rElemItem. bVertRulerRight ;
@@ -182,6 +183,7 @@ void SwElemItem::operator=( const SwElemItem& rElemItem)
bDrawing = rElemItem.bDrawing ;
bFieldName = rElemItem.bFieldName ;
bNotes = rElemItem.bNotes ;
+ return *this;
}
void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
@@ -267,10 +269,11 @@ bool SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const
GetMode() == static_cast<const SwShadowCursorItem&>(rCmp).GetMode();
}
-void SwShadowCursorItem::operator=( const SwShadowCursorItem& rCpy )
+SwShadowCursorItem& SwShadowCursorItem::operator=( const SwShadowCursorItem& rCpy )
{
SetOn( rCpy.IsOn() );
SetMode( rCpy.GetMode() );
+ return *this;
}
void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 277b824..fcb10e9 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -140,7 +140,7 @@ SwNumRulesWithName::~SwNumRulesWithName()
delete p;
}
-const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCopy)
+SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCopy)
{
if( this != &rCopy )
{
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx
index f63b96a9..15d6633 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -39,7 +39,7 @@ void SwFrameControlsManager::dispose()
m_aControls.clear();
}
-const SwFrameControlsManager& SwFrameControlsManager::operator=( const SwFrameControlsManager& rCopy )
+SwFrameControlsManager& SwFrameControlsManager::operator=( const SwFrameControlsManager& rCopy )
{
m_pEditWin = rCopy.m_pEditWin;
m_aControls = rCopy.m_aControls;
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx
index 6f0c45f..bbaf6be 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -39,7 +39,7 @@ class SwFrameControlsManager
void dispose();
SwFrameControlsManager( const SwFrameControlsManager& rCopy );
- const SwFrameControlsManager& operator=( const SwFrameControlsManager& rCopy );
+ SwFrameControlsManager& operator=( const SwFrameControlsManager& rCopy );
SwFrameControlPtr GetControl( FrameControlType eType, const SwFrame* pFrame );
void RemoveControls( const SwFrame* pFrame );
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 8c336e8..fce80f1 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -63,7 +63,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- void operator=( const SwDocDisplayItem& );
+ SwDocDisplayItem& operator=( const SwDocDisplayItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
};
@@ -93,7 +93,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- void operator=( const SwElemItem& );
+ SwElemItem& operator=( const SwElemItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
@@ -131,7 +131,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- void operator=( const SwShadowCursorItem& );
+ SwShadowCursorItem& operator=( const SwShadowCursorItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 4439e54..27a1682 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -70,7 +70,7 @@ public:
SwNumRulesWithName( const SwNumRulesWithName & );
~SwNumRulesWithName();
- const SwNumRulesWithName &operator=(const SwNumRulesWithName &);
+ SwNumRulesWithName &operator=(const SwNumRulesWithName &);
const OUString& GetName() const { return maName; }
void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const;
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 8279732..89c38fa 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -91,7 +91,7 @@ namespace utl
startComponentListening(xConfigNodeComp);
}
- const OConfigurationNode& OConfigurationNode::operator=(const OConfigurationNode& _rSource)
+ OConfigurationNode& OConfigurationNode::operator=(const OConfigurationNode& _rSource)
{
stopAllComponentListening();
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index d0fb65f..e86b659 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -57,10 +57,11 @@ SvXMLNamespaceMap::SvXMLNamespaceMap( const SvXMLNamespaceMap& rMap )
aNameMap = rMap.aNameMap;
}
-void SvXMLNamespaceMap::operator=( const SvXMLNamespaceMap& rMap )
+SvXMLNamespaceMap& SvXMLNamespaceMap::operator=( const SvXMLNamespaceMap& rMap )
{
aNameHash = rMap.aNameHash;
aNameMap = rMap.aNameMap;
+ return *this;
}
SvXMLNamespaceMap::~SvXMLNamespaceMap()
More information about the Libreoffice-commits
mailing list