[Libreoffice-commits] .: 3 commits - svl/source

[Tor Lillqvist]

 svl/source/items/poolio.cxx     |    2 +-
 svl/source/numbers/zforlist.cxx |    2 --
 svl/source/svdde/ddesvr.cxx     |    4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 27be19bd8bba63d0186b7425f30fc323ecc5a925
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 13:09:13 2011 +0300

    WaE: '==' : signed/unsigned mismatch

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 08894db..7e114c3 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -598,7 +598,7 @@ void DdeService::AddFormat( sal_uLong nFmt )
 {
     nFmt = DdeData::GetExternalFormat( nFmt );
     for ( size_t i = 0, n = aFormats.size(); i < n; ++i )
-        if ( aFormats[ i ] == nFmt )
+        if ( (sal_uLong) aFormats[ i ] == nFmt )
             return;
     aFormats.push_back( nFmt );
 }
@@ -609,7 +609,7 @@ void DdeService::RemoveFormat( sal_uLong nFmt )
 {
     nFmt = DdeData::GetExternalFormat( nFmt );
     for ( DdeFormats::iterator it = aFormats.begin(); it < aFormats.end(); ++it ) {
-        if ( *it == nFmt ) {
+        if ( (sal_uLong) *it == nFmt ) {
             aFormats.erase( it );
             break;
         }
commit deb6a43c1feadb285639709fb8883e509fadd3f1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 13:07:45 2011 +0300

    WaE: unreachable code

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8ce8eef..5169baa 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1267,7 +1267,6 @@ bool SvNumberFormatter::IsCompatible(short eOldType,
             default:
             return false;
         }
-        return false;
     }
 }
 
@@ -4337,7 +4336,6 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding )
             return '\x80';
 #endif
     }
-    return '\x80';
 }
 
 
commit 14c8a75cf3f869d08097ac1f3bce4e1bc369ff6d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 13:06:24 2011 +0300

    WaE: '==' : unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 5174498..eb84af5 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -196,7 +196,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
                 // !poolable wird gar nicht im Pool gespeichert
                 // und itemsets/plain-items je nach Runde
                 if ( *itrArr && IsItemFlag(**ppDefItem, SFX_ITEM_POOLABLE) &&
-                     pImp->bInSetItem == (*ppDefItem)->ISA(SfxSetItem) )
+                     pImp->bInSetItem == (bool) (*ppDefItem)->ISA(SfxSetItem) )
                 {
                     // eigene Kennung, globale Which-Id und Item-Version
                     sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), sal_False );