[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/inc basctl/source basctl/uiconfig basic/source chart2/source cui/inc cui/source cui/uiconfig dbaccess/inc dbaccess/source dbaccess/uiconfig desktop/inc desktop/source editeng/source extensions/source extensions/uiconfig extras/source filter/source forms/source formula/source fpicker/source include/svtools include/svx include/vcl reportdesign/inc reportdesign/source sc/inc sc/source sc/uiconfig sd/inc sd/source sfx2/inc sfx2/source solenv/clang-format solenv/sanitizers starmath/inc starmath/source svtools/inc svtools/Library_svt.mk svtools/source svx/inc svx/source sw/inc sw/source sw/uiconfig vcl/inc vcl/Library_vcl.mk vcl/source xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 7 21:02:57 UTC 2018
accessibility/inc/extended/accessiblelistboxentry.hxx | 2
accessibility/inc/pch/precompiled_acc.hxx | 10
accessibility/source/extended/accessiblelistbox.cxx | 4
accessibility/source/extended/accessiblelistboxentry.cxx | 4
accessibility/source/extended/listboxaccessible.cxx | 2
accessibility/source/helper/acc_factory.cxx | 30 +
avmedia/source/viewer/mediawindow_impl.hxx | 2
basctl/inc/pch/precompiled_basctl.hxx | 10
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/bastype2.cxx | 2
basctl/source/basicide/bastype3.cxx | 2
basctl/source/basicide/moduldl2.cxx | 4
basctl/source/basicide/moduldlg.cxx | 2
basctl/source/inc/bastype2.hxx | 2
basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 2
basic/source/runtime/stdobj1.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.hxx | 2
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 2
chart2/source/controller/main/ChartDropTargetHelper.hxx | 2
chart2/source/controller/main/ChartTransferable.hxx | 2
cui/inc/pch/precompiled_cui.hxx | 6
cui/source/customize/CommandCategoryListBox.cxx | 2
cui/source/customize/SvxMenuConfigPage.cxx | 6
cui/source/customize/SvxToolbarConfigPage.cxx | 6
cui/source/customize/acccfg.cxx | 4
cui/source/customize/cfg.cxx | 6
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/macropg.cxx | 4
cui/source/dialogs/cuiimapwnd.cxx | 6
cui/source/dialogs/hangulhanjadlg.cxx | 4
cui/source/dialogs/hlmarkwn.cxx | 2
cui/source/dialogs/linkdlg.cxx | 2
cui/source/dialogs/multipat.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 2
cui/source/dialogs/srchxtra.cxx | 2
cui/source/dialogs/thesdlg.cxx | 8
cui/source/dialogs/thesdlg_impl.hxx | 2
cui/source/inc/SvxMenuConfigPage.hxx | 2
cui/source/inc/SvxToolbarConfigPage.hxx | 2
cui/source/inc/acccfg.hxx | 2
cui/source/inc/autocdlg.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/cfgutil.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/hlmarkwn.hxx | 2
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/pastedlg.hxx | 2
cui/source/inc/scriptdlg.hxx | 2
cui/source/options/certpath.cxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/options/fontsubs.cxx | 2
cui/source/options/fontsubs.hxx | 2
cui/source/options/optHeaderTabListbox.cxx | 4
cui/source/options/optaboutconfig.cxx | 4
cui/source/options/optfltr.cxx | 4
cui/source/options/optjava.cxx | 2
cui/source/options/optlingu.cxx | 6
cui/source/options/optopencl.cxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/radiobtnbox.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/options/webconninfo.cxx | 2
cui/source/tabpages/autocdlg.cxx | 4
cui/source/tabpages/macroass.cxx | 4
cui/uiconfig/ui/accelconfigpage.ui | 2
cui/uiconfig/ui/optionsdialog.ui | 2
dbaccess/inc/pch/precompiled_dbu.hxx | 2
dbaccess/source/ui/app/AppController.cxx | 6
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 4
dbaccess/source/ui/app/AppDetailView.hxx | 2
dbaccess/source/ui/app/AppIconControl.hxx | 2
dbaccess/source/ui/browser/dbtreeview.cxx | 2
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 2
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 6
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/control/listviewitems.cxx | 2
dbaccess/source/ui/control/marktree.cxx | 2
dbaccess/source/ui/control/tabletree.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/inc/JoinExchange.hxx | 2
dbaccess/source/ui/inc/JoinTableView.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 2
dbaccess/source/ui/inc/TableRowExchange.hxx | 2
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 2
dbaccess/source/ui/inc/listviewitems.hxx | 2
dbaccess/source/ui/inc/marktree.hxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/misc/WNameMatch.cxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dbaccess/uiconfig/ui/tablesjoindialog.ui | 2
desktop/inc/pch/precompiled_deploymentgui.hxx | 6
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/rtf/svxrtf.cxx | 16
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/selectlabeldialog.hxx | 2
extensions/source/propctrlr/taborder.cxx | 2
extensions/source/propctrlr/taborder.hxx | 2
extensions/source/scanner/sanedlg.hxx | 2
extensions/uiconfig/scanner/ui/sanedialog.ui | 2
extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui | 2
extras/source/glade/libreoffice-catalog.xml.in | 24 -
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
forms/source/richtext/clipboarddispatcher.cxx | 2
formula/source/ui/dlg/formula.cxx | 2
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/structpg.cxx | 2
formula/source/ui/dlg/structpg.hxx | 2
fpicker/source/office/iodlg.cxx | 2
include/svtools/accessiblefactory.hxx | 6
include/svtools/brwbox.hxx | 2
include/svtools/embedtransfer.hxx | 2
include/svtools/fileview.hxx | 6
include/svtools/foldertree.hxx | 2
include/svtools/iconview.hxx | 2
include/svtools/insdlg.hxx | 2
include/svtools/stringtransfer.hxx | 2
include/svtools/svtabbx.hxx | 2
include/svx/checklbx.hxx | 2
include/svx/colrctrl.hxx | 2
include/svx/ctredlin.hxx | 6
include/svx/dbaexchange.hxx | 2
include/svx/dbaobjectex.hxx | 2
include/svx/fmgridcl.hxx | 2
include/svx/fontlb.hxx | 2
include/svx/galctrl.hxx | 2
include/svx/galmisc.hxx | 4
include/svx/galtheme.hxx | 2
include/svx/gridctrl.hxx | 2
include/svx/xmlexchg.hxx | 2
include/vcl/imap.hxx | 12
include/vcl/imapcirc.hxx | 10
include/vcl/imapobj.hxx | 8
include/vcl/imappoly.hxx | 12
include/vcl/imaprect.hxx | 12
include/vcl/inetimg.hxx | 6
include/vcl/svimpbox.hxx | 13
include/vcl/svlbitm.hxx | 20 -
include/vcl/transfer.hxx | 20 -
include/vcl/treelist.hxx | 26 -
include/vcl/treelistbox.hxx | 41 +-
include/vcl/treelistentries.hxx | 4
include/vcl/treelistentry.hxx | 13
include/vcl/uitest/uiobject.hxx | 50 ++
include/vcl/viewdataentry.hxx | 8
reportdesign/inc/pch/precompiled_rptui.hxx | 6
reportdesign/source/ui/dlg/AddField.cxx | 2
reportdesign/source/ui/dlg/GroupExchange.hxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 4
reportdesign/source/ui/inc/AddField.hxx | 4
reportdesign/source/ui/inc/ReportController.hxx | 2
reportdesign/source/ui/inc/ReportSection.hxx | 2
reportdesign/source/ui/inc/dlgedclip.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sc/inc/pch/precompiled_scui.hxx | 4
sc/inc/userdat.hxx | 2
sc/source/core/tool/orcusxml.cxx | 2
sc/source/filter/html/htmlexp2.cxx | 2
sc/source/filter/orcus/xmlcontext.cxx | 4
sc/source/ui/cctrl/checklistmenu.cxx | 4
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx | 2
sc/source/ui/dialogs/searchresults.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/drtxtob1.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 2
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/inc/PivotLayoutTreeListBase.hxx | 2
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/content.hxx | 2
sc/source/ui/inc/drwtrans.hxx | 2
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/inc/lnktrans.hxx | 2
sc/source/ui/inc/seltrans.hxx | 2
sc/source/ui/inc/tabcont.hxx | 2
sc/source/ui/inc/transobj.hxx | 2
sc/source/ui/inc/xmlsourcedlg.hxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 4
sc/source/ui/view/editsh.cxx | 2
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/viewfun4.cxx | 2
sc/source/ui/view/viewfun5.cxx | 2
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6
sc/uiconfig/scalc/ui/xmlsourcedialog.ui | 2
sd/inc/imapinfo.hxx | 2
sd/inc/pch/precompiled_sd.hxx | 4
sd/inc/pch/precompiled_sdui.hxx | 4
sd/source/core/drawdoc2.cxx | 2
sd/source/filter/html/htmlex.cxx | 6
sd/source/ui/animations/CustomAnimationList.cxx | 6
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/dlg/RemoteDialog.hxx | 2
sd/source/ui/dlg/custsdlg.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fusel.cxx | 2
sd/source/ui/inc/LayerTabBar.hxx | 2
sd/source/ui/inc/TabControl.hxx | 2
sd/source/ui/inc/View.hxx | 2
sd/source/ui/inc/Window.hxx | 2
sd/source/ui/inc/sdtreelb.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 2
sd/source/ui/sidebar/LayoutMenu.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 2
sfx2/inc/pch/precompiled_sfx.hxx | 4
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/appl/opengrf.cxx | 2
sfx2/source/bastyp/sfxhtml.cxx | 10
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/dialog/versdlg.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/templdgi.hxx | 2
solenv/clang-format/blacklist | 54 +--
solenv/sanitizers/ui/dbaccess.suppr | 2
solenv/sanitizers/ui/modules/scalc.suppr | 2
starmath/inc/edit.hxx | 2
starmath/source/view.cxx | 2
svtools/Library_svt.mk | 12
svtools/inc/bitmaps.hlst | 2
svtools/inc/pch/precompiled_svt.hxx | 18 -
svtools/inc/uitest/uiobject.hxx | 51 ---
svtools/source/brwbox/datwin.hxx | 2
svtools/source/contnr/DocumentInfoPreview.cxx | 1
svtools/source/contnr/fileview.cxx | 83 ++--
svtools/source/contnr/fileview.hxx | 32 -
svtools/source/contnr/iconview.cxx | 2
svtools/source/contnr/simptabl.cxx | 4
svtools/source/contnr/svtabbx.cxx | 4
svtools/source/inc/iconviewimpl.hxx | 8
svtools/source/misc/cliplistener.cxx | 2
svtools/source/misc/openfiledroptargetlistener.cxx | 2
svtools/source/misc/svtaccessiblefactory.cxx | 9
svtools/source/svhtml/htmlout.cxx | 8
svtools/source/uitest/uiobject.cxx | 154 ---------
svtools/source/uno/treecontrolpeer.cxx | 8
svtools/source/uno/unoiface.cxx | 2
svtools/source/uno/unoimap.cxx | 8
svx/inc/galbrws2.hxx | 2
svx/inc/pch/precompiled_svx.hxx | 12
svx/inc/pch/precompiled_svxcore.hxx | 2
svx/source/dialog/checklbx.cxx | 4
svx/source/dialog/ctredlin.cxx | 4
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/fontlb.cxx | 4
svx/source/dialog/imapwnd.cxx | 6
svx/source/dialog/imapwnd.hxx | 6
svx/source/form/datanavi.cxx | 2
svx/source/form/filtnav.cxx | 6
svx/source/form/fmexch.cxx | 4
svx/source/form/navigatortree.cxx | 2
svx/source/form/tabwin.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/inc/datanavi.hxx | 2
svx/source/inc/docrecovery.hxx | 4
svx/source/inc/filtnav.hxx | 2
svx/source/inc/fmexch.hxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/inc/tabwin.hxx | 4
svx/source/sdr/contact/sdrmediawindow.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/tbxctrls/extrusioncontrols.hxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 4
sw/inc/pch/precompiled_sw.hxx | 4
sw/inc/pch/precompiled_swui.hxx | 12
sw/source/core/access/accnotextframe.cxx | 2
sw/source/core/access/accnotexthyperlink.cxx | 4
sw/source/core/doc/docbasic.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/draw/dpage.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/layout/atrfrm.cxx | 4
sw/source/core/layout/fly.cxx | 2
sw/source/core/text/noteurl.cxx | 4
sw/source/filter/html/htmlflywriter.cxx | 4
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/selectdbtabledialog.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labelexp.cxx | 2
sw/source/ui/fldui/FldRefTreeListBox.hxx | 2
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/fldref.cxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/bookmark.cxx | 2
sw/source/ui/misc/glosbib.cxx | 2
sw/source/ui/misc/glossary.cxx | 2
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/dbui/dbtree.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 6
sw/source/uibase/docvw/romenu.cxx | 6
sw/source/uibase/inc/changedb.hxx | 2
sw/source/uibase/inc/cnttab.hxx | 2
sw/source/uibase/inc/condedit.hxx | 2
sw/source/uibase/inc/conttree.hxx | 4
sw/source/uibase/inc/dbtree.hxx | 2
sw/source/uibase/inc/edtwin.hxx | 2
sw/source/uibase/inc/glossary.hxx | 2
sw/source/uibase/inc/labimp.hxx | 2
sw/source/uibase/inc/navipi.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 2
sw/source/uibase/inc/swdtflvr.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 2
sw/source/uibase/shells/frmsh.cxx | 4
sw/source/uibase/uiview/srcview.cxx | 2
sw/source/uibase/utlui/content.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
sw/uiconfig/swriter/ui/editsectiondialog.ui | 2
sw/uiconfig/swriter/ui/exchangedatabases.ui | 2
sw/uiconfig/swriter/ui/flddocinfopage.ui | 2
vcl/Library_vcl.mk | 13
vcl/inc/bitmaps.hlst | 3
vcl/source/treelist/imap.cxx | 10
vcl/source/treelist/imap2.cxx | 10
vcl/source/treelist/imap3.cxx | 2
vcl/source/treelist/inetimg.cxx | 2
vcl/source/treelist/svimpbox.cxx | 12
vcl/source/treelist/svlbitm.cxx | 8
vcl/source/treelist/transfer.cxx | 6
vcl/source/treelist/transfer2.cxx | 6
vcl/source/treelist/treelist.cxx | 6
vcl/source/treelist/treelistbox.cxx | 32 -
vcl/source/treelist/treelistentry.cxx | 4
vcl/source/treelist/uiobject.cxx | 170 ++++++++++
vcl/source/treelist/viewdataentry.cxx | 2
vcl/source/window/accessibility.cxx | 2
vcl/source/window/builder.cxx | 7
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 10
xmlsecurity/source/dialogs/certificatechooser.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/uiconfig/ui/certpage.ui | 2
368 files changed, 941 insertions(+), 1005 deletions(-)
New commits:
commit 6311f7ffce8f64b0773d2ad3ea7be3be683924c0
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 8 09:02:25 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 7 22:01:02 2018 +0100
move SvTreeListBox to vcl
Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44
Reviewed-on: https://gerrit.libreoffice.org/62787
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index d4e85a755457..f70689a271fd 100644
--- 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>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 718113060eec..064002780e2a 100644
--- 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: */
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 0ef5168141a5..63f7ff87ac10 100644
--- 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>
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 8e11b4587e10..4a74477badb6 100644
--- 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>
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index 781412078835..edff82759c6e 100644
--- 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
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 3c4dbd064b25..9ce18c4924f3 100644
--- 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>
@@ -145,12 +146,6 @@ public:
) 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,
IAccessibleTableProvider& _rOwningTable,
@@ -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
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index a313d927f1bd..e1fc3d56fcc0 100644
--- 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>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index a9d35fa89690..ccec453c65c7 100644
--- 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: */
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4c406865e3b6..99208550315b 100644
--- 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>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index b3efc5d4209a..fb7843658f40 100644
--- 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>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index ba00c2516488..0a9e99fbc9c5 100644
--- 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
{
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f1940c1c8b0c..2e13017bb80f 100644
--- 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>
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index e45d96d378b3..1a2af91d35de 100644
--- 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
{
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index e4f82a9d06a5..8e699aafc7fc 100644
--- 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"
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index cc8815e26c52..fb5331c8e3d9 100644
--- 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>
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 9060fb318bc5..f648ea1a7fa0 100644
--- 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>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index d3507fcc9bfe..26ff781154b8 100644
--- 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>
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 7aa35888b4b7..83def2a32d1f 100644
--- 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
{
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 5cd5da3edf05..18894177ecf2 100644
--- 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>
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx
index bcd6060dfdd6..64a898635b5f 100644
--- 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 {
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index 6fc8b4c26f8c..e864054e758f 100644
--- 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 {
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index ac869daac6b8..a0af6822c200 100644
--- 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: */
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index fe05b2c5a33a..ecfe145bd0f7 100644
--- 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>
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index be565b388059..6cf31514352c 100644
--- 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>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 8d93b0927de0..4ba5682fcd22 100644
--- 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>
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a06a68703d8d..f213e382d422 100644
--- 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>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 87631448b711..55f500612d1a 100644
--- 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>
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index fbc07d50f41a..e906b3e40128 100644
--- 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>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 5c1f1c31ac0c..c7f1559330a2 100644
--- 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"
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index e0ab01b783f2..3defde6cce9f 100644
--- 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>
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 5e7df3c0e3f7..5fbc6e428f95 100644
--- 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>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 9da0f6a2d2f8..7b61df5813ec 100644
--- 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)
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index f629f349271e..cbd9ba908673 100644
--- 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>
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index b7a93f1dde13..2b674be5e0d2 100644
--- 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>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index a006d606ed6b..60a70e64b741 100644
--- 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;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ef073d277cb2..d0eeb7b8c2ea 100644
--- 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>
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4efffd9aecea..08a403dd063d 100644
--- 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)
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 003568a0f2fa..cea84d19be99 100644
--- 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>
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index afe84bdfcb77..1f2f60c277a6 100644
--- 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>
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx
index 4be6c7dc9998..fb828a9c38a4 100644
--- 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>
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index 6e71afb74e63..03fc04034995 100644
--- 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>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 08f4c5ffc9d9..e01aebc45792 100644
--- 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>
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d021827ddb55..d963f48ca1b7 100644
--- 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>
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index c5f0abf12d71..4cf04050475a 100644
--- 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>
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index a1f4a2971314..89e0a0e46033 100644
--- 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>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 85b465065da7..9b5231b1ea6d 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -33,7 +33,7 @@
#include <vcl/combobox.hxx>
#include <vcl/idle.hxx>
#include <svl/slstitm.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <vcl/GraphicObject.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/galctrl.hxx>
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index e07dde7792c6..160889c4f125 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <vcl/button.hxx>
#include <vcl/floatwin.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include "hlmarkwn_def.hxx"
class SvxHyperlinkTabPageBase;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index fa0d806a6723..5ced4c696d8d 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -28,7 +28,7 @@
#include <vcl/lstbox.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/fcontnr.hxx>
#include <svtools/inettbc.hxx>
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 55f2c43dd83e..45495dba119a 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -23,7 +23,7 @@
#include <map>
#include <sot/formats.hxx>
#include <tools/globname.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <vcl/weld.hxx>
struct TransferableObjectDescriptor;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 604c7a4c3f90..4488d2c611c0 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CUI_SOURCE_INC_SCRIPTDLG_HXX
#include <memory>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index a315222f45cf..e06981b3867f 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -12,7 +12,7 @@
#include <osl/security.hxx>
#include <osl/thread.h>
#include <sal/log.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <unotools/securityoptions.hxx>
#include "certpath.hxx"
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 91e0d16dbf35..e81a66e877a4 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -23,7 +23,7 @@
#include <svl/filenotation.hxx>
#include <helpids.h>
#include <svtools/editbrowsebox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/field.hxx>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 228632262dfa..a0f14caa0973 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -21,7 +21,7 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/ctrltool.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <svtools/fontsubstconfig.hxx>
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 03fc4d03aba6..51986ce5a977 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -22,7 +22,7 @@
#include <sfx2/tabdlg.hxx>
#include <svtools/ctrlbox.hxx>
#include <svtools/simptabl.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <vcl/fixed.hxx>
#include <vcl/toolbox.hxx>
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 15ea670b8fc7..23782de05d04 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -21,8 +21,8 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <svtools/headbar.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
#include <o3tl/make_unique.hxx>
namespace svx
{
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 2d81d02f4ee2..0e26e06effeb 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -11,8 +11,8 @@
#include "optHeaderTabListbox.hxx"
#include <vcl/builderfactory.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index f2ede6f28b29..3d8b2fa04c52 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -24,8 +24,8 @@
#include <strings.hrc>
#include <dialmgr.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
enum MSFltrPg2_CheckBoxEntries {
Math,
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 06ee40e29f55..81f93cb0136b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -42,7 +42,7 @@
#include <unotools/pathoptions.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/restartdialog.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/inputdlg.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index c0da0647978c..37124377cbe1 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -43,9 +43,9 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <unotools/extendedsecurityoptions.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
#include <svtools/langhelp.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index e6cf91a376ff..816d09ccfcde 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -41,7 +41,7 @@
#include <strings.hrc>
#include <dialmgr.hxx>
#include "optopencl.hxx"
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, "OptOpenCLPage", "cui/ui/optopenclpage.ui", &rSet),
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7bfe1219d146..3cec044d3a14 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -22,7 +22,7 @@
#include <sfx2/app.hxx>
#include <svl/aeitem.hxx>
#include <svtools/svtabbx.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <unotools/defaultoptions.hxx>
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 3f11c4a4ac10..766aced584d7 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -19,7 +19,7 @@
#include <radiobtnbox.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
namespace svx {
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 08d8f5974d3c..d8010ae3725e 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -106,7 +106,7 @@
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/settings.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <sal/log.hxx>
#ifdef LINUX
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index b057d77721c2..bb7d041d28d6 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/task/XPasswordContainer2.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/docpasswordrequest.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <vcl/layout.hxx>
using namespace ::com::sun::star;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1bc9ffc4b780..1a76003fb216 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -23,7 +23,7 @@
#include <vcl/keycodes.hxx>
#include <vcl/settings.hxx>
#include <sot/exchange.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <unotools/syslocale.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
@@ -39,7 +39,7 @@
#include <sfx2/sfxsids.hrc>
#include <svl/eitem.hxx>
#include <svl/languageoptions.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <svx/SmartTagMgr.hxx>
#include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 8f46be227a44..186852f41a76 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -31,8 +31,8 @@
#include <sfx2/objsh.hxx>
#include <vcl/fixed.hxx>
#include <headertablistbox.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistentry.hxx>
#include <o3tl/make_unique.hxx>
using ::com::sun::star::uno::Reference;
diff --git a/cui/uiconfig/ui/accelconfigpage.ui b/cui/uiconfig/ui/accelconfigpage.ui
index ab10895889e2..17827e0256ab 100644
--- a/cui/uiconfig/ui/accelconfigpage.ui
+++ b/cui/uiconfig/ui/accelconfigpage.ui
@@ -333,7 +333,7 @@
</packing>
</child>
<child>
- <object class="svtlo-SvTreeListBox" id="keys:border">
+ <object class="vcllo-SvTreeListBox" id="keys:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index dd9330c95590..c7873242fd0a 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -25,7 +25,7 @@
<property name="vexpand">True</property>
<property name="spacing">6</property>
<child>
- <object class="svtlo-SvTreeListBox" id="pages:border">
+ <object class="vcllo-SvTreeListBox" id="pages:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 76a71af8ed9c..72327caedc2f 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -152,7 +152,6 @@
#include <svl/stritem.hxx>
#include <svl/svldllapi.h>
#include <svtools/svtdllapi.h>
-#include <svtools/treelistentry.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
#include <tools/debug.hxx>
@@ -167,5 +166,6 @@
#include <uno/data.h>
#include <unotools/fontdefs.hxx>
#include <unotools/unotoolsdllapi.h>
+#include <vcl/treelistentry.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 8b5c8df985f1..0958cda048e8 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -67,10 +67,10 @@
#include <svl/urihelper.hxx>
#include <svl/filenotation.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/transfer.hxx>
#include <svtools/cliplistener.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <svtools/insdlg.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index e0a96d68da20..5af809a3f0fd 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -39,7 +39,7 @@
#include <cppuhelper/implbase5.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <sot/storage.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <vcl/timer.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 6bc4a784ab5a..6e4056c4a746 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -57,7 +57,7 @@
#include <strings.hrc>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <listviewitems.hxx>
#include "AppDetailView.hxx"
#include <linkeddocuments.hxx>
@@ -68,7 +68,7 @@
#include <UITools.hxx>
#include <algorithm>
#include <iterator>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <unotools/pathoptions.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index afeafa35d8cf..5c5868f886e7 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -64,7 +64,7 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <tools/stream.hxx>
#include <rtl/ustrbuf.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include "AppController.hxx"
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 96eac41b0272..544548d108e2 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <AppElementType.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <svtools/DocumentInfoPreview.hxx>
#include <vcl/fixed.hxx>
#include <vcl/toolbox.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index aec4f4abc30b..81d7a32ed47b 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -39,8 +39,8 @@
#include <vcl/svapp.hxx>
#include <callbacks.hxx>
#include <dbaccess/IController.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
#include <algorithm>
#include <dbtreelistbox.hxx>
#include <imageprovider.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 8298d3846765..050359d02728 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -29,7 +29,7 @@
#include <IClipBoardTest.hxx>
#include "AppTitleWindow.hxx"
#include <AppElementType.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <VertSplitView.hxx>
#include <vector>
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 4cc1105c7a3c..af3352e5ce29 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
#include <svtools/ivctrl.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 38e94cbcf199..8e3caac5e36b 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -18,7 +18,7 @@
*/
#include "dbtreeview.hxx"
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <dbtreelistbox.hxx>
#include "dbtreemodel.hxx"
#include <helpids.h>
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 1dd3a0991fb9..1e3bfd3b57d1 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -29,7 +29,7 @@
#include "dbtreeview.hxx"
#include <dbtreelistbox.hxx>
#include "dbtreemodel.hxx"
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
using namespace ::com::sun::star::frame;
using namespace ::dbtools;
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 8ec849dac474..fb759da9785f 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -36,7 +36,7 @@
#include <svx/dataaccessdescriptor.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <algorithm>
#include <functional>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9c34ca666b09..581a655cd9d2 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -107,9 +107,9 @@
#include <svl/filenotation.hxx>
#include <svl/intitem.hxx>
#include <unotools/moduleoptions.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
#include <svx/algitem.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <svx/databaseregistrationui.hxx>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 5322308e5c83..1324dd0656de 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -37,7 +37,7 @@
#include <svl/rngitem.hxx>
#include <svl/intitem.hxx>
#include <svl/numuno.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatPreviewer.hpp>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index e3c5eec3dca4..1cf967ed9aad 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -37,7 +37,7 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <memory>
#include <o3tl/make_unique.hxx>
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 2022567f7010..d0a686992809 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -18,7 +18,7 @@
*/
#include <listviewitems.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/viewdataentry.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 073ce1586d2e..54e19671afb9 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -18,7 +18,7 @@
*/
#include <marktree.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 2d7489323c4a..bf68b08b3c53 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -42,7 +42,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <connectivity/dbmetadata.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <o3tl/make_unique.hxx>
#include <algorithm>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 5494f2600a36..6d480eba43ad 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/sdb/SQLContext.hpp>
#include <UITools.hxx>
#include <svtools/imgdef.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <browserids.hxx>
#include <connectivity/dbtools.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 3df70af37535..f1683f82f700 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -30,8 +30,8 @@
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
#include <svtools/svmedit.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/sqlerror.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index ae2586762f24..80d12c5005cd 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -44,7 +44,7 @@
#include <UITools.hxx>
#include <osl/diagnose.h>
#include <svtools/imgdef.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <TablesSingleDlg.hxx>
#include <tools/diagnose_ex.h>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index eb02b1d2145e..0d750a444e81 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -22,7 +22,7 @@
#include "dbexchange.hxx"
#include "TableWindowListBox.hxx"
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase1.hxx>
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index ffa729812805..a7b228d18fa4 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -24,7 +24,7 @@
#include <vcl/idle.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/vclptr.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include "callbacks.hxx"
#include "TableConnectionData.hxx"
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 281fd2feea25..670920028ece 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -23,7 +23,7 @@
#include "commontypes.hxx"
#include <svx/dataaccessdescriptor.hxx>
#include <sot/storage.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 1b8d4e3bf8ca..3710838687ba 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <memory>
namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index c4aa82e1566c..1e0f8bd61037 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include "callbacks.hxx"
struct AcceptDropEvent;
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 0e99afa760bf..c6cd9d8c3d20 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -39,7 +39,7 @@
#include <com/sun/star/frame/XModule.hpp>
#include <vcl/timer.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <osl/thread.hxx>
#include <cppuhelper/implbase.hxx>
#include <svtools/cliplistener.hxx>
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 3a969d469d39..d267ceb129bd 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <vcl/timer.hxx>
#include <memory>
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index e7b458559fbb..42999baa3fdf 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/toolbox.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <unotools/viewoptions.hxx>
#include "indexes.hxx"
#include <dbaccess/ToolBoxHelper.hxx>
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 9acbf5719a81..47b231272804 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LISTVIEWITEMS_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_INC_LISTVIEWITEMS_HXX
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index a8bd8b2a70db..0711870574a4 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -22,7 +22,7 @@
#include "dbtreelistbox.hxx"
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 1e4417c5df47..3c806697dc85 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -37,7 +37,7 @@
#include <cppuhelper/implbase5.hxx>
#include "callbacks.hxx"
#include <vcl/timer.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <sot/storage.hxx>
#include "TableCopyHelper.hxx"
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 8333fe40324a..8e6a57e909a5 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -27,7 +27,7 @@
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <o3tl/make_unique.hxx>
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 7b5be605292b..b98414ef8d5a 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include "TableFieldInfo.hxx"
#include <UITools.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <comphelper/types.hxx>
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 4ac149299450..808e768ece00 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -48,7 +48,7 @@
#include <core_resource.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <o3tl/make_unique.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 4863cdf46b22..97874d5f0c59 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -41,7 +41,7 @@
#include <sqlmessage.hxx>
#include <UITools.hxx>
#include <osl/diagnose.h>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
using namespace ::svt;
using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index dca0b97052c1..7d570742348a 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -24,7 +24,7 @@
#include <JoinExchange.hxx>
#include <QEnumTypes.hxx>
#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
namespace connectivity
{
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 2567139cd363..7bb8f611a4a6 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -41,7 +41,7 @@
#include <TableWindowAccess.hxx>
#include <browserids.hxx>
#include <connectivity/dbtools.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
using namespace dbaui;
using namespace ::utl;
diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui b/dbaccess/uiconfig/ui/tablesjoindialog.ui
index 0b589e8defeb..f776fcb92f50 100644
--- a/dbaccess/uiconfig/ui/tablesjoindialog.ui
+++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui
@@ -148,7 +148,7 @@
</packing>
</child>
<child>
- <object class="svtlo-SvTreeListBox" id="querylist:border">
+ <object class="vcllo-SvTreeListBox" id="querylist:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 3ee56d5d2985..9355d70e1508 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -101,9 +101,6 @@
#include <o3tl/typed_flags_set.hxx>
#include <svtools/controldims.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/transfer.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/treelistbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
@@ -116,5 +113,8 @@
#include <uno/data.h>
#include <uno/sequence2.h>
#include <unotools/configmgr.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/treelistbox.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 36d52750cf9e..c1356a9a4beb 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -81,8 +81,8 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <salhelper/thread.hxx>
-#include <svtools/svlbitm.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/treelistbox.hxx>
#include <svtools/controldims.hxx>
#include <svx/checklbx.hxx>
#include <tools/gen.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index f0786a5e7868..1b0812a6fc0a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <svx/checklbx.hxx>
#include <tools/link.hxx>
#include <vcl/layout.hxx>
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 053b485cc46f..0f91a4fa24eb 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <editeng/flditem.hxx>
#include <svl/intitem.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 53fa36f92698..6f8299e0716e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -352,10 +352,7 @@ void SvxRTFParser::ReadStyleTable()
case RTF_CHRFMT:
case RTF_BRDRDEF:
case RTF_TABSTOPDEF:
-#ifndef NDEBUG
- auto nEnteringToken = nToken;
-#endif
- auto nEnteringIndex = m_nTokenIndex;
+
if( RTF_SWGDEFS & nToken)
{
if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
@@ -367,17 +364,6 @@ void SvxRTFParser::ReadStyleTable()
}
}
ReadAttr( nToken, &pStyle->aAttrSet );
- if (m_nTokenIndex == nEnteringIndex - 1)
- {
- // we called SkipToken to go back one, but
- // ReadAttrs read nothing, so on next loop
- // of outer while we would end up in the
- // same state again (assert that)
- assert(nEnteringToken == GetNextToken());
- // and loop endlessly, skip format a token
- // instead to avoid that
- SkipToken(1);
- }
break;
}
break;
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 9c4f51efdd93..cad96ca645cd 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <sal/log.hxx>
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index be83dc484fd0..bc6d70a72993 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SELECTLABELDIALOG_HXX
#include <vcl/fixed.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <vcl/button.hxx>
#include <vcl/image.hxx>
#include <vcl/dialog.hxx>
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index ee69ac994211..0c2a4f1c906b 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/runtime/FormController.hpp>
#include <vcl/scrbar.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <vcl/builderfactory.hxx>
namespace pcr
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 890e02afb332..35a82b0da5c7 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index d6821432dd38..48060a099ca7 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -25,7 +25,7 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/edit.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include "sane.hxx"
diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui b/extensions/uiconfig/scanner/ui/sanedialog.ui
index 921bfda03b2d..2d2cda8f4cd5 100644
--- a/extensions/uiconfig/scanner/ui/sanedialog.ui
+++ b/extensions/uiconfig/scanner/ui/sanedialog.ui
@@ -353,7 +353,7 @@
</packing>
</child>
<child>
- <object class="svtlo-SvTreeListBox" id="optionSvTreeListBox:border">
+ <object class="vcllo-SvTreeListBox" id="optionSvTreeListBox:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui
index 25e12a27e8aa..6c40ce48f239 100644
--- a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui
+++ b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui
@@ -98,7 +98,7 @@
</packing>
</child>
<child>
- <object class="svtlo-SvTreeListBox" id="control:border">
+ <object class="vcllo-SvTreeListBox" id="control:border">
<property name="width_request">200</property>
<property name="height_request">150</property>
<property name="visible">True</property>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 01598c883b79..8d9c6d080405 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -289,7 +289,7 @@
<glade-widget-class title="Extended Macro Library" name="basctllo-ExtTreeListBox"
generic-name="Extended Macro Library List" parent="basctllo-TreeListBox"
icon-name="widget-gtk-treeview"/>
- <glade-widget-class title="Tree List" name="svtlo-SvTreeListBox"
+ <glade-widget-class title="Tree List" name="vcllo-SvTreeListBox"
generic-name="Tree List" parent="GtkTreeView"
icon-name="widget-gtk-treeview">
<properties>
@@ -304,40 +304,40 @@
</glade-widget-class>
<glade-widget-class title="Chart Series ListBox" name="chartcontrollerlo-SeriesListBox"
- generic-name="Chart Series ListBox" parent="svtlo-SvTreeListBox"
+ generic-name="Chart Series ListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Hyperlink Tree Box" name="cuilo-SvxHlmarkTreeLBox"
- generic-name="Hyperlink Tree Box" parent="svtlo-SvTreeListBox"
+ generic-name="Hyperlink Tree Box" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Content List Box" name="sfxlo-ContentListBox"
- generic-name="Content List Box" parent="svtlo-SvTreeListBox"
+ generic-name="Content List Box" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="DD ListBox" name="swuilo-DDListBox"
- generic-name="DD ListBox" parent="svtlo-SvTreeListBox"
+ generic-name="DD ListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Animation ListBox" name="sdlo-CustomAnimationList"
- generic-name="Animation ListBox" parent="svtlo-SvTreeListBox"
+ generic-name="Animation ListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tab List" name="svtlo-SvTabListBox"
- generic-name="Tab List" parent="svtlo-SvTreeListBox"
+ generic-name="Tab List" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="CheckBox List" name="basctllo-CheckBox"
generic-name="CheckBox List" parent="svtlo-SvTabListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="SwIdxTreeListBox" name="swuilo-SwIdxTreeListBox"
- generic-name="SwIdxTreeListBox" parent="svtlo-SvTreeListBox"
+ generic-name="SwIdxTreeListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tooltip Tree List" name="swuilo-SwFldRefTreeListBox"
- generic-name="Tooltip Tree List" parent="svtlo-SvTreeListBox"
+ generic-name="Tooltip Tree List" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tab Order ListBox" name="pcrlo-TabOrderListBox"
- generic-name="TabOrderListBox" parent="svtlo-SvTreeListBox"
+ generic-name="TabOrderListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Page Objs ListBox" name="sdlo-SdPageObjsTLB"
- generic-name="SdPageObjsTLB" parent="svtlo-SvTreeListBox"
+ generic-name="SdPageObjsTLB" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Page List Control" name="sduilo-SdPageListControl"
- generic-name="Page List Control" parent="svtlo-SvTreeListBox"
+ generic-name="Page List Control" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Checked Tree List" name="svxlo-SvxCheckListBox"
generic-name="Checked Tree List" parent="GtkTreeView"
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fbd47af237bb..7617eafeef1f 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -34,7 +34,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <rtl/uri.hxx>
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index c872d05ebc84..70313edb33c7 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <svtools/cliplistener.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <osl/diagnose.h>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 3d53e47c3efd..c324be63a943 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -31,7 +31,7 @@
#include <vcl/idle.hxx>
#include <svtools/svmedit.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svl/eitem.hxx>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index e264962f0189..b848fd5f5dce 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -26,7 +26,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/button.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <vector>
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 56a94d40a8fb..0dc29dd8fb19 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -20,7 +20,7 @@
#include <svl/zforlist.hxx>
#include <svl/stritem.hxx>
#include <vcl/builderfactory.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include "structpg.hxx"
#include <formula/formdata.hxx>
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 726b72176927..dc7b53a40b16 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -24,7 +24,7 @@
#include <svtools/svmedit.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <formula/IFunctionDescription.hxx>
namespace formula
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c7211f330a00..17cf1dc0d6d4 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -40,7 +40,7 @@
#include <svtools/fileview.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/svtabbx.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistentry.hxx>
#include <fpicker/strings.hrc>
#include <svtools/helpids.h>
diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx
index bfd6e9a57cc9..05c5715cc0ef 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -106,12 +106,6 @@ namespace svt
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
- createAccessibleTreeListBox(
- SvTreeListBox& _rListBox,
- const css::uno::Reference< css::accessibility::XAccessible >& _xParent
- ) const = 0;
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rOwningTable,
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 3311843c658d..e300fe997fa6 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -25,7 +25,7 @@
#include <vcl/vclptr.hxx>
#include <tools/multisel.hxx>
#include <svtools/headbar.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vector>
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 7a6fa184b563..ca69d2b28386 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -22,7 +22,7 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <memory>
class Graphic;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 973313dadd4a..af19027a2601 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_FILEVIEW_HXX
-#define INCLUDED_SVTOOLS_FILEVIEW_HXX
+#ifndef INCLUDED_VCL_FILEVIEW_HXX
+#define INCLUDED_VCL_FILEVIEW_HXX
#include <memory>
#include <svtools/svtdllapi.h>
@@ -222,6 +222,6 @@ public:
}
-#endif // INCLUDED_SVTOOLS_FILEVIEW_HXX
+#endif // INCLUDED_VCL_FILEVIEW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 5f71cbf244b9..8f925de475ae 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -17,7 +17,6 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/treelistentry.hxx>
#include <tools/urlobj.hxx>
@@ -25,6 +24,7 @@
#include <vcl/image.hxx>
#include <vcl/lstbox.hxx>
+#include <vcl/treelistentry.hxx>
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx
index 0bc974051f0d..2281d35e94d4 100644
--- a/include/svtools/iconview.hxx
+++ b/include/svtools/iconview.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVTOOLS_ICONVIEW_HXX
#include <svtools/svtdllapi.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
class IconView : public SvTreeListBox
{
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 1c37552e87c1..9aae287249b8 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -26,7 +26,7 @@
#include <sot/formats.hxx>
#include <vector>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
class SvObjectServer
{
diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index a0b7f500ab43..6f65b746180b 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVTOOLS_STRINGTRANSFER_HXX
#include <svtools/svtdllapi.h>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
namespace svt
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 65277e05f372..c33ccc5993c8 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SVTOOLS_SVTABBX_HXX
#include <svtools/svtdllapi.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <memory>
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index b9eb98e36071..c4fdf21cf341 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <svx/svxdllapi.h>
#include <tools/contnr.hxx>
#include <tools/solar.h>
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index dd7a179da93e..66addcee31c5 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <sfx2/dockwin.hxx>
#include <svl/lstner.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svtools/valueset.hxx>
#include <svx/SvxColorValueSet.hxx>
#include <svx/xtable.hxx>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c6c15baf5148..72cfe2024123 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -24,10 +24,10 @@
#include <sal/types.h>
#include <svx/svxdllapi.h>
#include <svtools/simptabl.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <tools/date.hxx>
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 7d905d2d5841..ffae51c0849a 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <o3tl/typed_flags_set.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <svx/dataaccessdescriptor.hxx>
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 533b53624f96..e9410ea65632 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_DBAOBJECTEX_HXX
#define INCLUDED_SVX_DBAOBJECTEX_HXX
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/ucb/XContent.hpp>
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index d85c639a46c1..39cb7c77c894 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <svx/gridctrl.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
#include <memory>
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 876c22fc32af..8cb9fedc90fc 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_FONTLB_HXX
#include <svtools/svtabbx.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
#include <vcl/virdev.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 9bae181fb115..16eda958e21c 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -28,7 +28,7 @@
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
#include <svl/slstitm.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svtools/valueset.hxx>
#include <svtools/brwbox.hxx>
#include <vcl/GraphicObject.hxx>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 6a2d05a95655..2c21b09ae822 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -22,9 +22,9 @@
#include <sot/formats.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/imap.hxx>
+#include <vcl/imap.hxx>
#include <svl/hint.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/svdobj.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/XProgressMonitor.hpp>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index be0ef9ec2be9..28d73582a091 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -28,7 +28,7 @@
#include <vcl/weld.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svl/lstner.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/svdmodel.hxx>
#include <svx/galmisc.hxx>
#include <memory>
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 278db98ab41d..56bf87726d6b 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -34,7 +34,7 @@
#include <svtools/editbrowsebox.hxx>
#include <osl/mutex.hxx>
#include <comphelper/propmultiplex.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 371dd5a833e3..ac4070fa3d11 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_XMLEXCHG_HXX
#include <rtl/ustring.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
namespace com {
diff --git a/include/svtools/imap.hxx b/include/vcl/imap.hxx
similarity index 96%
rename from include/svtools/imap.hxx
rename to include/vcl/imap.hxx
index 98835c15bb19..bba9ebe6b84c 100644
--- a/include/svtools/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_IMAP_HXX
-#define INCLUDED_SVTOOLS_IMAP_HXX
+#ifndef INCLUDED_VCL_IMAP_HXX
+#define INCLUDED_VCL_IMAP_HXX
-#include <svtools/imapobj.hxx>
-#include <svtools/svtdllapi.h>
+#include <vcl/imapobj.hxx>
+#include <vcl/dllapi.h>
#include <tools/stream.hxx>
#include <memory>
#include <vector>
@@ -32,7 +32,7 @@ class Size;
class Fraction;
class IMapObject;
-class SVT_DLLPUBLIC ImageMap final
+class VCL_DLLPUBLIC ImageMap final
{
private:
@@ -133,6 +133,6 @@ public:
~IMapCompat();
};
-#endif // INCLUDED_SVTOOLS_IMAP_HXX
+#endif // INCLUDED_VCL_IMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/imapcirc.hxx b/include/vcl/imapcirc.hxx
similarity index 92%
rename from include/svtools/imapcirc.hxx
rename to include/vcl/imapcirc.hxx
index 92e06ed88e0c..f021f7ddffde 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/vcl/imapcirc.hxx
@@ -16,16 +16,16 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_IMAPCIRC_HXX
-#define INCLUDED_SVTOOLS_IMAPCIRC_HXX
+#ifndef INCLUDED_VCL_IMAPCIRC_HXX
+#define INCLUDED_VCL_IMAPCIRC_HXX
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
#include <tools/gen.hxx>
-#include <svtools/imapobj.hxx>
+#include <vcl/imapobj.hxx>
class Fraction;
-class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
+class VCL_DLLPUBLIC IMapCircleObject : public IMapObject
{
Point aCenter;
sal_Int32 nRadius;
diff --git a/include/svtools/imapobj.hxx b/include/vcl/imapobj.hxx
similarity index 97%
rename from include/svtools/imapobj.hxx
rename to include/vcl/imapobj.hxx
index be3261abe5e0..1e5ab2e5c18c 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_IMAPOBJ_HXX
-#define INCLUDED_SVTOOLS_IMAPOBJ_HXX
+#ifndef INCLUDED_VCL_IMAPOBJ_HXX
+#define INCLUDED_VCL_IMAPOBJ_HXX
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
#include <svl/macitem.hxx>
#include <rtl/strbuf.hxx>
@@ -48,7 +48,7 @@ class SvStream;
#define IMAP_ERR_OK 0x00000000L
#define IMAP_ERR_FORMAT 0x00000001L
-class SVT_DLLPUBLIC IMapObject
+class VCL_DLLPUBLIC IMapObject
{
friend class ImageMap;
diff --git a/include/svtools/imappoly.hxx b/include/vcl/imappoly.hxx
similarity index 91%
rename from include/svtools/imappoly.hxx
rename to include/vcl/imappoly.hxx
index 088cf9760deb..a285085e8a69 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/vcl/imappoly.hxx
@@ -17,22 +17,22 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_IMAPPOLY_HXX
-#define INCLUDED_SVTOOLS_IMAPPOLY_HXX
+#ifndef INCLUDED_VCL_IMAPPOLY_HXX
+#define INCLUDED_VCL_IMAPPOLY_HXX
-#include <svtools/svtdllapi.h>
-#include <svtools/imapobj.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/imapobj.hxx>
#include <tools/poly.hxx>
class Fraction;
-class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
+class VCL_DLLPUBLIC IMapPolygonObject : public IMapObject
{
tools::Polygon aPoly;
tools::Rectangle aEllipse;
bool bEllipse;
- SVT_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
+ VCL_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
protected:
diff --git a/include/svtools/imaprect.hxx b/include/vcl/imaprect.hxx
similarity index 90%
rename from include/svtools/imaprect.hxx
rename to include/vcl/imaprect.hxx
index 709f803cb9a4..49fabcff5147 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/vcl/imaprect.hxx
@@ -16,20 +16,20 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_IMAPRECT_HXX
-#define INCLUDED_SVTOOLS_IMAPRECT_HXX
+#ifndef INCLUDED_VCL_IMAPRECT_HXX
+#define INCLUDED_VCL_IMAPRECT_HXX
-#include <svtools/svtdllapi.h>
-#include <svtools/imapobj.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/imapobj.hxx>
#include <tools/gen.hxx>
class Fraction;
-class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
+class VCL_DLLPUBLIC IMapRectangleObject : public IMapObject
{
tools::Rectangle aRect;
- SVT_DLLPRIVATE void ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
+ VCL_DLLPRIVATE void ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
protected:
diff --git a/include/svtools/inetimg.hxx b/include/vcl/inetimg.hxx
similarity index 94%
rename from include/svtools/inetimg.hxx
rename to include/vcl/inetimg.hxx
index f173f7bc72e7..374a2122dfc6 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/vcl/inetimg.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_INETIMG_HXX
-#define INCLUDED_SVTOOLS_INETIMG_HXX
+#ifndef INCLUDED_VCL_INETIMG_HXX
+#define INCLUDED_VCL_INETIMG_HXX
#include <tools/gen.hxx>
#include <sot/formats.hxx>
@@ -54,7 +54,7 @@ public:
bool Read( SvStream& rIStm, SotClipboardFormatId nFormat );
};
-#endif // INCLUDED_SVTOOLS_INETIMG_HXX
+#endif // INCLUDED_VCL_INETIMG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/svimpbox.hxx b/include/vcl/svimpbox.hxx
similarity index 98%
rename from svtools/source/inc/svimpbox.hxx
rename to include/vcl/svimpbox.hxx
index 28fa2ed4b427..1ce5681f398b 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/include/vcl/svimpbox.hxx
@@ -17,9 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_SOURCE_INC_SVIMPBOX_HXX
-#define INCLUDED_SVTOOLS_SOURCE_INC_SVIMPBOX_HXX
+#ifndef INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
+#define INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
+#include <vcl/dllapi.h>
#include <vcl/seleng.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/vclevent.hxx>
@@ -27,7 +28,6 @@
#include <o3tl/enumarray.hxx>
#include <memory>
#include <vector>
-#include "svtaccessiblefactory.hxx"
class SvTreeListBox;
class Point;
@@ -84,7 +84,7 @@ namespace o3tl
#define NODE_BMP_TABDIST_NOTVALID -2000000
#define FIRST_ENTRY_TAB 1
-class SvImpLBox
+class VCL_DLLPUBLIC SvImpLBox
{
friend class ImpLBSelEng;
friend class SvTreeListBox;
@@ -100,9 +100,6 @@ private:
VclPtr<ScrollBar> aHorSBar;
VclPtr<ScrollBarBox> aScrBarBox;
- ::svt::AccessibleFactoryAccess
- m_aFactoryAccess;
-
static Image* s_pDefCollapsed;
static Image* s_pDefExpanded;
static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed
@@ -411,6 +408,6 @@ inline void SvImpLBox::TreeInserted( SvTreeListEntry* pInsTree )
EntryInserted( pInsTree );
}
-#endif // INCLUDED_SVTOOLS_SOURCE_INC_SVIMPBOX_HXX
+#endif // INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svlbitm.hxx b/include/vcl/svlbitm.hxx
similarity index 95%
rename from include/svtools/svlbitm.hxx
rename to include/vcl/svlbitm.hxx
index d0125b3a09a6..854c4666d50e 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/vcl/svlbitm.hxx
@@ -18,14 +18,14 @@
*/
-#ifndef INCLUDED_SVTOOLS_SVLBITM_HXX
-#define INCLUDED_SVTOOLS_SVLBITM_HXX
+#ifndef INCLUDED_VCL_SVLBITM_HXX
+#define INCLUDED_VCL_SVLBITM_HXX
#include <memory>
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
#include <tools/link.hxx>
#include <vcl/image.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
#include <o3tl/typed_flags_set.hxx>
class SvTreeListEntry;
@@ -57,7 +57,7 @@ namespace o3tl
struct SvLBoxButtonData_Impl;
-class SVT_DLLPUBLIC SvLBoxButtonData
+class VCL_DLLPUBLIC SvLBoxButtonData
{
private:
Link<SvLBoxButtonData*,void> aLink;
@@ -67,8 +67,8 @@ private:
bool bDataOk;
std::vector<Image> aBmps; // indices s. constants BMP_ ....
- SVT_DLLPRIVATE void SetWidthAndHeight();
- SVT_DLLPRIVATE void InitData( bool _bRadioBtn, const Control* pControlForSettings );
+ VCL_DLLPRIVATE void SetWidthAndHeight();
+ VCL_DLLPRIVATE void InitData( bool _bRadioBtn, const Control* pControlForSettings );
public:
// include creating default images (CheckBox or RadioButton)
SvLBoxButtonData( const Control* pControlForSettings );
@@ -100,7 +100,7 @@ public:
// **********************************************************************
-class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxString : public SvLBoxItem
{
protected:
OUString maText;
@@ -132,7 +132,7 @@ public:
virtual std::unique_ptr<SvLBoxItem> Clone(SvLBoxItem const * pSource) const override;
};
-class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxButton : public SvLBoxItem
{
bool isVis;
SvLBoxButtonData* pData;
@@ -222,7 +222,7 @@ inline void SvLBoxButton::SetStateHilighted( bool bHilight )
struct SvLBoxContextBmp_Impl;
-class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
{
std::unique_ptr<SvLBoxContextBmp_Impl> m_pImpl;
public:
diff --git a/include/svtools/transfer.hxx b/include/vcl/transfer.hxx
similarity index 97%
rename from include/svtools/transfer.hxx
rename to include/vcl/transfer.hxx
index 24ddf24be61f..7539048d18f6 100644
--- a/include/svtools/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TRANSFER_HXX
-#define INCLUDED_SVTOOLS_TRANSFER_HXX
+#ifndef INCLUDED_VCL_TRANSFER_HXX
+#define INCLUDED_VCL_TRANSFER_HXX
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
#include <tools/globname.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
@@ -79,7 +79,7 @@ struct TransferableObjectDescriptor
: mnViewAspect(css::embed::Aspects::MSOLE_CONTENT)
{}
- SVT_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
+ VCL_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
};
struct AcceptDropEvent
@@ -121,7 +121,7 @@ struct ExecuteDropEvent
mbDefault( false ) {}
};
-class SVT_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datatransfer::XTransferable2,
+class VCL_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datatransfer::XTransferable2,
css::datatransfer::clipboard::XClipboardOwner,
css::datatransfer::dnd::XDragSourceListener,
css::lang::XUnoTunnel >
@@ -211,7 +211,7 @@ protected:
private:
- SVT_DLLPRIVATE void ImplFlush();
+ VCL_DLLPRIVATE void ImplFlush();
protected:
@@ -261,7 +261,7 @@ public:
struct TransferableDataHelper_Impl;
-class SVT_DLLPUBLIC TransferableDataHelper final
+class VCL_DLLPUBLIC TransferableDataHelper final
{
friend class DropTargetHelper;
@@ -358,7 +358,7 @@ public:
const css::datatransfer::DataFlavor& rRequestFlavor );
};
-class SVT_DLLPUBLIC DragSourceHelper
+class VCL_DLLPUBLIC DragSourceHelper
{
private:
@@ -404,7 +404,7 @@ public:
virtual ~DragSourceHelper();
};
-class SVT_DLLPUBLIC DropTargetHelper
+class VCL_DLLPUBLIC DropTargetHelper
{
private:
@@ -472,7 +472,7 @@ public:
struct TransferDataContainer_Impl;
-class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
+class VCL_DLLPUBLIC TransferDataContainer : public TransferableHelper
{
std::unique_ptr<TransferDataContainer_Impl> pImpl;
diff --git a/include/svtools/treelist.hxx b/include/vcl/treelist.hxx
similarity index 95%
rename from include/svtools/treelist.hxx
rename to include/vcl/treelist.hxx
index 0d190ab3a022..fb2aa3333adc 100644
--- a/include/svtools/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_TREELIST_HXX
-#define INCLUDED_SVTOOLS_TREELIST_HXX
+#ifndef INCLUDED_VCL_TREELIST_HXX
+#define INCLUDED_VCL_TREELIST_HXX
-#include <svtools/svtdllapi.h>
-#include <svtools/treelistentries.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/treelistentries.hxx>
+#include <vcl/viewdataentry.hxx>
#include <tools/solar.h>
#include <tools/link.hxx>
@@ -63,7 +63,7 @@ struct SvSortData
const SvTreeListEntry* pRight;
};
-class SVT_DLLPUBLIC SvTreeList final
+class VCL_DLLPUBLIC SvTreeList final
{
typedef std::vector<SvListView*> ListViewsType;
@@ -106,26 +106,26 @@ class SVT_DLLPUBLIC SvTreeList final
static void Expand( SvListView*,SvTreeListEntry* pParent );
static void Collapse( SvListView*,SvTreeListEntry* pParent );
- SVT_DLLPRIVATE void SetAbsolutePositions();
+ VCL_DLLPRIVATE void SetAbsolutePositions();
- SVT_DLLPRIVATE void CloneChildren(
+ VCL_DLLPRIVATE void CloneChildren(
SvTreeListEntries& rDst, sal_uLong& rCloneCount, SvTreeListEntries& rSrc, SvTreeListEntry& rNewParent) const;
/**
* Invalidate the cached position data to have them re-generated before
* the next access.
*/
- SVT_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
+ VCL_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
// rPos is not changed for SortModeNone
- SVT_DLLPRIVATE void GetInsertionPos(
+ VCL_DLLPRIVATE void GetInsertionPos(
SvTreeListEntry const * pEntry,
SvTreeListEntry* pParent,
sal_uLong& rPos
);
- SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
- SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
+ VCL_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
+ VCL_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
SvTreeList(const SvTreeList&) = delete;
SvTreeList& operator= (const SvTreeList&) = delete;
@@ -224,7 +224,7 @@ public:
void Reverse();
};
-class SVT_DLLPUBLIC SvListView
+class VCL_DLLPUBLIC SvListView
{
friend class SvTreeList;
diff --git a/include/svtools/treelistbox.hxx b/include/vcl/treelistbox.hxx
similarity index 97%
rename from include/svtools/treelistbox.hxx
rename to include/vcl/treelistbox.hxx
index c4df5127375c..464b9d30f864 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list