loplugin:expandablemethodds in filter..forms

Change-Id: Ic1f64f804acc10b1a48d82de9fc6a2b39af465a0
Reviewed-on: https://gerrit.libreoffice.org/30014
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 5 insertions, 29 deletions

diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 44672ed5e29e..caa2c4263bf2 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -154,7 +154,7 @@ sal_uInt16 DXFGroupReader::Read()
     if ( !bStatus )
     {
         nG = 0;
-        SetS();
+        S = "EOF";
         if ( nGCount != 0xffffffff )
         {
             // InfoBox(NULL,String("Error in group # ")+String(nGCount)).Execute();
@@ -165,11 +165,6 @@ sal_uInt16 DXFGroupReader::Read()
     return nG;
 }
 
-void DXFGroupReader::SetS()
-{
-    S = "EOF";
-}
-
 long DXFGroupReader::ReadI()
 {
     OString s = DXFReadLine(rIS);
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index 822820859acc..c936b33b428b 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -59,11 +59,6 @@ public:
         // This read must have returned a group code for datatype String.
         // If not NULL is returend
 
-    // The following methods can change the current values of group codes
-    // (e.g. to set default values, before 'blindly' reading lots of groups)
-
-    void SetS(); // (will be copied)
-
 private:
 
     long   ReadI();
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 838e2702bffe..4373e51a1698 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -252,7 +252,7 @@ void DXFRepresentation::ReadHeader(DXFGroupReader & rDGR)
                     continue;
 
                 // If we already use UTF8, then don't update encoding anymore
-                if (isTextEncodingUTF8())
+                if (mEnc == RTL_TEXTENCODING_UTF8)
                     continue;
                 // FIXME: we really need a whole table of
                 // $DWGCODEPAGE to encodings mappings
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx
index 66cc747b41cd..a7e15b274a33 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx
@@ -111,7 +111,6 @@ private:
                          DXFBoundingBox & rBox);
 
     bool isTextEncodingSet() const { return mEnc != RTL_TEXTENCODING_DONTKNOW; }
-    bool isTextEncodingUTF8() const { return mEnc == RTL_TEXTENCODING_UTF8; }
 };
 
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 92e887d7e1fd..6c67b1ee15cb 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -178,7 +178,7 @@ void Impl_OlePres::Write( SvStream & rStm )
     sal_uLong nPos = rStm.Tell();
     rStm.WriteInt32( 0 );
 
-    if( GetFormat() == SotClipboardFormatId::GDIMETAFILE && pMtf )
+    if( nFormat == SotClipboardFormatId::GDIMETAFILE && pMtf )
     {
         // Always to 1/100 mm, until Mtf-Solution found
         // Assumption (no scaling, no origin translation)
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index ee1767c5c05e..608ca8f71a64 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -50,7 +50,6 @@ public:
                     delete pMtf;
                 pMtf = new GDIMetaFile( rMtf );
             }
-    SotClipboardFormatId GetFormat() const { return nFormat; }
     void                 SetAspect( sal_uInt16 nAsp ) { nAspect = nAsp; }
     void                 SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; }
     void                 SetSize( const Size & rSize ) { aSize = rSize; }
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index d4186ed8af71..ff1fac9117ec 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -153,7 +153,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void )
     }
     else if (m_pPBClose == pButton)
     {
-        onClose();
+        Close();
     }
 
     m_bIsClosable = true;
@@ -976,11 +976,6 @@ void XMLFilterSettingsDialog::onOpen()
     }
 }
 
-void XMLFilterSettingsDialog::onClose()
-{
-    Close();
-}
-
 bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
 {
     // Because of tab control first call the base class.
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 40f269861d7c..a44e5da01637 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -100,7 +100,6 @@ public:
     void    onDelete();
     void    onSave();
     void    onOpen();
-    void    onClose();
 
     void    updateStates();
 
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 5c81b608edc9..686d1427cf78 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -587,11 +587,6 @@ void XMLFilterTestDialog::onImportBrowse()
     initDialog();
 }
 
-void XMLFilterTestDialog::onImportRecentDocument()
-{
-    import( m_sImportRecentFile );
-}
-
 void XMLFilterTestDialog::import( const OUString& rURL )
 {
     try
@@ -671,7 +666,7 @@ IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void )
     }
     else if (m_pPBRecentFile == pButton)
     {
-        onImportRecentDocument();
+        import( m_sImportRecentFile );
     }
     else if (m_pPBClose == pButton)
     {
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 64144fa60d84..a9f79873e73b 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -49,7 +49,6 @@ private:
     void onExportBrowse();
     void onExportCurrentDocument();
     void onImportBrowse();
-    void onImportRecentDocument();
     void initDialog();
 
     css::uno::Reference< css::lang::XComponent > getFrontMostDocument( const OUString& rServiceName );