[Libreoffice-commits] core.git: editeng/source

[Caolán McNamara]

 editeng/source/items/frmitems.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5233a94fde279b5758bb9c45ee64203b753b5ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 11 12:10:13 2016 +0000

    seems dubious to copy the state, but drop the load again bit
    
    if the assigned-to item had loaded its original content, but the assigned-from
    item hadn't, then surely the assigned-to item will never load the new content.
    
    if the assigned-to item hadn't loaded its original content, but the
    assigned-from had, then why load it again
    
    Change-Id: I68c2cf2682a517e7e630ab6cbc637b35a2b9c7aa
    Reviewed-on: https://gerrit.libreoffice.org/30781
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d4ed23c..8aa5ee4 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3428,7 +3428,6 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n
 
 SvxBrushItem::SvxBrushItem(const SvxBrushItem& rItem)
     : SfxPoolItem(rItem.Which())
-    , bLoadAgain(true)
 {
     *this = rItem;
 }
@@ -3675,6 +3674,7 @@ SvxBrushItem& SvxBrushItem::operator=(const SvxBrushItem& rItem)
     maStrLink = rItem.maStrLink;
     maStrFilter = rItem.maStrFilter;
     eGraphicPos = rItem.eGraphicPos;
+    bLoadAgain = rItem.bLoadAgain;
     return *this;
 }