[Libreoffice-commits] core.git: compilerplugins/clang editeng/inc editeng/source include/editeng

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sat Sep 28 07:00:09 UTC 2019


 compilerplugins/clang/virtualdead.results |    3 ---
 editeng/inc/edtspell.hxx                  |    1 -
 editeng/source/editeng/edtspell.cxx       |    5 -----
 editeng/source/misc/splwrap.cxx           |   15 +--------------
 include/editeng/splwrap.hxx               |    1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit dd5947b852a2c84e6d35ca6d1e4cb0fd09a49b8d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 26 13:41:06 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 28 08:59:30 2019 +0200

    loplugin:virtualdead in editeng
    
    Change-Id: I72f9cf62f9daeaed5108ede41dd41544204a9745
    Reviewed-on: https://gerrit.libreoffice.org/79643
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 37118ffe3d6f..740ef0bedbd6 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -70,9 +70,6 @@ include/canvas/base/graphicdevicebase.hxx:319
 include/connectivity/sdbcx/IRefreshable.hxx:31
     void connectivity::sdbcx::IRefreshableGroups::refreshGroups()
     empty
-include/editeng/splwrap.hxx:105
-    _Bool SvxSpellWrapper::HasOtherCnt()
-    0
 include/filter/msfilter/msdffimp.hxx:546
     _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
     1
diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 53565fd71d9e..d21ce140cf8c 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -48,7 +48,6 @@ protected:
     virtual void            SpellContinue() override;    // Check area
     virtual void            ReplaceAll( const OUString &rNewText ) override;
     virtual bool            SpellMore() override;
-    virtual bool            HasOtherCnt() override;
 
 public:
     EditSpellWrapper( vcl::Window* pWin,
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 9d6b86f6d414..93bdb213da52 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -108,11 +108,6 @@ void EditSpellWrapper::SpellContinue()
     SetLast( pEditView->GetImpEditEngine()->ImpSpell( pEditView ) );
 }
 
-bool EditSpellWrapper::HasOtherCnt()
-{
-    return false;
-}
-
 bool EditSpellWrapper::SpellMore()
 {
     EditEngine* pEE = pEditView->GetEditEngine();
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 5e9cddc5d841..a7b582b66d6a 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -230,12 +230,6 @@ void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ )
 } // given area.
 
 
-bool SvxSpellWrapper::HasOtherCnt()
-{
-    return false; // Is there a special area?
-}
-
-
 bool SvxSpellWrapper::SpellMore()
 {
     return false; // Should additional documents be examined?
@@ -343,14 +337,7 @@ bool SvxSpellWrapper::SpellNext( )
     }
     else if ( bStartDone && bEndDone )
     {
-        bool bIsSpellSpecial = xProp.is() && xProp->getIsSpellSpecial();
-        // Body area done, ask for special area
-        if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
-        {
-            SpellStart( SvxSpellArea::Other );
-            bOtherCntnt = bGoOn = true;
-        }
-        else if ( SpellMore() )  // check another document?
+        if ( SpellMore() )  // check another document?
         {
             bOtherCntnt = false;
             bStartDone = !bReverse;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 705fedd8ea33..c73a778983c0 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -102,7 +102,6 @@ protected:
     void             SetLast(const css::uno::Reference< css::uno::XInterface >  &xNewLast)
                             { xLast = xNewLast; }
     virtual bool SpellMore();               // examine further documents?
-    virtual bool HasOtherCnt();             // Are there any special areas?
     virtual void SpellStart( SvxSpellArea eSpell ); // Preparing the area
     virtual void SpellContinue();     // Check Areas
                                           // Result available through GetLast


More information about the Libreoffice-commits mailing list