diff options
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/macitem.cxx | 7 | ||||
| -rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.hxx | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index b8e56d9f0ed4..f18a575bf2df 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -68,8 +68,11 @@ SvxMacro& SvxMacro::operator=( const SvxMacro& rBase ) SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl ) { - aSvxMacroTable.clear(); - aSvxMacroTable.insert(rTbl.aSvxMacroTable.begin(), rTbl.aSvxMacroTable.end()); + if (this != &rTbl) + { + aSvxMacroTable.clear(); + aSvxMacroTable.insert(rTbl.aSvxMacroTable.begin(), rTbl.aSvxMacroTable.end()); + } return *this; } diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx index 3da1e606d4d1..ad62ac0c91bd 100644 --- a/svl/source/passwordcontainer/passwordcontainer.hxx +++ b/svl/source/passwordcontainer/passwordcontainer.hxx @@ -96,12 +96,14 @@ public: NamePassRecord& operator=( const NamePassRecord& aRecord ) { - m_aName = aRecord.m_aName; - - m_aMemPass.clear(); - m_aPersPass.clear(); - InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); + if (this != &aRecord) + { + m_aName = aRecord.m_aName; + m_aMemPass.clear(); + m_aPersPass.clear(); + InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); + } return *this; } |