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

Michael Stahl mstahl at redhat.com
Thu Jul 4 12:53:55 PDT 2013


 cui/source/tabpages/numpages.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b252ffd184dec7fd1adfd826dbb5f0fb67d2ea05
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 21:13:16 2013 +0200

    warning C4805 unsafe mixture of type sal_Bool and type bool
    
    Change-Id: I8a144c153664af0be73cd2a8822664b2fcb612e3

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d0b3ffe..692872c 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1407,19 +1407,19 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 
 void SvxNumOptionsTabPage::InitControls()
 {
-    sal_Bool bShowBullet    = sal_True;
-    sal_Bool bShowBitmap    = sal_True;
-    sal_Bool bSameType      = sal_True;
-    sal_Bool bSameStart     = sal_True;
-    sal_Bool bSamePrefix    = sal_True;
-    sal_Bool bSameSuffix    = sal_True;
-    sal_Bool bAllLevel      = sal_True;
-    sal_Bool bSameCharFmt   = sal_True;
-    sal_Bool bSameVOrient   = sal_True;
-    sal_Bool bSameSize      = sal_True;
-    sal_Bool bSameBulColor  = sal_True;
-    sal_Bool bSameBulRelSize= sal_True;
-    sal_Bool bSameAdjust    = sal_True;
+    bool bShowBullet    = true;
+    bool bShowBitmap    = true;
+    bool bSameType      = true;
+    bool bSameStart     = true;
+    bool bSamePrefix    = true;
+    bool bSameSuffix    = true;
+    bool bAllLevel      = true;
+    sal_Bool bSameCharFmt   = true;
+    sal_Bool bSameVOrient   = true;
+    bool bSameSize      = true;
+    bool bSameBulColor  = true;
+    bool bSameBulRelSize= true;
+    bool bSameAdjust    = true;
 
     const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM];
     String sFirstCharFmt;


More information about the Libreoffice-commits mailing list