diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-01 14:35:25 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-01 15:29:58 -0600 |
| commit | d9e0c297cee589a05d9e38d97465324ae26ea8f3 (patch) | |
| tree | 4684d1b11ebb91eb7679444072cb66bc28bf8283 | |
| parent | 620ddc9eaf2d6cffc02c85e2b92218885c019217 (diff) | |
coverity#707730 : Uninitialized scalar field
Change-Id: Iaf0d1bd80d0d27f61790fc716f2ad3faed048a5a
| -rw-r--r-- | dbaccess/source/filter/xml/xmlStyleImport.cxx | 27 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlStyleImport.hxx | 2 |
2 files changed, 15 insertions, 14 deletions
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 8d00021c2bf2..4c5337a07508 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -141,16 +141,17 @@ ODBFilter& OTableStyleContext::GetOwnImport() OTableStylesContext::OTableStylesContext( SvXMLImport& rImport, - sal_uInt16 nPrfx , - const OUString& rLName , - const Reference< XAttributeList > & xAttrList, - const sal_Bool bTempAutoStyles ) : - SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )), - sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )), - sCellStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )), - m_nNumberFormatIndex(-1), - bAutoStyles(bTempAutoStyles) + sal_uInt16 nPrfx , + const OUString& rLName , + const Reference< XAttributeList > & xAttrList, + const sal_Bool bTempAutoStyles ) + : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ) + , sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )) + , sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )) + , sCellStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )) + , m_nNumberFormatIndex(-1) + , m_nMasterPageNameIndex(-1) + , bAutoStyles(bTempAutoStyles) { } @@ -269,10 +270,10 @@ sal_Int32 OTableStylesContext::GetIndex(const sal_Int16 nContextID) } else if ( nContextID == CTF_DB_MASTERPAGENAME ) { - if (nMasterPageNameIndex == -1) - nMasterPageNameIndex = + if (m_nMasterPageNameIndex == -1) + m_nMasterPageNameIndex = GetImportPropertyMapper(XML_STYLE_FAMILY_TABLE_TABLE)->getPropertySetMapper()->FindEntryIndex(nContextID); - return nMasterPageNameIndex; + return m_nMasterPageNameIndex; } else return -1; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index a9fee3bb17a6..078946bce0ea 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -80,7 +80,7 @@ namespace dbaxml const OUString sColumnStyleServiceName; const OUString sCellStyleServiceName; sal_Int32 m_nNumberFormatIndex; - sal_Int32 nMasterPageNameIndex; + sal_Int32 m_nMasterPageNameIndex; sal_Bool bAutoStyles : 1; mutable UniReference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; |