[Libreoffice-commits] core.git: include/xmloff xmloff/source

[Noel Grandin]

 include/xmloff/prstylei.hxx      |    1 -
 include/xmloff/txtparae.hxx      |    4 ----
 include/xmloff/xmlexp.hxx        |    3 ---
 xmloff/source/core/xmlexp.cxx    |    2 +-
 xmloff/source/style/prstylei.cxx |    7 +------
 xmloff/source/text/txtstyle.cxx  |    2 +-
 6 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit f0ae4082ebe554146ac6fba9894cfe7d2978a4a0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Oct 20 15:25:50 2016 +0200

    loplugin:expandablemethodds in include/xmloff
    
    Change-Id: I6b1430220adaf240ef873ff908e3a767dfc278bf
    Reviewed-on: https://gerrit.libreoffice.org/30106
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 95a7357..57f451c 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -75,7 +75,6 @@ protected:
     static const OldFillStyleDefinitionSet& getStandardSet();
     static const OldFillStyleDefinitionSet& getHeaderSet();
     static const OldFillStyleDefinitionSet& getFooterSet();
-    static const OldFillStyleDefinitionSet& getParaSet();
 
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index c4f391a..1c46342 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -218,10 +218,6 @@ public:
         return xTextPropMapper;
     }
 
-    const rtl::Reference < SvXMLExportPropertyMapper >& GetFramePropMapper() const
-    {
-        return xFramePropMapper;
-    }
     const rtl::Reference < SvXMLExportPropertyMapper >& GetAutoFramePropMapper() const
     {
         return xAutoFramePropMapper;
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index a8d85af..2c9ed6d 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -517,9 +517,6 @@ public:
         sal_Int32 nId,
         const css::uno::Sequence< OUString> & rMsgParams);
 
-    /** return current error flags (logical 'or' of all error flags so far) */
-    SvXMLErrorFlags GetErrorFlags()  { return mnErrorFlags; }
-
     virtual void DisposingModel();
 
     ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper();
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3bcbd91..e21998c 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 2b34eec..387ca19 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 ef5282d..c26c09b 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() )