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

[Caolán McNamara]

 writerfilter/source/ooxml/OOXMLPropertySet.cxx |    7 ++-----
 writerfilter/source/ooxml/OOXMLPropertySet.hxx |    1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 6b8362acf9e496d5c76e16b6830d63020da77930
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 19 15:02:25 2018 +0000

    coverity#1430069 silence Uninitialized scalar field
    
    Change-Id: I54b2140d965fc9c7dddfdcbddd9602ede800c3f7
    Reviewed-on: https://gerrit.libreoffice.org/51566
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 13c5cf0493b7..82ccae8cab37 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -582,12 +582,9 @@ string OOXMLHexValue::toString() const
   class OOXMLHexColorValue
 */
 OOXMLHexColorValue::OOXMLHexColorValue(const char * pValue)
+    : OOXMLHexValue(sal_uInt32(COL_AUTO))
 {
-    if (!strcmp(pValue, "auto"))
-    {
-        mnValue = sal_uInt32(COL_AUTO);
-    }
-    else
+    if (strcmp(pValue, "auto"))
     {
         mnValue = rtl_str_toUInt32(pValue, 16);
     }
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index d8c38d87d904..327d3dd09a32 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -213,7 +213,6 @@ class OOXMLHexValue : public OOXMLValue
 {
 protected:
     sal_uInt32 mnValue;
-    OOXMLHexValue() {}
 public:
     explicit OOXMLHexValue(sal_uInt32 nValue);
     explicit OOXMLHexValue(const char * pValue);