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

Tor Lillqvist tml at collabora.com
Mon Mar 23 03:57:06 PDT 2015


 sw/source/core/edit/edtab.cxx     |    2 +-
 sw/source/core/fields/cellfml.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d2a8991423506c64c027dc0dda49b08e56ca6acc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 23 12:52:31 2015 +0200

    WaE: comparison between signed and unsigned integer expressions
    
    Change-Id: Ia5c5b1926a73c54a38662b5ac737dbe1ff3cef50

diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index c334ee4..8d5bbc7 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -393,7 +393,7 @@ bool SwEditShell::IsTableBoxTextFormat() const
     {
         nFmt = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue();
         return GetDoc()->GetNumberFormatter()->IsTextFormat( nFmt ) ||
-                css::util::NumberFormat::TEXT == nFmt;
+                static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmt;
     }
 
     sal_uLong nNd = pBox->IsValidNumTxtNd();
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 7b18c53..2b0b686 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -217,7 +217,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
 
             SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
 
-            if( css::util::NumberFormat::TEXT == nFmtIndex )
+            if( static_cast<sal_uInt32>(css::util::NumberFormat::TEXT) == nFmtIndex )
                 nFmtIndex = 0;
             // JP 22.04.98: Bug 49659 - special treatment for percentages
             else if( !sTxt.isEmpty() &&


More information about the Libreoffice-commits mailing list