diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-20 15:25:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-21 06:18:01 +0000 |
| commit | f0ae4082ebe554146ac6fba9894cfe7d2978a4a0 (patch) | |
| tree | 6c69f13adc753162bc8de31d4e939fcf002f7b49 /xmloff | |
| parent | ece0ff48fafce28691321e17420ebc64b3175594 (diff) | |
loplugin:expandablemethodds in include/xmloff
Change-Id: I6b1430220adaf240ef873ff908e3a767dfc278bf
Reviewed-on: https://gerrit.libreoffice.org/30106
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/prstylei.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/txtstyle.cxx | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 3bcbd912e0f1..e21998c6f06b 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -851,7 +851,7 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue } // return true only if no error occurred - return (GetErrorFlags() & (SvXMLErrorFlags::DO_NOTHING|SvXMLErrorFlags::ERROR_OCCURRED)) == SvXMLErrorFlags::NO; + return (mnErrorFlags & (SvXMLErrorFlags::DO_NOTHING|SvXMLErrorFlags::ERROR_OCCURRED)) == SvXMLErrorFlags::NO; } void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception) diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 2b34eec7eddd..387ca191bb2d 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -177,11 +177,6 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getFooterSet() return theFooterSet::get(); } -const OldFillStyleDefinitionSet& XMLPropStyleContext::getParaSet() -{ - return theParaSet::get(); -} - SvXMLImportContext *XMLPropStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -290,7 +285,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle)) { - deactivateOldFillStyleDefinitions(getParaSet()); + deactivateOldFillStyleDefinitions(theParaSet::get()); bDrawingLayerFillStylesUsed = true; } } diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index ef5282da8c4d..c26c09b90266 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -145,7 +145,7 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) bUsed, XML_STYLE_FAMILY_TEXT_TEXT ); // get shape export to make sure the frame family is added correctly. GetExport().GetShapeExport(); - exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetFramePropMapper(), + exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xFramePropMapper, bUsed, XML_STYLE_FAMILY_TEXT_FRAME); exportNumStyles( bUsed ); if( !IsBlockMode() ) |