diff options
Diffstat (limited to 'sw/source/filter/xml')
| -rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlimpit.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlithlp.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 69f982f1e8f7..577936ae59f2 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -897,7 +897,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( else { ::sax::Converter::convertColor(aOut, - rBrush.GetColor().GetColor()); + rBrush.GetColor()); } bOk = true; break; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 13f8591292cb..0c9566012c26 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -374,12 +374,10 @@ bool SvXMLImportItemMapper::PutXMLValue( } else if( !bColorFound && aToken.startsWith("#") ) { - sal_Int32 nColor(0); - bOk = ::sax::Converter::convertColor( nColor, aToken ); + bOk = ::sax::Converter::convertColor( aColor, aToken ); if( !bOk ) return false; - aColor = nColor; bColorFound = true; } else if( !bOffsetFound ) diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 6be60f48c2c7..4d7a5f3e09c6 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -112,9 +112,8 @@ bool sw_frmitems_parseXMLBorder( const OUString& rValue, { rHasStyle = true; } - else if (!rHasColor && ::sax::Converter::convertColor(nTemp, aToken)) + else if (!rHasColor && ::sax::Converter::convertColor(rColor, aToken)) { - rColor = nTemp; rHasColor = true; } else if( !rHasWidth && |