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

Michael Stahl mstahl at redhat.com
Tue Jun 25 03:51:41 PDT 2013


 sw/source/filter/ww8/docxattributeoutput.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b8298f8e191d0bdfb558ec26607bc1ec7076a7f3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 25 12:48:19 2013 +0200

    DocxAttributeOutput: -Werror=unused-macros, -Werror=sign-compare
    
    Change-Id: I9d75b0a625009d483467042584d2d2f89501cb96

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 03e717b..4614efc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3715,7 +3715,6 @@ void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
         m_pSerializer->singleElementNS(XML_w, XML_effect, FSNS( XML_w, XML_val ), "none", FSEND );
 }
 
-#define MSWORD_CH_SHADING_CLR 0xD8D8D8 // This color is the same color as the ms-word's character shading color.
 #define MSWORD_CH_SHADING_FILL "FFFFFF" // The attribute w:fill of w:shd, for MS-Word's character shading,
 #define MSWORD_CH_SHADING_COLOR "auto" // The attribute w:color of w:shd, for MS-Word's character shading,
 #define MSWORD_CH_SHADING_VAL "pct15" // The attribute w:value of w:shd, for MS-Word's character shading,
@@ -3723,7 +3722,7 @@ void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
 void DocxAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
 {
     // Check if the brush shading pattern is 'PCT15'. If so - write it back to the DOCX
-    if (rBrush.GetShadingValue() == ShadingPattern::PCT15)
+    if (rBrush.GetShadingValue() == +ShadingPattern::PCT15)
     {
         m_pSerializer->singleElementNS( XML_w, XML_shd,
             FSNS( XML_w, XML_val ), MSWORD_CH_SHADING_VAL,


More information about the Libreoffice-commits mailing list