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

Tor Lillqvist tml at collabora.com
Mon Jan 20 02:13:06 PST 2014


 writerfilter/source/dmapper/FontTable.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 01fc6acdf2aa836bdb54cae48fd5b89a7313c094
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 20 12:12:11 2014 +0200

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

diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 89ef2f5..f40c478 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -64,11 +64,11 @@ void FontTable::lcl_attribute(Id Name, Value & val)
     switch(Name)
     {
         case NS_ooxml::LN_CT_Pitch_val:
-            if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_fixed)
+            if (static_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Pitch_fixed)
                 m_pImpl->pCurrentEntry->nPitchRequest = awt::FontPitch::FIXED;
-            else if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_variable)
+            else if (static_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Pitch_variable)
                 m_pImpl->pCurrentEntry->nPitchRequest = awt::FontPitch::VARIABLE;
-            else if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_default)
+            else if (static_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Pitch_default)
                 m_pImpl->pCurrentEntry->nPitchRequest = awt::FontPitch::DONTKNOW;
             else
                 SAL_WARN("writerfilter", "FontTable::lcl_attribute: unhandled NS_ooxml::CT_Pitch_val: " << nIntValue);


More information about the Libreoffice-commits mailing list