loplugin:expandablemethodds in include/filter

Change-Id: I92f0e19845e921701eb139e19493effa47908b39

5 files changed, 4 insertions, 7 deletions

diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 0e0fd263331d..7f8ca54ec11a 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -171,7 +171,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt
                     aOwnGlobalName = aGlbNm;
 
                     // flags for checking if conversion is wanted at all (SaveOptions?!)
-                    if( GetFlags() & pArr->nFlag )
+                    if( nConvertFlags & pArr->nFlag )
                     {
                         pExpFilter = SfxFilterMatcher().GetFilter4FilterName(OUString::createFromAscii(pArr->pFilterNm));
                         break;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 479c374fd665..2f57c2b7d489 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -351,7 +351,7 @@ void PptNotesAtom::Clear()
     nFlags = 0;
 }
 
-void PptColorSchemeAtom::Clear()
+PptColorSchemeAtom::PptColorSchemeAtom()
 {
     memset(&aData[0], 0, 32);
 }
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index 445e86d5f58c..6043bae832cd 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -45,7 +45,6 @@ class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects
     sal_uInt32 nConvertFlags;
 public:
     SvxMSExportOLEObjects( sal_uInt32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {}
-    sal_uInt32 GetFlags() const         { return nConvertFlags; }
 
     void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg );
     void ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg );
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 3495a05b197e..0f35c5ce83b6 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -98,12 +98,11 @@ public:
     Indent( bool binit = false )
     {
         if ( binit )
-            init();
+            TBBase::nIndent = 0;
         else
             TBBase::nIndent = TBBase::nIndent + 2;
     }
     ~Indent() { TBBase::nIndent = TBBase::nIndent - 2; }
-    static void init() { TBBase::nIndent = 0; }
 };
 
 
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index edab0cbdf297..22ab642f9e81 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -270,8 +270,7 @@ struct PptColorSchemeAtom
     sal_uInt8           aData[32];
 
 public:
-                        PptColorSchemeAtom () { Clear(); }
-    void                Clear();
+                        PptColorSchemeAtom();
     Color               GetColor( sal_uInt16 nNum ) const;
 
     friend SvStream& ReadPptColorSchemeAtom(SvStream& rIn, PptColorSchemeAtom& rAtom);