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

[Noel Grandin]

 sc/source/ui/miscdlgs/delcodlg.cxx |    2 +-
 sc/source/ui/miscdlgs/inscodlg.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40edbce3988946d0ffceb9554de42e1e469edd92
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Apr 20 15:20:43 2018 +0200

    fix for "drop IS_SET macro"
    
    regression from
    
        commit 8c9c1b852ce0ebc6bd19437e9e583ef4226cf685
        Date:   Wed Apr 18 14:12:06 2018 +0200
        drop IS_SET macro
    
    Jochen Nitschke: InsertDeleteFlags::ATTRIB sets 2 bits, before it
    checked both bits and now it's true if only one of them is set.
    
    Change-Id: I169ffae10d219063ce378257e95fbb4f863ca525
    Reviewed-on: https://gerrit.libreoffice.org/53211
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 36b9e3f4062b..19d098994c76 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -51,7 +51,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent, InsertDeleteFlag
     m_xBtnDelDateTime->set_active( bool(InsertDeleteFlags::DATETIME & ScDeleteContentsDlg::nPreviousChecks) );
     m_xBtnDelFormulas->set_active( bool(InsertDeleteFlags::FORMULA & ScDeleteContentsDlg::nPreviousChecks) );
     m_xBtnDelNotes->set_active( bool(InsertDeleteFlags::NOTE & ScDeleteContentsDlg::nPreviousChecks) );
-    m_xBtnDelAttrs->set_active( bool(InsertDeleteFlags::ATTRIB & ScDeleteContentsDlg::nPreviousChecks) );
+    m_xBtnDelAttrs->set_active( (InsertDeleteFlags::ATTRIB & ScDeleteContentsDlg::nPreviousChecks) == InsertDeleteFlags::ATTRIB );
     m_xBtnDelObjects->set_active( bool(InsertDeleteFlags::OBJECTS & ScDeleteContentsDlg::nPreviousChecks) );
 
     DisableChecks( m_xBtnDelAll->get_active() );
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 1c8c62c79608..52935098d96e 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -81,7 +81,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     mpBtnInsDateTime->Check( bool(InsertDeleteFlags::DATETIME & ScInsertContentsDlg::nPreviousChecks) );
     mpBtnInsFormulas->Check( bool(InsertDeleteFlags::FORMULA & ScInsertContentsDlg::nPreviousChecks) );
     mpBtnInsNotes->Check   ( bool(InsertDeleteFlags::NOTE & ScInsertContentsDlg::nPreviousChecks) );
-    mpBtnInsAttrs->Check   ( bool(InsertDeleteFlags::ATTRIB & ScInsertContentsDlg::nPreviousChecks) );
+    mpBtnInsAttrs->Check   ( (InsertDeleteFlags::ATTRIB & ScInsertContentsDlg::nPreviousChecks) == InsertDeleteFlags::ATTRIB );
     mpBtnInsObjects->Check ( bool(InsertDeleteFlags::OBJECTS & ScInsertContentsDlg::nPreviousChecks) );
 
     switch( ScInsertContentsDlg::nPreviousFormulaChecks )