loplugin:expandablemethodds in include/sfx2

Change-Id: I1ec3ae33a71d154276e213a68c735476daa606b9

15 files changed, 12 insertions, 63 deletions

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 04f642c9c872..0f282a753aff 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -55,7 +55,6 @@ private:
 
     SAL_DLLPRIVATE void SetDialogData_Impl();
     SAL_DLLPRIVATE void GetDialogData_Impl();
-    SAL_DLLPRIVATE void init();
 
 protected:
     SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 98bd845d6208..284075ac211f 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -173,7 +173,6 @@ public:
     SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const;
     SAL_DLLPRIVATE void CreateWorkWindow_Impl();
     SAL_DLLPRIVATE void GrabFocusOnComponent_Impl();
-    SAL_DLLPRIVATE void SetInPlace_Impl( bool );
 
     SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc );
     SAL_DLLPRIVATE void LockResize_Impl( bool bLock );
@@ -191,7 +190,6 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
 {
     SfxFrame*               pFrame;
     SfxFrameWeakRef         wFrame;
-    SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; }
 
 public:
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 72763397d1a4..0c4d5b367443 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -463,7 +463,6 @@ public:
     void                        AvoidRecentDocs(bool bAvoid = true) { mbAvoidRecentDocs = bAvoid; }
 
     // Transfer IFace
-    void                        AbortImport();
     bool                        IsAbortingImport() const;
     void                        FinishedLoading( SfxLoadedFlags nWhich = SfxLoadedFlags::ALL );
     void                        TemplateDisconnectionAfterLoad();
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 1d316bf1c755..0c2a238092c8 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -61,8 +61,6 @@ public:
 
     void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId);
 
-    long GetThumbnailSize() const { return mnItemMaxSize;}
-
     static bool typeMatchesExtension(ApplicationType type, const OUString &rExt);
     static BitmapEx getDefaultThumbnail(const OUString &rURL);
 
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index f4e31efdf76d..b0ab881497dc 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -159,9 +159,6 @@ public:
 
     void updateThumbnailDimensions(long itemMaxSize);
 
-    long getThumbnailWidth() const  { return mnThumbnailWidth;}
-    long getThumbnailHeight() const {return mnThumbnailHeight;}
-
     void RemoveDefaultTemplateIcon( const OUString& rPath);
 
     static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index bb7ffd58d883..67fdadffec9b 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -120,8 +120,6 @@ public:
 
     SfxProgress*            GetProgress() const;
 
-    SfxObjectShell*         GetObjectShell() const { return m_xObjSh.get(); }
-
     void                    LockAdjustPosSizePixel()
                             { m_nAdjustPosPixelLock++; }
     void                    UnlockAdjustPosSizePixel()
@@ -182,9 +180,7 @@ public:
                                     WinBits nMessageStyle = 0);
     void              RemoveInfoBar(const OUString& sId);
 
-    SAL_DLLPRIVATE void SetDowning_Impl();
     SAL_DLLPRIVATE void GetDocNumber_Impl();
-    SAL_DLLPRIVATE bool IsDowning_Impl() const;
     SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh );
     SAL_DLLPRIVATE void ReleaseObjectShell_Impl();
 
@@ -196,7 +192,6 @@ public:
     SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ForceOuterResize_Impl();
-    SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const;
     SAL_DLLPRIVATE void UpdateDocument_Impl();
 
     SAL_DLLPRIVATE void LockObjectShell_Impl();
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 253c77c1f36c..84f73ceee3b1 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -242,7 +242,6 @@ public:
     virtual sal_uInt16          SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
     virtual bool                HasPrintOptionsPage() const;
     virtual VclPtr<SfxTabPage>  CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions );
-    static JobSetup             GetJobSetup();
     Printer*                    GetActivePrinter() const;
 
     // Working set
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 623e261af0c1..8ff3953f83f0 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -159,7 +159,7 @@ BitmapEx RecentDocsView::getDefaultThumbnail(const OUString &rURL)
 
 void RecentDocsView::insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId)
 {
-    RecentDocsViewItem *pChild = new RecentDocsViewItem(*this, rURL, rTitle, rThumbnail, nId, GetThumbnailSize());
+    RecentDocsViewItem *pChild = new RecentDocsViewItem(*this, rURL, rTitle, rThumbnail, nId, mnItemMaxSize);
 
     AppendItem(pChild);
 }
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index f60a4803a78c..a37dab2b76b0 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -152,8 +152,8 @@ void TemplateLocalView::Populate ()
             aProperties.aPath = aURL;
             aProperties.aRegionName = aRegionName;
             aProperties.aThumbnail = TemplateLocalView::fetchThumbnail(aURL,
-                                                                          getThumbnailWidth(),
-                                                                          getThumbnailHeight());
+                                                                          mnThumbnailWidth,
+                                                                          mnThumbnailHeight);
 
             pItem->maTemplates.push_back(aProperties);
             maAllTemplates.push_back(aProperties);
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2fdeef8d8f06..dd35973c024c 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -144,18 +144,13 @@ void SfxModalDialog::GetDialogData_Impl()
     }
 }
 
-void SfxModalDialog::init()
-{
-    GetDialogData_Impl();
-}
-
 SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
 :   ModalDialog(pParent, rID, rUIXMLDescription),
     nUniqId(0), //todo: remove this member when the ResId using ctor is removed
     pInputSet(nullptr),
     pOutputSet(nullptr)
 {
-    init();
+    GetDialogData_Impl();
 }
 
 SfxModalDialog::~SfxModalDialog()
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index b93fd1727890..3e8ee2201e83 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -170,12 +170,6 @@ sal_uInt16 const aTitleMap_Impl[3][2] =
 };
 
 
-void SfxObjectShell::AbortImport()
-{
-    pImpl->bIsAbortingImport = true;
-}
-
-
 bool SfxObjectShell::IsAbortingImport() const
 {
     return pImpl->bIsAbortingImport;
@@ -1341,7 +1335,7 @@ void SfxObjectShell::CancelTransfers()
 {
     if( ( pImpl->nLoadedFlags & SfxLoadedFlags::ALL ) != SfxLoadedFlags::ALL )
     {
-        AbortImport();
+        pImpl->bIsAbortingImport = true;
         if( IsLoading() )
             FinishedLoading();
     }
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index a4617bf3a1b4..fa2376f89cb6 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -549,7 +549,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const
 SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const
 {
     SfxFrameItem* pNew = new SfxFrameItem( wFrame);
-    pNew->SetFramePtr_Impl( pFrame );
+    pNew->pFrame = pFrame;
     return pNew;
 }
 
@@ -817,11 +817,6 @@ bool SfxFrame::IsInPlace() const
     return pImpl->bInPlace;
 }
 
-void SfxFrame::SetInPlace_Impl( bool bSet )
-{
-    pImpl->bInPlace = bSet;
-}
-
 void SfxFrame::Resize()
 {
     if ( IsClosing_Impl() )
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 6d00c6ffbd68..2672aa511926 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -401,7 +401,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
     // plugin mode
     sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode && ( nPluginMode != 2 ) )
-        SetInPlace_Impl( true );
+        pImpl->bInPlace = true;
 }
 
 bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9f024b5ab51f..da20f4013e0a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -202,16 +202,6 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
     return bResult;
 }
 
-void SfxViewFrame::SetDowning_Impl()
-{
-    m_pImpl->bIsDowning = true;
-}
-
-bool SfxViewFrame::IsDowning_Impl() const
-{
-    return m_pImpl->bIsDowning;
-}
-
 void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 {
     SfxFrame *pParent = GetFrame().GetParentFrame();
@@ -1083,7 +1073,7 @@ void SfxViewFrame::SetBorderPixelImpl
 {
     m_pImpl->aBorder = rBorder;
 
-    if ( IsResizeInToOut_Impl() && !GetFrame().IsInPlace() )
+    if ( m_pImpl->bResizeInToOut && !GetFrame().IsInPlace() )
     {
         Size aSize = pVSh->GetWindow()->GetOutputSizePixel();
         if ( aSize.Width() && aSize.Height() )
@@ -1121,7 +1111,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl() const
 
 void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
-    if( IsDowning_Impl())
+    if(m_pImpl->bIsDowning)
         return;
 
     // we know only SfxEventHint or simple SfxHint
@@ -1352,7 +1342,7 @@ SfxViewFrame::SfxViewFrame
 
 SfxViewFrame::~SfxViewFrame()
 {
-    SetDowning_Impl();
+    m_pImpl->bIsDowning = true;
 
     if ( SfxViewFrame::Current() == this )
         SfxViewFrame::SetViewFrame( nullptr );
@@ -1454,7 +1444,7 @@ SfxViewFrame* SfxViewFrame::GetNext
 
 SfxProgress* SfxViewFrame::GetProgress() const
 {
-    SfxObjectShell *pObjSh = GetObjectShell();
+    SfxObjectShell *pObjSh = m_xObjSh.get();
     return pObjSh ? pObjSh->GetProgress() : nullptr;
 }
 
@@ -1507,11 +1497,6 @@ void SfxViewFrame::ForceOuterResize_Impl()
     m_pImpl->bResizeInToOut = true;
 }
 
-bool SfxViewFrame::IsResizeInToOut_Impl() const
-{
-    return m_pImpl->bResizeInToOut;
-}
-
 void SfxViewFrame::GetDocNumber_Impl()
 {
     DBG_ASSERT( GetObjectShell(), "No Document!" );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 616af3e99c28..ca5baf74771f 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -614,7 +614,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
     StartPrint( rProps, bIsAPI, bIsDirect );
     // FIXME: job setup
     SfxPrinter* pDocPrt = GetPrinter();
-    JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
+    JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : JobSetup();
     Printer::PrintJob( GetPrinterController(), aJobSetup );
 }
 
@@ -899,9 +899,4 @@ bool SfxViewShell::HasPrintOptionsPage() const
     return false;
 }
 
-JobSetup SfxViewShell::GetJobSetup()
-{
-    return JobSetup();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */