move SvTreeListBox to vcl

Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44 Reviewed-on: https://gerrit.libreoffice.org/62787 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>

move SvTreeListBox to vcl
Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44 Reviewed-on: https://gerrit.libreoffice.org/62787 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
6311f7ff · Caolán McNamara · 128bec2c · 6311f7ff · 6311f7ff · 6311f7ff
Kaydet (Commit) 6311f7ff authored Eki 08, 2018 tarafından Caolán McNamara
368 changed files
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/compbase9.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/accessibletexthelper.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <tools/gen.hxx>
 #include <extended/listboxaccessible.hxx>


--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -343,11 +343,6 @@
 #include <svtools/headbar.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/tabbar.hxx>
-#include <svtools/transfer.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentries.hxx>
-#include <svtools/viewdataentry.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxwindows.hxx>
@@ -385,5 +380,10 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
+#include <vcl/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentries.hxx>
+#include <vcl/viewdataentry.hxx>

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -19,8 +19,8 @@

 #include <extended/accessiblelistbox.hxx>
 #include <extended/accessiblelistboxentry.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>

--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -18,9 +18,9 @@
 */

 #include <extended/accessiblelistboxentry.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svtools/stringtransfer.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>

--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -18,7 +18,7 @@
 */

 #include <extended/listboxaccessible.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <vcl/svapp.hxx>

 namespace accessibility

--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -55,6 +55,7 @@
 #include <extended/accessibleeditbrowseboxcell.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <extended/AccessibleGridControl.hxx>
 #include <svtools/accessibletable.hxx>
 #include <vcl/popupmenuwindow.hxx>
@@ -144,12 +145,6 @@ public:
            VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
        ) const override;

-    virtual css::uno::Reference< css::accessibility::XAccessible >
-        createAccessibleTreeListBox(
-            SvTreeListBox& _rListBox,
-            const css::uno::Reference< css::accessibility::XAccessible >& _xParent
-        ) const override;
-
    virtual css::uno::Reference< css::accessibility::XAccessible >
        createAccessibleBrowseBoxHeaderBar(
            const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
@@ -314,6 +309,23 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
            xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleTabControl( _pXWindow ));
        }

+        else if ( nType == WindowType::TREELISTBOX )
+        {
+            vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
+            DBG_ASSERT(pParent, "SvTreeListBox::CreateAccessible - accessible parent not found");
+            if (pParent)
+            {
+                css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
+                DBG_ASSERT(xAccParent.is(), "SvTreeListBox::CreateAccessible - accessible parent not found");
+                if (xAccParent.is())
+                {
+                    xContext = static_cast<XAccessibleContext*>(new AccessibleListBox(*static_cast<SvTreeListBox*>(pWindow.get()), xAccParent));
+                    return xContext;
+                }
+            }
+            xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleComponent( _pXWindow ));
+        }
+
        else if ( nType == WindowType::TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
        {
            xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
@@ -393,12 +405,6 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowCon
    return new Document( pVclXWindow, rEngine, rView );
 }

-Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
-    SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
-{
-    return new AccessibleListBox( _rListBox, _xParent );
-}
-
 Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
    const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
    AccessibleBrowseBoxObjType _eObjType ) const

--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
 #define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX

-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <vcl/syschild.hxx>

 #include <mediacontrol.hxx>

--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -449,12 +449,7 @@
 #include <svtools/statusbarcontroller.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/toolboxcontroller.hxx>
-#include <svtools/transfer.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/treelistentries.hxx>
-#include <svtools/treelistentry.hxx>
 #include <svtools/valueset.hxx>
-#include <svtools/viewdataentry.hxx>
 #include <svx/Palette.hxx>
 #include <svx/PaletteManager.hxx>
 #include <svx/SvxColorValueSet.hxx>
@@ -586,6 +581,11 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
+#include <vcl/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/treelistentries.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -44,7 +44,7 @@
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/textwindowpeer.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/help.hxx>
 #include <cppuhelper/implbase.hxx>

--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -27,7 +27,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <svtools/imagemgr.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>

--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <deque>
 #include <sfx2/docfac.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 namespace basctl
 {

--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -34,8 +34,8 @@
 #include <sfx2/request.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/weld.hxx>


--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -38,7 +38,7 @@
 #include <vcl/weld.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmlscript/xmldlg_imexp.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 namespace basctl
 {

--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -26,7 +26,7 @@

 #include "doceventnotifier.hxx"

-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <basic/sbstar.hxx>
 #include "sbxitem.hxx"
 #include "basobj.hxx"

--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -101,7 +101,7 @@
                        <property name="top_padding">6</property>
                        <property name="left_padding">12</property>
                        <child>
-                          <object class="svtlo-SvTreeListBox" id="macros:border">
+                          <object class="vcllo-SvTreeListBox" id="macros:border">
                            <property name="width_request">280</property>
                            <property name="height_request">300</property>
                            <property name="visible">True</property>

--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -19,7 +19,7 @@

 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <runtime.hxx>
 #include <sbstdobj.hxx>


--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -29,7 +29,7 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>

--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>

 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>

 namespace chart
 {

--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -57,7 +57,7 @@
 #include <editeng/editview.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <sot/storage.hxx>
 #include <vcl/graph.hxx>
 #include <svx/unomodel.hxx>

--- a/chart2/source/controller/main/ChartDropTargetHelper.hxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX

-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>

 namespace com { namespace sun { namespace star {
 namespace chart2 {

--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTTRANSFERABLE_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTTRANSFERABLE_HXX

-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>

 namespace com { namespace sun { namespace star {
 namespace graphic {

--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -362,11 +362,8 @@
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
 #include <svtools/ehdl.hxx>
-#include <svtools/svlbitm.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/svtresid.hxx>
-#include <svtools/transfer.hxx>
-#include <svtools/treelistentry.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dlgutil.hxx>
@@ -462,5 +459,8 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
+#include <vcl/svlbitm.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/treelistentry.hxx>

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -18,7 +18,7 @@
 */

 #include <CommandCategoryListBox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -46,9 +46,9 @@
 #include <sfx2/filedlghelper.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>

 #include <algorithm>

--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -46,9 +46,9 @@
 #include <sfx2/filedlghelper.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>

 #include <algorithm>

--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -30,7 +30,7 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 #include <sal/macros.h>
 #include <vcl/builderfactory.hxx>
@@ -66,7 +66,7 @@
 // include other projects
 #include <comphelper/processfactory.hxx>
 #include <svtools/acceleratorexecute.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <rtl/ustrbuf.hxx>

--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -47,9 +47,9 @@
 #include <sfx2/request.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svl/stritem.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>


--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -53,7 +53,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <unotools/configmgr.hxx>

--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <unotools/eventcfg.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 #include <headertablistbox.hxx>
 #include "macropg_impl.hxx"

--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -22,8 +22,8 @@
 #include <macropg.hxx>
 #include <vcl/layout.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/app.hxx>

--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -21,9 +21,9 @@
 #include <vcl/help.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <macroass.hxx>
-#include <svtools/imaprect.hxx>
-#include <svtools/imapcirc.hxx>
-#include <svtools/imappoly.hxx>
+#include <vcl/imaprect.hxx>
+#include <vcl/imapcirc.hxx>
+#include <vcl/imappoly.hxx>
 #include <svl/urlbmk.hxx>
 #include <svx/xoutbmp.hxx>
 #include <cuiimapwnd.hxx>

--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -39,8 +39,8 @@

 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>

 #define HHC editeng::HangulHanjaConversion
 #define LINE_CNT        static_cast< sal_uInt16 >(2)

--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/io/IOException.hpp>

 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 #include <strings.hrc>
 #include <hlmarkwn.hxx>

--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -31,7 +31,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 #include <strings.hrc>
 #include <sfx2/linkmgr.hxx>

--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>

 #include <unotools/pathoptions.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;

--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -54,7 +54,7 @@

 #include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <tools/urlobj.hxx>
 #include <vector>
 #include <algorithm>

--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -31,7 +31,7 @@
 #include <svx/dialogs.hrc>
 #include <tools/resary.hxx>
 #include <rtl/strbuf.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>

 SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxItemSet& rSet)
    : SfxTabDialogController(pParent, "cui/ui/searchformatdialog.ui", "SearchFormatDialog", &rSet)

--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -24,10 +24,10 @@

 #include <svl/lngmisc.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>

--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -23,7 +23,7 @@
 #include <thesdlg.hxx>

 #include <svtools/ehdl.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
 #include <svx/checklbx.hxx>
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>

--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -24,7 +24,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svtools/svmedit2.hxx>
 #include <svtools/svmedit.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -24,7 +24,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svtools/svmedit2.hxx>
 #include <svtools/svmedit.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -35,7 +35,7 @@
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <i18nutil/searchopt.hxx>

--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -23,7 +23,7 @@
 #include <svtools/langtab.hxx>
 #include <svtools/simptabl.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
 #include <svx/checklbx.hxx>
 #include <svx/langbox.hxx>
 #include <vcl/button.hxx>

--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -27,7 +27,7 @@
 #include <vcl/weld.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svtools/svmedit2.hxx>
 #include <svtools/svmedit.hxx>


--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <vcl/timer.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/image.hxx>