diff options
author | Eike Rathke <erack@redhat.com> | 2017-04-11 18:53:36 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-05-15 21:59:10 +0200 |
commit | 033bd8233e328b4881864c3ff1868951ec8f8ab6 (patch) | |
tree | c90c489e4555f18e023fd03ee423752436536d5f /sc/source | |
parent | 5c1566503cbf3310bca6cf4c121cc421ec8d5808 (diff) |
set mbNotOwner at various places
Change-Id: I1ff14c573d556cad15513dfe3f0fecbf9107fa41
Diffstat (limited to 'sc/source')
-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 c6a91d25bec0..f4e5b3bbc723 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; } |