[Libreoffice-commits] core.git: 3 commits - svx/source

[Tor Lillqvist]

 svx/source/fmcomp/fmgridcl.cxx |    2 +-
 svx/source/fmcomp/gridctrl.cxx |    2 +-
 svx/source/svdraw/svdview.cxx  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0a4abbda7c08ecc52712e356371a415137137929
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 21 16:27:37 2014 +0200

    WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
    
    Change-Id: Ia622d25a454eb2fe1928e095c635ad4655032f15

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 07a41be..69398e8 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2539,7 +2539,7 @@ void DbGridControl::AppendNew()
 
 void DbGridControl::SetDesignMode(bool bMode)
 {
-    if (IsDesignMode() != bMode)
+    if ((bool) IsDesignMode() != bMode)
     {
         // adjust Enable/Disable for design mode so that the headerbar remains configurable
         if (bMode)
commit 2e4157369a7b5127e4a3b312c944a3044b36845a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 21 16:26:44 2014 +0200

    WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
    
    Change-Id: Ibfd666d4c7b2d92a65a01a84fe83319f056b1e7b

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 27b657c..2a7f49d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1070,7 +1070,7 @@ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChange
 
 void FmGridControl::SetDesignMode(bool bMode)
 {
-    sal_Bool bOldMode = IsDesignMode();
+    bool bOldMode = IsDesignMode();
     DbGridControl::SetDesignMode(bMode);
     if (bOldMode != bMode)
     {
commit eb1b3360e641aaf5c9c8e142473c6e88128bc766
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 21 16:23:52 2014 +0200

    WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool'
    
    Change-Id: I3dfa4495ca7eeba3b3f4f6d81a2ef90fe60ca2d5

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index e8ef1ce..8b5f70a 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1442,7 +1442,7 @@ void SdrView::onAccessibilityOptionsChanged()
 
 void SdrView::SetMasterPagePaintCaching(sal_Bool bOn)
 {
-    if(mbMasterPagePaintCaching != bOn)
+    if(mbMasterPagePaintCaching != (bool) bOn)
     {
         mbMasterPagePaintCaching = bOn;