[Libreoffice-commits] core.git: 3 commits - cui/source sc/inc sw/source

[Tor Lillqvist]

 cui/source/tabpages/numpages.cxx |    2 +-
 sc/inc/formulaopt.hxx            |    1 +
 sw/source/core/doc/doclay.cxx    |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3a34474db59067073d8c8f91b0173cab3a60850e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Aug 12 22:22:26 2013 +0300

    WaE: C4701: potentially uninitialized local variable 'pIdx' used
    
    Change-Id: I244dfcff7fab6b1c4342b453236ff3eb8f3a0d98

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index c75df79..c8cbb27 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1965,7 +1965,7 @@ const SwFlyFrmFmt* SwDoc::FindFlyByName( const OUString& rName, sal_Int8 nNdTyp
     for( sal_uInt16 n = rFmts.size(); n; )
     {
         const SwFrmFmt* pFlyFmt = rFmts[ --n ];
-        const SwNodeIndex* pIdx;
+        const SwNodeIndex* pIdx = 0;
         if( RES_FLYFRMFMT == pFlyFmt->Which() && pFlyFmt->GetName() == rName &&
             0 != ( pIdx = pFlyFmt->GetCntnt().GetCntntIdx() ) &&
             pIdx->GetNode().GetNodes().IsDocNodes() )
commit 4530f16f07c9ea55242081c1ba826df1b358ba7e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Aug 12 21:48:49 2013 +0300

    WaE: '&=' : unsafe mix of type 'sal_Bool' and type 'bool' in operation
    
    Change-Id: I2ffffe38b479a6116bfeff37c78cc15e5e26cee5

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 75aca2e..24dfe30 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1432,7 +1432,7 @@ void SvxNumOptionsTabPage::InitControls()
                 bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
                 bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
                 bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
-                bSameCharFmt    &=  sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+                bSameCharFmt    &=  (sal_Bool) (sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName());
                 bSameVOrient    &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
                 if(bShowBitmap && bSameSize)
                     bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
commit 14f9da1c6c9504deec83d6ab5975cba118d2b165
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Aug 12 21:42:03 2013 +0300

    Include <map> for std::map with MSVC
    
    Change-Id: I88a36c7e4a795679519aa26387c7de8fd4ae007f

diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 70e533a..8ab4e0b 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -10,6 +10,7 @@
 #ifndef SC_FORMULAOPT_HXX
 #define SC_FORMULAOPT_HXX
 
+#include <map>
 #include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/localedatawrapper.hxx>