loplugin:expandablemethods in drawinglayer..editeng

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

7 files changed, 14 insertions, 66 deletions

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a07819142855..2b621f43fefc 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -585,16 +585,6 @@ namespace accessibility
                                                              aEvent );
     }
 
-    void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
-    {
-        FireEvent( nEventId, rNewValue );
-    }
-
-    void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
-    {
-        FireEvent( nEventId, uno::Any(), rOldValue );
-    }
-
     void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
     {
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
@@ -602,7 +592,7 @@ namespace accessibility
             !pStateSet->contains(nStateId) )
         {
             pStateSet->AddState( nStateId );
-            GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+            FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
         }
     }
 
@@ -613,7 +603,7 @@ namespace accessibility
             pStateSet->contains(nStateId) )
         {
             pStateSet->RemoveState( nStateId );
-            LostPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+            FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
         }
     }
 
@@ -2798,17 +2788,8 @@ namespace accessibility
 
     uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
     {
-
-        const OUString sServiceName( getServiceName() );
-        return uno::Sequence< OUString > (&sServiceName, 1);
-    }
-
-    // XServiceName
-    OUString SAL_CALL AccessibleEditableTextPara::getServiceName() throw (uno::RuntimeException)
-    {
-
         // #105185# Using correct service now
-        return OUString("com.sun.star.text.AccessibleParagraphView");
+        return { OUString("com.sun.star.text.AccessibleParagraphView") };
     }
 
 }  // end of namespace accessibility
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 466a339ae428..9075690e60f6 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -438,18 +438,6 @@ namespace accessibility
                                                          aEvent );
     }
 
-    void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
-    {
-
-        FireEvent( nEventId, rNewValue );
-    }
-
-    void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
-    {
-
-        FireEvent( nEventId, uno::Any(), rOldValue );
-    }
-
     void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
     {
 
@@ -458,7 +446,7 @@ namespace accessibility
             !pStateSet->contains(nStateId) )
         {
             pStateSet->AddState( nStateId );
-            GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+            FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
         }
     }
 
@@ -470,7 +458,7 @@ namespace accessibility
             pStateSet->contains(nStateId) )
         {
             pStateSet->RemoveState( nStateId );
-            LostPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+            FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
         }
     }
 
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 3ada3d3fb264..32450049235e 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -193,7 +193,7 @@ void EditView::InvalidateOtherViewWindows( const Rectangle& rInvRect )
 {
     if (comphelper::LibreOfficeKit::isActive())
     {
-        for (auto& pWin: GetOtherViewWindows())
+        for (auto& pWin : pImpEditView->aOutWindowSet)
         {
             if (pWin)
                 pWin->Invalidate( rInvRect );
@@ -313,11 +313,6 @@ vcl::Window* EditView::GetWindow() const
     return pImpEditView->pOutWin;
 }
 
-EditView::OutWindowSet&  EditView::GetOtherViewWindows()
-{
-    return pImpEditView->aOutWindowSet;
-}
-
 bool EditView::HasOtherViewWindow( vcl::Window* pWin )
 {
     OutWindowSet& rOutWindowSet = pImpEditView->aOutWindowSet;
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index b952a66ff2a4..08563bc72cab 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -35,10 +35,10 @@ class EditHTMLParser : public HTMLParser
 {
     using HTMLParser::CallParser;
 private:
-    OUStringBuffer maStyleSource;
+    OUStringBuffer          maStyleSource;
     EditSelection           aCurSel;
     OUString                aBaseURL;
-    EditEngine* mpEditEngine;
+    EditEngine*             mpEditEngine;
     AnchorInfo*             pCurAnchor;
 
     bool                    bInPara:1;
@@ -46,9 +46,9 @@ private:
     bool                    bFieldsInserted:1;
     bool                    bInTitle:1;
 
-    sal_uInt8                   nInTable;
-    sal_uInt8                   nInCell;
-    sal_uInt8                   nDefListLevel;
+    sal_uInt8               nInTable;
+    sal_uInt8               nInCell;
+    sal_uInt8               nDefListLevel;
 
     void                    StartPara( bool bReal );
     void                    EndPara( bool bReal );
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 927b947b3d2a..3248ba34f51e 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -551,11 +551,6 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
     return pEditEngine->GetDefaultHorizontalTextDirection();
 }
 
-SvtScriptType Outliner::GetScriptType( const ESelection& rSelection ) const
-{
-    return pEditEngine->GetScriptType( rSelection );
-}
-
 LanguageType Outliner::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const
 {
     return pEditEngine->GetLanguage( nPara, nPos );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index e9ff45b7d053..ccd8b9a99e48 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -168,7 +168,7 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara )
 
     if( !pEditEngine->IsInUndo() )
     {
-        ParagraphRemovingHdl(pPara);
+        aParaRemovingHdl.Call( { this, pPara } );
     }
 
     pParaList->Remove( nPara );
@@ -820,7 +820,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
     if ( !pEditEngine->IsFlatMode() )
     {
         ESelection aSel( nPara, 0, nPara, 0 );
-        aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), GetScriptType( aSel ) );
+        aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), pEditEngine->GetScriptType( aSel ) );
     }
     else
     {
@@ -1344,13 +1344,6 @@ void Outliner::ParagraphInsertedHdl(Paragraph* pPara)
 }
 
 
-void Outliner::ParagraphRemovingHdl(Paragraph* pPara)
-{
-    if( !IsInUndo() )
-        aParaRemovingHdl.Call( { this, pPara } );
-}
-
-
 void Outliner::DepthChangedHdl(Paragraph* pPara, ParaFlag nPrevFlags)
 {
     if( !IsInUndo() )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index e100da2641cb..cce2d8e5751b 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1749,15 +1749,11 @@ namespace
         }
     };
 }
-uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getStaticTypes() throw()
-{
-    return theSvxUnoTextBaseTypes::get();
-}
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes()
     throw (uno::RuntimeException, std::exception)
 {
-    return getStaticTypes();
+    return theSvxUnoTextBaseTypes::get();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId()