loplugin:expandablemethods

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

4 files changed, 5 insertions, 20 deletions

diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index f4b959ce435d..6f396c7540ed 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -233,7 +233,7 @@ void SdrPaintWindow::impCreateOverlayManager()
 {
     // not yet one created?
     if(!mxOverlayManager.is())
-        mxOverlayManager = GetPaintView().CreateOverlayManager(GetOutputDevice());
+        mxOverlayManager = mrPaintView.CreateOverlayManager(GetOutputDevice());
 }
 
 SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, vcl::Window* pWindow)
@@ -280,7 +280,7 @@ void SdrPaintWindow::PreparePreRenderDevice()
     const bool bPrepareBufferedOutput(
         mrPaintView.IsBufferedOutputAllowed()
         && !OutputToPrinter()
-        && !OutputIsVirtualDevice()
+        && !mpOutputDevice->IsVirtual()
         && !OutputToRecordingMetaFile());
 
     if(bPrepareBufferedOutput)
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 2f9d53028988..01235398a9d2 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -277,14 +277,9 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO
 }
 
 
-void SdrGluePointList::Clear()
-{
-    aList.clear();
-}
-
 SdrGluePointList& SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 {
-    if (GetCount()!=0) Clear();
+    if (GetCount()!=0) aList.clear();
     sal_uInt16 nCount=rSrcList.GetCount();
     for (sal_uInt16 i=0; i<nCount; i++) {
         Insert(rSrcList[i]);
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index d27221fb4014..dee11e58c95d 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -74,14 +74,9 @@ tools::Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
     return aRet;
 }
 
-void SdrHelpLineList::Clear()
-{
-    aList.clear();
-}
-
 SdrHelpLineList& SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
 {
-    Clear();
+    aList.clear();
     sal_uInt16 nCount=rSrcList.GetCount();
     for (sal_uInt16 i=0; i<nCount; i++) {
         Insert(rSrcList[i]);
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 950660669bad..2daa1961b598 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -95,11 +95,6 @@ SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const
     return maPageWindows[nIndex].get();
 }
 
-void SdrPageView::ClearPageWindows()
-{
-    maPageWindows.clear();
-}
-
 SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
 :   mrView(rNewView),
     // col_auto color lets the view takes the default SvxColorConfig entry
@@ -197,7 +192,7 @@ void SdrPageView::Hide()
             InvalidateAllWin();
         }
         mbVisible = false;
-        ClearPageWindows();
+        maPageWindows.clear();
     }
 }