diff options
author | Eike Rathke <erack@redhat.com> | 2017-04-11 18:53:36 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-04-11 19:06:36 +0200 |
commit | 59aebc3e51490ba9c76a261b2e5090b12f30e0da (patch) | |
tree | b99e18a2b1fa057080cf38362031b68ea815a212 /sc | |
parent | 024ddbc7d2ffe6b4b84c48b213296a0716086b6d (diff) |
set mbNotOwner at various places
Change-Id: I1ff14c573d556cad15513dfe3f0fecbf9107fa41
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/postit.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index ef15c8556762..e8afbb2479dc 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -481,6 +481,7 @@ ScCaptionPtr::ScCaptionPtr( ScCaptionPtr&& r ) : { r.replaceInList( this ); r.mpCaption = nullptr; + r.mbNotOwner = false; } ScCaptionPtr& ScCaptionPtr::operator=( ScCaptionPtr&& r ) @@ -490,9 +491,11 @@ ScCaptionPtr& ScCaptionPtr::operator=( ScCaptionPtr&& r ) mpHead = r.mpHead; mpNext = r.mpNext; mpCaption = r.mpCaption; + mbNotOwner = r.mbNotOwner; r.replaceInList( this ); r.mpCaption = nullptr; + r.mbNotOwner = false; return *this; } @@ -525,6 +528,7 @@ ScCaptionPtr& ScCaptionPtr::operator=( const ScCaptionPtr& r ) removeFromList(); mpCaption = r.mpCaption; + mbNotOwner = r.mbNotOwner; // That head is this' master. mpHead = r.mpHead; // Insert into list. @@ -656,6 +660,7 @@ void ScCaptionPtr::reset( SdrCaptionObj* p ) decRefAndDestroy(); removeFromList(); mpCaption = p; + mbNotOwner = false; if (p) { newHead(); @@ -776,6 +781,7 @@ bool ScCaptionPtr::forget() bool bRet = decRef(); removeFromList(); mpCaption = nullptr; + mbNotOwner = false; return bRet; } @@ -800,6 +806,7 @@ void ScCaptionPtr::clear() mpHead = nullptr; mpNext = nullptr; mpCaption = nullptr; + mbNotOwner = false; } |