convert WB_QUICK_SEARCH/WB_FORCE_MAKEVISIBLE to bool fields

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

6 files changed, 18 insertions, 13 deletions

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index b5729dc4b47d..96604b6aeffe 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1862,11 +1862,12 @@ void ScSearchEdit::MouseButtonDown(const MouseEvent& rMEvt)
 
 void ScCheckListMenuWindow::setHasDates(bool bHasDates)
 {
-    // WB_QUICK_SEARCH Enables type-ahead search in the check list box.
+    // Enables type-ahead search in the check list box.
+    maChecks->SetQuickSearch(true);
     if (bHasDates)
-        maChecks->SetStyle(WB_QUICK_SEARCH | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT);
+        maChecks->SetStyle(WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT);
     else
-        maChecks->SetStyle(WB_QUICK_SEARCH | WB_HASBUTTONS);
+        maChecks->SetStyle(WB_HASBUTTONS);
 }
 
 void ScCheckListMenuWindow::initMembers()
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 717b07565f49..9e54339cc1ab 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -19,12 +19,13 @@
 #include "scabstdlg.hxx"
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeList,
-                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
-                         WB_FORCE_MAKEVISIBLE)
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN)
 
 ScPivotLayoutTreeList::ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits) :
     ScPivotLayoutTreeListBase(pParent, nBits)
-{}
+{
+    SetForceMakeVisible(true);
+}
 
 ScPivotLayoutTreeList::~ScPivotLayoutTreeList()
 {}
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 9a15b12bdb30..b5a5c4a16ee6 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -20,8 +20,7 @@
 #include "globstr.hrc"
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListData,
-                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
-                         WB_FORCE_MAKEVISIBLE)
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN)
 
 namespace
 {
@@ -67,7 +66,9 @@ OUString lclCreateDataItemName(const PivotFunc nFunctionMask, const OUString& rN
 
 ScPivotLayoutTreeListData::ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits) :
     ScPivotLayoutTreeListBase(pParent, nBits, DATA_LIST)
-{}
+{
+    SetForceMakeVisible(true);
+}
 
 ScPivotLayoutTreeListData::~ScPivotLayoutTreeListData()
 {}
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
index 7b80c9fc0aac..1b3d09e9fabe 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
@@ -19,13 +19,13 @@
 #include "scabstdlg.hxx"
 
 VCL_BUILDER_FACTORY_ARGS(ScPivotLayoutTreeListLabel,
-                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN |
-                         WB_FORCE_MAKEVISIBLE);
+                         WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN);
 
 ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits)
     : ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST)
     , maDataItem(0)
 {
+    SetForceMakeVisible(true);
 }
 
 ScPivotLayoutTreeListLabel::~ScPivotLayoutTreeListLabel()
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 0fa302070af6..52e8db05f0cd 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -129,7 +129,8 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( vcl::Window* pParent,
 
     m_pBtnEdit->SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) );
 
-    m_pLbSettings->SetStyle( m_pLbSettings->GetStyle()|WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE );
+    m_pLbSettings->SetStyle( m_pLbSettings->GetStyle()|WB_CLIPCHILDREN );
+    m_pLbSettings->SetForceMakeVisible(true);
     m_pLbSettings->SetHighlightRange();
 
     m_pLbSettings->SetSelectHdl( LINK( this, ScSolverOptionsDialog, SettingsSelHdl ) );
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 380f18084913..a715cf38181e 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -124,13 +124,14 @@ ScDocShell* ScContentTree::GetManualOrCurrent()
 //          ScContentTree
 
 ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg)
-    : SvTreeListBox(pParent, WB_BORDER | WB_QUICK_SEARCH)
+    : SvTreeListBox(pParent, WB_BORDER)
     , pParentWindow(pNavigatorDlg)
     , nRootType(ScContentId::ROOT)
     , bHiddenDoc(false)
     , pHiddenDocument(nullptr)
     , bisInNavigatoeDlg(false)
 {
+    SetQuickSearch(true);
     for (sal_uInt16 i = 0; i <= (int)ScContentId::LAST; ++i)
         pPosList[pTypeList[i]] = i;         // inverse for searching