loplugin:expandablemethods

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

38 files changed, 41 insertions, 134 deletions

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 559e529df658..7ceaaa79767b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -96,32 +96,23 @@ public:
     bool        isCmisDocument() const { return m_aCmisProperties.hasElements();}
 
     bool        isAutoloadEnabled() const { return m_isAutoloadEnabled; }
-    void        setAutoloadEnabled(bool i_val) { m_isAutoloadEnabled = i_val; }
     sal_Int32   getAutoloadDelay() const { return m_AutoloadDelay; }
-    void        setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; }
     const OUString& getAutoloadURL() const { return m_AutoloadURL; }
-    void        setAutoloadURL(const OUString& i_val) { m_AutoloadURL = i_val; }
     const OUString& getDefaultTarget() const { return m_DefaultTarget; }
-    void        setDefaultTarget(const OUString& i_val) { m_DefaultTarget = i_val; }
     const OUString& getTemplateName() const { return m_TemplateName; }
     const OUString& getAuthor() const { return m_Author; }
-    void        setAuthor(const OUString& i_val) { m_Author = i_val; }
 
     const css::util::DateTime&
                 getCreationDate() const { return m_CreationDate; }
     const OUString& getModifiedBy() const { return m_ModifiedBy; }
-    void        setModifiedBy(const OUString& i_val) { m_ModifiedBy = i_val; }
 
     const css::util::DateTime&
                 getModificationDate() const { return m_ModificationDate; }
     const OUString& getPrintedBy() const { return m_PrintedBy; }
-    void        setPrintedBy(const OUString& i_val) { m_PrintedBy = i_val; }
     const css::util::DateTime&
                 getPrintDate() const { return m_PrintDate; }
     sal_Int16   getEditingCycles() const { return m_EditingCycles; }
-    void        setEditingCycles(sal_Int16 i_val) { m_EditingCycles = i_val; }
     sal_Int32   getEditingDuration() const { return m_EditingDuration; }
-    void        setEditingDuration(sal_Int32 i_val) { m_EditingDuration = i_val; }
     const OUString& getDescription() const { return m_Description; }
     void        setDescription(const OUString& i_val) { m_Description = i_val; }
     const OUString& getKeywords() const { return m_Keywords; }
@@ -139,7 +130,6 @@ public:
     void        SetDeleteUserData( bool bSet );
     void        SetUseUserData( bool bSet );
     void        SetUseThumbnailSave( bool bSet );
-    bool        IsDeleteUserData() const { return m_bDeleteUserData;}
     bool        IsUseUserData() const { return m_bUseUserData;}
     bool        IsUseThumbnailSave() const { return m_bUseThumbnailSave;}
 
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 65fdd26ebefb..4eb2c6115e24 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -81,7 +81,6 @@ private:
     std::unique_ptr< SfxFrame_Impl >     pImpl;
     VclPtr<vcl::Window> pWindow;
 
-    void                Close();
     virtual             ~SfxFrame();
 
     SAL_DLLPRIVATE      SfxFrame( vcl::Window& i_rContainerWindow );
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index 0a02de481216..33ced4437582 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -43,9 +43,6 @@ public:
     virtual bool EventNotify(NotifyEvent& rEvent) override;
     virtual bool Close() override;
 
-    void SetReadyToDrag( bool bStartDrag ) { mbIsReadyToDrag = bStartDrag; }
-    bool IsReadyToDrag() const { return mbIsReadyToDrag; }
-
     void NotifyResize();
 
     using SfxDockingWindow::Close;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 8367cff4583b..cfd7fe068ae4 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -131,8 +131,6 @@ public:
     SfxViewFrame*           GetTopViewFrame() const;
 
     bool                    DoClose();
-    bool                    GetHasTitle() const
-                            { return GetFrame().GetHasTitle(); }
     static void             GetTargetList( TargetList& rList )
                             { SfxFrame::GetDefaultTargetList( rList ); }
 
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 24715b08edb9..e2aadca2d75f 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -42,7 +42,6 @@ public:
 
     virtual void Resize() override;
     virtual bool Command(const CommandEvent& rEvent) override;
-    static sal_uInt32 getColumnCount() { return nColCount; }
     Size const & GetIconSize() const { return aIconSize; }
 
     void SetRenameHdl( const Link<SvxPresetListBox*,void>& rLink )
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index d5fa188ed50f..582f4d83defe 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -317,7 +317,6 @@ private:
     // start a thread-search (or call SearchNextImpl directly, depending on the search mode)
     void ImplStartNextSearch();
 
-    SVX_DLLPRIVATE void clearControlTexts();
     SVX_DLLPRIVATE void fillControlTexts(const InterfaceArray& arrFields);
 
     // three methods implementing a complete search loop (null/not null, wildcard, SearchText)
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index f5bb333135aa..64a3c7e5cfc4 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -151,8 +151,6 @@ public:
     SAL_DLLPRIVATE void         SetDragPos(sal_uInt32 nPos) { nDragPos = nPos; }
     SAL_DLLPRIVATE sal_uInt32   GetDragPos() const { return nDragPos; }
 
-    SAL_DLLPRIVATE bool         IsThemeNameFromResource() const;
-
     bool                        IsReadOnly() const;
     bool                        IsDefault() const;
 
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 5d2d6cce610e..82c50321da6d 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -72,7 +72,6 @@ private:
     SVX_DLLPRIVATE void InsertLanguage(const LanguageType nLangType, sal_Int16 nType);
 
     SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const;
-    SVX_DLLPRIVATE void ImplClear();
     DECL_LINK(ChangeHdl, weld::ComboBox&, void);
 public:
     SvxLanguageBox(std::unique_ptr<weld::ComboBox> pControl);
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 426b0900be22..b6d9c46e3a47 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -67,14 +67,6 @@ namespace sdr
                 double fRotation = 0.0);
             virtual ~OverlayAnimatedBitmapEx() override;
 
-            const BitmapEx& getBitmapEx1() const { return maBitmapEx1; }
-            const BitmapEx& getBitmapEx2() const { return maBitmapEx2; }
-
-            sal_uInt16 getCenterX1() const { return mnCenterX1; }
-            sal_uInt16 getCenterY1() const { return mnCenterY1; }
-            sal_uInt16 getCenterX2() const { return mnCenterX2; }
-            sal_uInt16 getCenterY2() const { return mnCenterY2; }
-
             // execute event from base class sdr::animation::Event. Default
             // implementation does nothing and does not create a new event.
             virtual void Trigger(sal_uInt32 nTime) override;
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index 8998237ed6b3..41c65b208126 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -54,15 +54,6 @@ namespace sdr
                 double fShearX = 0.0,
                 double fRotation = 0.0);
             virtual ~OverlayBitmapEx() override;
-
-            const BitmapEx& getBitmapEx() const { return maBitmapEx; }
-
-            sal_uInt16 getCenterX() const { return mnCenterX; }
-            sal_uInt16 getCenterY() const { return mnCenterY; }
-
-            // get shearX and rotation
-            double getShearX() const { return mfShearX; }
-            double getRotation() const { return mfRotation; }
         };
     } // end of namespace overlay
 } // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index 15fad54a705b..a7fbe0cb6200 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -42,12 +42,6 @@ namespace sdr
                 const basegfx::B2DPoint& rThirdPos,
                 Color aTriangleColor);
             virtual ~OverlayTriangle() override;
-
-            // get second position
-            const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-
-            // get third position
-            const basegfx::B2DPoint& getThirdPosition() const { return maThirdPosition; }
         };
     } // end of namespace overlay
 } // end of namespace sdr
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index d8ca1db6b735..287ec01b6195 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -97,7 +97,6 @@ public:
     ~SdrPaintWindow();
 
     // data read accesses
-    SdrPaintView& GetPaintView() const { return mrPaintView; }
     OutputDevice& GetOutputDevice() const { return *mpOutputDevice; }
     vcl::Window* GetWindow() const { return mpWindow; }
 
@@ -118,9 +117,6 @@ public:
 
     void SetOutputToWindow(bool bOutputToWindow) { mbOutputToWindow = bOutputToWindow; }
 
-    // Is OutDev a VirtualDevice?
-    bool OutputIsVirtualDevice() const { return mpOutputDevice->IsVirtual(); }
-
     // Is OutDev a recording MetaFile?
     bool OutputToRecordingMetaFile() const;
 
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 781be5e52651..9efb73172db9 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -121,7 +121,6 @@ public:
     SdrGluePointList() {};
     SdrGluePointList(const SdrGluePointList& rSrcList) { *this=rSrcList; }
 
-    void                Clear();
     SdrGluePointList&   operator=(const SdrGluePointList& rSrcList);
     sal_uInt16          GetCount() const                                    { return sal_uInt16(aList.size()); }
     // At insert, the object (GluePoint) automatically gets an ID assigned.
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index 1afb7a139e03..acbc98dc9384 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -64,7 +64,6 @@ class SVX_DLLPUBLIC SdrHelpLineList {
 public:
     SdrHelpLineList() {}
     SdrHelpLineList(const SdrHelpLineList& rSrcList) { *this=rSrcList; }
-    void               Clear();
     SdrHelpLineList&   operator=(const SdrHelpLineList& rSrcList);
     bool operator==(const SdrHelpLineList& rCmp) const;
     bool operator!=(const SdrHelpLineList& rCmp) const                 { return !operator==(rCmp); }
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index fe5884b33809..2a3fd7717545 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -90,8 +90,6 @@ private:
     // was done
     SdrPageWindow* mpPreparedPageWindow;
 
-    // interface to SdrPageWindow
-    void ClearPageWindows();
 public:
     sal_uInt32 PageWindowCount() const { return maPageWindows.size(); }
     SdrPageWindow* FindPageWindow( SdrPaintWindow& rPaintWindow ) const;
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 2f13e170914c..e925bac26b6c 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -300,7 +300,7 @@ void OGroup::setSection(     const OUString& _sProperty
 
         // create section if needed
         if ( _bOn && !_member.is() )
-            _member = OSection::createOSection(this, getContext());
+            _member = OSection::createOSection(this, m_xContext);
         else if ( !_bOn )
             ::comphelper::disposeComponent(_member);
 
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index ef2587bd36bd..80f54a9270eb 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -159,8 +159,6 @@ namespace reportdesign
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
-
-        const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return m_xContext; }
     };
 
 } // namespace reportdesign
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 6c454eda45d0..cf22621347bf 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -98,7 +98,7 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr
                     XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName)));
                 if ( !pStyle )
                 {
-                    OReportStylesContext* pMyStyles = dynamic_cast< OReportStylesContext *>(GetOwnImport().GetAutoStyles());
+                    OReportStylesContext* pMyStyles = dynamic_cast< OReportStylesContext *>(m_rImport.GetAutoStyles());
                     if ( pMyStyles )
                         pStyle = const_cast<SvXMLNumFormatContext*>(dynamic_cast< const SvXMLNumFormatContext *>(pMyStyles->
                             FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, true)));
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index e5fce77c154a..a75f290fd4cb 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -44,8 +44,6 @@ namespace rptxml
         sal_Int32                   m_nNumberFormat;
         ORptFilter&                 m_rImport;
 
-        ORptFilter& GetOwnImport() const { return m_rImport;}
-
         OControlStyleContext(const OControlStyleContext&) = delete;
         void operator =(const OControlStyleContext&) = delete;
     protected:
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index b24849e9a8ce..341430cde531 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -276,7 +276,7 @@ void OAddFieldWindow::fillDescriptor(const weld::TreeIter& rSelected, svx::OData
 
         rDescriptor[ svx::DataAccessDescriptorProperty::Command ]            <<= GetCommand();
         rDescriptor[ svx::DataAccessDescriptorProperty::CommandType ]        <<= GetCommandType();
-        rDescriptor[ svx::DataAccessDescriptorProperty::EscapeProcessing ]   <<= GetEscapeProcessing();
+        rDescriptor[ svx::DataAccessDescriptorProperty::EscapeProcessing ]   <<= m_bEscapeProcessing;
         rDescriptor[ svx::DataAccessDescriptorProperty::Connection ]         <<= getConnection();
 
         ColumnInfo* pInfo = reinterpret_cast<ColumnInfo*>(m_xListBox->get_id(rSelected).toInt64());
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index b5397b284fc3..a15c8091f13b 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -85,7 +85,6 @@ public:
 
     const OUString&       GetCommand()            const { return m_aCommandName; }
     sal_Int32                    GetCommandType()        const { return m_nCommandType; }
-    bool                     GetEscapeProcessing()   const { return m_bEscapeProcessing; }
     void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; }
 
     css::uno::Reference< css::sdbc::XConnection>              getConnection() const;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index a7411825050b..fb14c106db64 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -328,15 +328,15 @@ bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
 
 void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor)
 {
-    setAuthor(i_rAuthor);
+    m_Author = i_rAuthor;
     DateTime now( DateTime::SYSTEM );
     m_CreationDate = now.GetUNODateTime();
-    setModifiedBy(OUString());
-    setPrintedBy(OUString());
+    m_ModifiedBy = OUString();
+    m_PrintedBy = OUString();
     m_ModificationDate = util::DateTime();
     m_PrintDate = util::DateTime();
-    setEditingDuration(0);
-    setEditingCycles(1);
+    m_EditingDuration = 0;
+    m_EditingCycles = 1;
 }
 
 
@@ -472,7 +472,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
             bValue = IsUseThumbnailSave();
             break;
         case MID_DOCINFO_DELETEUSERDATA:
-            bValue = IsDeleteUserData();
+            bValue = m_bDeleteUserData;
             break;
         case MID_DOCINFO_AUTOLOADENABLED:
             bValue = isAutoloadEnabled();
@@ -547,22 +547,22 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
         case MID_DOCINFO_AUTOLOADENABLED:
             bRet = (rVal >>= bValue);
             if ( bRet )
-                setAutoloadEnabled(bValue);
+                m_isAutoloadEnabled = bValue;
             break;
         case MID_DOCINFO_AUTOLOADSECS:
             bRet = (rVal >>= nValue);
             if ( bRet )
-                setAutoloadDelay(nValue);
+                m_AutoloadDelay = nValue;
             break;
         case MID_DOCINFO_AUTOLOADURL:
             bRet = (rVal >>= aValue);
             if ( bRet )
-                setAutoloadURL(aValue);
+                m_AutoloadURL = aValue;
             break;
         case MID_DOCINFO_DEFAULTTARGET:
             bRet = (rVal >>= aValue);
             if ( bRet )
-                setDefaultTarget(aValue);
+                m_DefaultTarget = aValue;
             break;
         case MID_DOCINFO_DESCRIPTION:
             bRet = (rVal >>= aValue);
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index bf8d8587b1c2..24febe4f4aec 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -126,9 +126,6 @@ class DocTempl_EntryData_Impl
     OUString            maOwnURL;
     OUString            maTargetURL;
 
-private:
-    RegionData_Impl*    GetParent() const { return mpParent; }
-
 public:
                         DocTempl_EntryData_Impl( RegionData_Impl* pParent,
                                         const OUString& rTitle );
@@ -162,7 +159,6 @@ class RegionData_Impl
 private:
     size_t                      GetEntryPos( const OUString& rTitle,
                                              bool& rFound ) const;
-    const SfxDocTemplate_Impl*  GetParent() const { return mpParent; }
 
 public:
                         RegionData_Impl( const SfxDocTemplate_Impl* pParent,
@@ -1282,7 +1278,7 @@ const OUString& DocTempl_EntryData_Impl::GetHierarchyURL()
 {
     if ( maOwnURL.isEmpty() )
     {
-        INetURLObject aTemplateObj( GetParent()->GetHierarchyURL() );
+        INetURLObject aTemplateObj( mpParent->GetHierarchyURL() );
 
         aTemplateObj.insertName( GetTitle(), false,
                      INetURLObject::LAST_SEGMENT,
@@ -1387,7 +1383,7 @@ const OUString& RegionData_Impl::GetHierarchyURL()
 {
     if ( maOwnURL.isEmpty() )
     {
-        INetURLObject aRegionObj( GetParent()->GetRootURL() );
+        INetURLObject aRegionObj( mpParent->GetRootURL() );
 
         aRegionObj.insertName( GetTitle(), false,
                      INetURLObject::LAST_SEGMENT,
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index c354da362d74..bb913838264b 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -217,14 +217,14 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
         {
             tools::Rectangle aGrip = mpSidebarController->GetDeckDragArea();
             if ( aGrip.IsInside( mEvt->GetPosPixel() ) )
-                SetReadyToDrag( true );
+                mbIsReadyToDrag = true;
         }
     }
     else if (MouseNotifyEvent::MOUSEMOVE == nType)
     {
         const MouseEvent *mEvt = rEvent.GetMouseEvent();
         tools::Rectangle aGrip = mpSidebarController->GetDeckDragArea();
-        if (mEvt->IsLeft() && aGrip.IsInside( mEvt->GetPosPixel() ) && IsReadyToDrag() )
+        if (mEvt->IsLeft() && aGrip.IsInside( mEvt->GetPosPixel() ) && mbIsReadyToDrag )
         {
             Point aPos = mEvt->GetPosPixel();
             vcl::Window* pWindow = rEvent.GetWindow();
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index ac7245e45966..945f6a5c027e 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -162,7 +162,7 @@ void SfxFrame::DoClose_Impl()
     if ( pImpl->bOwnsBindings )
         DELETEZ( pBindings );
 
-    Close();
+    delete this;
 }
 
 bool SfxFrame::DocIsModified_Impl()
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 6fba3d141685..ba228e37e0d5 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -354,11 +354,6 @@ SystemWindow* SfxFrame::GetTopWindow_Impl() const
 }
 
 
-void SfxFrame::Close()
-{
-    delete this;
-}
-
 void SfxFrame::LockResize_Impl( bool bLock )
 {
     pImpl->bLockResize = bLock;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f0cf80dbe8f3..81f9d1fd4bdd 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1145,7 +1145,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
             m_xObjSh->DoClose();
         SfxObjectShellRef xDyingObjSh = m_xObjSh;
         m_xObjSh.clear();
-        if( GetHasTitle() && m_pImpl->nDocViewNo )
+        if( GetFrame().GetHasTitle() && m_pImpl->nDocViewNo )
             xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImpl->nDocViewNo-1);
         if ( m_pImpl->bObjLocked )
         {
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 1f819f0974d1..bf7d4e1096ee 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -186,11 +186,6 @@ void SvxLanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTy
     }
 }
 
-void SvxLanguageBox::ImplClear()
-{
-    m_xControl->clear();
-}
-
 void SvxLanguageBox::SetLanguageList( SvxLanguageListFlags nLangList,
         bool bHasLangNone, bool bLangNoneIsLangAll, bool bCheckSpellAvail )
 {
@@ -200,7 +195,7 @@ void SvxLanguageBox::SetLanguageList( SvxLanguageListFlags nLangList,
 
     if (SvxLanguageListFlags::EMPTY == nLangList)
     {
-        ImplClear();
+        m_xControl->clear();
         return;
     }
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index fb01b66e9524..379649a65f6e 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -605,15 +605,9 @@ bool FmSearchEngine::GetCaseSensitive() const
 }
 
 
-void FmSearchEngine::clearControlTexts()
-{
-    m_aControlTexts.clear();
-}
-
-
 void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 {
-    clearControlTexts();
+    m_aControlTexts.clear();
     Reference< XInterface >  xCurrent;
     for (const auto & rField : arrFields)
     {
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index fa3ab3ea9167..ee91ac4ee9bd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1304,7 +1304,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     const long      nReservePos = rOStm.Tell();
     std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 ));
 
-    rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up
+    rOStm.WriteUInt32( GetId() ).WriteBool( pThm->IsNameFromResource() ); // From version 2 and up
 
     pCompat.reset();
 
@@ -1466,7 +1466,6 @@ const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL();
 const INetURLObject& GalleryTheme::GetStrURL() const { return pThm->GetStrURL(); }
 sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
 void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
-bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
 bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
 bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
 
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index e40ffe2f2a7d..e358b1b01216 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -34,10 +34,10 @@ namespace sdr
             {
                 const drawinglayer::primitive2d::Primitive2DReference aPrimitive(
                     new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                        getBitmapEx1(),
+                        maBitmapEx1,
                         getBasePosition(),
-                        getCenterX1(),
-                        getCenterY1(),
+                        mnCenterX1,
+                        mnCenterY1,
                         getShearX(),
                         getRotation()));
 
@@ -47,10 +47,10 @@ namespace sdr
             {
                 const drawinglayer::primitive2d::Primitive2DReference aPrimitive(
                     new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                        getBitmapEx2(),
+                        maBitmapEx2,
                         getBasePosition(),
-                        getCenterX2(),
-                        getCenterY2(),
+                        mnCenterX2,
+                        mnCenterY2,
                         getShearX(),
                         getRotation()));
 
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 0d7995b1c3a6..647522204a03 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -32,12 +32,12 @@ namespace sdr
         {
             drawinglayer::primitive2d::Primitive2DReference aReference(
                 new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
-                    getBitmapEx(),
+                    maBitmapEx,
                     getBasePosition(),
-                    getCenterX(),
-                    getCenterY(),
-                    getShearX(),
-                    getRotation()));
+                    mnCenterX,
+                    mnCenterY,
+                    mfShearX,
+                    mfRotation));
 
             if(basegfx::fTools::more(mfAlpha, 0.0))
             {
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index 3cd98e349af7..0938b50aa184 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -37,8 +37,8 @@ namespace sdr
             basegfx::B2DPolygon aPolygon;
 
             aPolygon.append(getBasePosition());
-            aPolygon.append(getSecondPosition());
-            aPolygon.append(getThirdPosition());
+            aPolygon.append(maSecondPosition);
+            aPolygon.append(maThirdPosition);
             aPolygon.setClosed(true);
 
             const drawinglayer::primitive2d::Primitive2DReference aReference(
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();
     }
 }
 
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index effc9fce5fd5..fef60dc90f34 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -60,7 +60,7 @@ bool SvxPresetListBox::Command(const CommandEvent& rEvent)
 
 void SvxPresetListBox::DrawLayout()
 {
-    SetColCount(getColumnCount());
+    SetColCount(nColCount);
     SetLineCount(5);
 }