loplugin:constantparam

Change-Id: Ia06b9b189033b9409d7a59a211866f66a0614886
Reviewed-on: https://gerrit.libreoffice.org/28016
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 29 insertions, 60 deletions

diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index f7eaa03f86d6..b9f2e84a5827 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -53,7 +53,7 @@ struct FmFormModelImplData
 };
 
 FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
-    : SdrModel(pPool, pPers, false)
+    : SdrModel(pPool, pPers)
     , m_pImpl(nullptr)
     , m_pObjShell(nullptr)
     , m_bOpenInDesignMode(false)
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index a50fe19edd6e..90e03708506a 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -384,16 +384,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(bool _bSearchForNull
     bool bMovedAround(false);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE)
-        {
-            Application::Reschedule();
-            Application::Reschedule();
-            // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
-            // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
-            // or anything like that. So within each loop we create one user event and handle one user event (and no
-            // paintings and these), so the office seems to be frozen while searching.
-            // FS - 70226 - 02.12.99
-        }
+        Application::Reschedule();
+        Application::Reschedule();
+        // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
+        // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
+        // or anything like that. So within each loop we create one user event and handle one user event (and no
+        // paintings and these), so the office seems to be frozen while searching.
+        // FS - 70226 - 02.12.99
 
         // der aktuell zu vergleichende Inhalt
         iterFieldLoop->xContents->getString();  // needed for wasNull
@@ -451,16 +448,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
     bool bMovedAround(false);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE)
-        {
-            Application::Reschedule();
-            Application::Reschedule();
-            // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
-            // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
-            // or anything like that. So within each loop we create one user event and handle one user event (and no
-            // paintings and these), so the office seems to be frozen while searching.
-            // FS - 70226 - 02.12.99
-        }
+        Application::Reschedule();
+        Application::Reschedule();
+        // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
+        // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
+        // or anything like that. So within each loop we create one user event and handle one user event (and no
+        // paintings and these), so the office seems to be frozen while searching.
+        // FS - 70226 - 02.12.99
 
         // der aktuell zu vergleichende Inhalt
         OUString sCurrentCheck;
@@ -553,16 +547,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
     bool bMovedAround(false);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE)
-        {
-            Application::Reschedule();
-            Application::Reschedule();
-            // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
-            // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
-            // or anything like that. So within each loop we create one user event and handle one user event (and no
-            // paintings and these), so the office seems to be frozen while searching.
-            // FS - 70226 - 02.12.99
-        }
+        Application::Reschedule();
+        Application::Reschedule();
+        // do 2 reschedules because of #70226# : some things done within this loop's body may cause an user event
+        // to be posted (deep within vcl), and these user events will be handled before any keyinput or paintings
+        // or anything like that. So within each loop we create one user event and handle one user event (and no
+        // paintings and these), so the office seems to be frozen while searching.
+        // FS - 70226 - 02.12.99
 
         // der aktuell zu vergleichende Inhalt
         OUString sCurrentCheck;
@@ -640,7 +631,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
 
 FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
         const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
-        const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
+        const InterfaceArray& arrFields)
     :m_xSearchCursor(xCursor)
     ,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() )
     ,m_aStringCompare( _rxContext )
@@ -651,7 +642,6 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
     ,m_srResult(SR_FOUND)
     ,m_bSearchingCurrently(false)
     ,m_bCancelAsynchRequest(false)
-    ,m_eMode(eMode)
     ,m_bFormatter(true)     // das muss konsistent sein mit m_xSearchCursor, der i.A. == m_xOriginalIterator ist
     ,m_bForward(false)
     ,m_bWildcard(false)
@@ -1086,21 +1076,8 @@ void FmSearchEngine::ImplStartNextSearch()
     m_bCancelAsynchRequest = false;
     m_bSearchingCurrently = true;
 
-    if (m_eMode == SM_USETHREAD)
-    {
-        FmSearchThread* pSearcher = new FmSearchThread(this);
-            // der loescht sich nach Beendigung selber ...
-        pSearcher->setTerminationHandler(LINK(this, FmSearchEngine, OnSearchTerminated));
-
-        pSearcher->createSuspended();
-        pSearcher->setPriority(osl_Thread_PriorityLowest);
-        pSearcher->resume();
-    }
-    else
-    {
-        SearchNextImpl();
-        LINK(this, FmSearchEngine, OnSearchTerminated).Call(nullptr);
-    }
+    SearchNextImpl();
+    LINK(this, FmSearchEngine, OnSearchTerminated).Call(nullptr);
 }
 
 
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 983854c57492..4ff9225970ac 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -67,7 +67,6 @@ namespace drawinglayer
             bool                                mbFixedCellHeight : 1;
             bool                                mbWrongSpell : 1;
 
-            bool                                mbToBeChained : 1;
             bool                                mbChainable : 1;
 
 
@@ -91,7 +90,6 @@ namespace drawinglayer
                 bool bInEditMode,
                 bool bFixedCellHeight,
                 bool bWrongSpell,
-                bool bToBeChained,
                 bool bChainable)
             :   mpSdrText(pSdrText),
                 mxOutlinerParaObject(new OutlinerParaObject(rOutlinerParaObject)),
@@ -112,7 +110,6 @@ namespace drawinglayer
                 mbInEditMode(bInEditMode),
                 mbFixedCellHeight(bFixedCellHeight),
                 mbWrongSpell(bWrongSpell),
-                mbToBeChained(bToBeChained),
                 mbChainable(bChainable)
             {
                 if(pSdrText)
@@ -150,7 +147,6 @@ namespace drawinglayer
                 mbInEditMode(false),
                 mbFixedCellHeight(false),
                 mbWrongSpell(false),
-                mbToBeChained(false),
                 mbChainable(false)
             {
             }
@@ -177,7 +173,6 @@ namespace drawinglayer
             bool isInEditMode() const { return mbInEditMode; }
             bool isFixedCellHeight() const { return mbFixedCellHeight; }
             bool isWrongSpell() const { return mbWrongSpell; }
-            bool isToBeChained() const { return mbToBeChained; }
             bool isChainable() const { return mbChainable; }
             const SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; }
             sal_Int32 getTextLeftDistance() const { return maTextLeftDistance; }
@@ -237,8 +232,7 @@ namespace drawinglayer
                     && isScroll() == rCandidate.isScroll()
                     && isInEditMode() == rCandidate.isInEditMode()
                     && isFixedCellHeight() == rCandidate.isFixedCellHeight()
-                    && isWrongSpell() == rCandidate.isWrongSpell()
-                    && isToBeChained() == rCandidate.isToBeChained() );
+                    && isWrongSpell() == rCandidate.isWrongSpell() );
             }
         };
 
@@ -267,7 +261,6 @@ namespace drawinglayer
             bool bInEditMode,
             bool bFixedCellHeight,
             bool bWrongSpell,
-            bool bIsToBeChained,
             bool bChainable)
         :   mpSdrTextAttribute(
                 ImpSdrTextAttribute(
@@ -275,7 +268,7 @@ namespace drawinglayer
                     aTextUpperDistance, aTextRightDistance, aTextLowerDistance,
                     aSdrTextHorzAdjust, aSdrTextVertAdjust, bContour, bFitToSize, bAutoFit,
                     bHideContour, bBlink, bScroll, bInEditMode, bFixedCellHeight, bWrongSpell,
-                    bIsToBeChained, bChainable))
+                    bChainable))
         {
         }
 
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 9b7787bdeaad..f514bf7c1978 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -579,7 +579,6 @@ namespace drawinglayer
                     bInEditMode,
                     static_cast<const SdrTextFixedCellHeightItem&>(rSet.Get(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue(),
                     bWrongSpell,
-                    false/*bToBeChained*/,
                     bChainable);
             }
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index b2b1475a10ac..27952e494806 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -228,11 +228,11 @@ SdrModel::SdrModel():
     ImpCtor(nullptr, nullptr, false);
 }
 
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable):
+SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers):
     maMaPag(),
     maPages()
 {
-    ImpCtor(pPool,pPers,bUseExtColorTable);
+    ImpCtor(pPool,pPers,false/*bUseExtColorTable*/);
 }
 
 SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable):