diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-08 09:02:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-07 22:01:02 +0100 |
| commit | 6311f7ffce8f64b0773d2ad3ea7be3be683924c0 (patch) | |
| tree | 67a59c93ca968838e86b63da214c75e98f8d0626 | |
| parent | uitest Table to text dialog (diff) | |
| download | core-6311f7ffce8f64b0773d2ad3ea7be3be683924c0.tar.gz core-6311f7ffce8f64b0773d2ad3ea7be3be683924c0.zip | |
move SvTreeListBox to vcl
Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44
Reviewed-on: https://gerrit.libreoffice.org/62787
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
368 files changed, 941 insertions, 1005 deletions
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 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 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 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 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 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 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 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 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 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 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 index c4df5127375c..464b9d30f864 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TREELISTBOX_HXX -#define INCLUDED_SVTOOLS_TREELISTBOX_HXX +#ifndef INCLUDED_VCL_TREELISTBOX_HXX +#define INCLUDED_VCL_TREELISTBOX_HXX -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <deque> #include <memory> @@ -36,8 +36,8 @@ #include <vcl/image.hxx> #include <tools/gen.hxx> #include <tools/contnr.hxx> -#include <svtools/treelist.hxx> -#include <svtools/transfer.hxx> +#include <vcl/treelist.hxx> +#include <vcl/transfer.hxx> #include <vcl/idle.hxx> #include <o3tl/typed_flags_set.hxx> @@ -120,7 +120,7 @@ enum class SvTreeAccRoleType enum class SvLBoxItemType {String, Button, ContextBmp}; -class SvLBoxTab +class VCL_DLLPUBLIC SvLBoxTab { long nPos; public: @@ -138,7 +138,7 @@ public: bool IsEditable() const { return bool(nFlags & SvLBoxTabFlags::EDITABLE); } }; -class SVT_DLLPUBLIC SvLBoxItem +class VCL_DLLPUBLIC SvLBoxItem { public: SvLBoxItem(); @@ -191,8 +191,9 @@ namespace o3tl } struct SvTreeListBoxImpl; +class SalInstanceTreeView; -class SVT_DLLPUBLIC SvTreeListBox +class VCL_DLLPUBLIC SvTreeListBox :public Control ,public SvListView ,public DropTargetHelper @@ -203,6 +204,7 @@ class SVT_DLLPUBLIC SvTreeListBox friend class SvImpLBox; friend class IconViewImpl; friend class TreeControlPeer; + friend class SalInstanceTreeView; std::unique_ptr<SvTreeListBoxImpl> mpImpl; Link<SvTreeListBox*,void> aCheckButtonHdl; @@ -271,8 +273,8 @@ private: // call. The AddBox method is called from the GetDragFinishedHdl() and the // remove is called in the link callback and in the dtor. So it can't be // called for a deleted object. - SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); - SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); + VCL_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); + VCL_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8, void ); protected: @@ -491,9 +493,6 @@ public: // ACCESSIBILITY ========================================================== - /** Creates and returns the accessible object of the Box. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - /** Fills the StateSet of one entry. */ void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -522,16 +521,16 @@ public: protected: - SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry const * pEntry ); - SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp ); - SVT_DLLPRIVATE void AdjustEntryHeight(); + VCL_DLLPRIVATE void SetEntryHeight( SvTreeListEntry const * pEntry ); + void AdjustEntryHeight( const Image& rBmp ); + VCL_DLLPRIVATE void AdjustEntryHeight(); - SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); - SVT_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext ); + VCL_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); + VCL_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext ); - SVT_DLLPRIVATE void InitTreeView(); - SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab ); - SVT_DLLPRIVATE void ImplInitStyle(); + VCL_DLLPRIVATE void InitTreeView(); + VCL_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab ); + VCL_DLLPRIVATE void ImplInitStyle(); void SetupDragOrigin(); void EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem, diff --git a/include/svtools/treelistentries.hxx b/include/vcl/treelistentries.hxx index a7880f87d237..ffe0cb571c55 100644 --- a/include/svtools/treelistentries.hxx +++ b/include/vcl/treelistentries.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_TREELISTENTRIES_HXX -#define INCLUDED_SVTOOLS_TREELISTENTRIES_HXX +#ifndef INCLUDED_VCL_TREELISTENTRIES_HXX +#define INCLUDED_VCL_TREELISTENTRIES_HXX #include <vector> #include <memory> diff --git a/include/svtools/treelistentry.hxx b/include/vcl/treelistentry.hxx index 303ebb55d643..c734729174ce 100644 --- a/include/svtools/treelistentry.hxx +++ b/include/vcl/treelistentry.hxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_TREELISTENTRY_HXX -#define INCLUDED_SVTOOLS_TREELISTENTRY_HXX +#ifndef INCLUDED_VCL_TREELISTENTRY_HXX +#define INCLUDED_VCL_TREELISTENTRY_HXX -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <tools/solar.h> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentries.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentries.hxx> #include <o3tl/typed_flags_set.hxx> #include <vector> @@ -47,8 +47,7 @@ namespace o3tl template<> struct typed_flags<SvTLEntryFlags> : is_typed_flags<SvTLEntryFlags, 0x801f> {}; } - -class SVT_DLLPUBLIC SvTreeListEntry +class VCL_DLLPUBLIC SvTreeListEntry { friend class SvTreeList; friend class SvListView; diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 0b673774dc75..e56801af17f4 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -23,6 +23,7 @@ #include <vcl/combobox.hxx> #include <vcl/spinfld.hxx> #include <vcl/tabctrl.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/dllapi.h> @@ -404,6 +405,55 @@ protected: virtual OUString get_name() const override; }; +class UITEST_DLLPUBLIC TreeListUIObject : public WindowUIObject +{ +public: + TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList); + + virtual StringMap get_state() override; + + static std::unique_ptr<UIObject> create(vcl::Window* pWindow); + + virtual void execute(const OUString& rAction, + const StringMap& rParameters) override; + + virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; + + virtual std::set<OUString> get_children() const override; + +protected: + + virtual OUString get_name() const override; + +private: + + VclPtr<SvTreeListBox> mxTreeList; +}; + +class UITEST_DLLPUBLIC TreeListEntryUIObject : public UIObject +{ +public: + + TreeListEntryUIObject(const VclPtr<SvTreeListBox>& xTreeList, SvTreeListEntry* pEntry); + + virtual StringMap get_state() override; + + virtual void execute(const OUString& rAction, + const StringMap& rParameters) override; + + virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; + + virtual std::set<OUString> get_children() const override; + + virtual OUString get_type() const override; + +private: + + VclPtr<SvTreeListBox> mxTreeList; + + SvTreeListEntry* const mpEntry; +}; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/viewdataentry.hxx b/include/vcl/viewdataentry.hxx index 1a61b3f6c13a..1277b75edf29 100644 --- a/include/svtools/viewdataentry.hxx +++ b/include/vcl/viewdataentry.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX -#define INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX +#ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX +#define INCLUDED_VCL_VIEWDATAENTRY_HXX -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <tools/solar.h> #include <tools/gen.hxx> @@ -40,7 +40,7 @@ struct SvViewDataItem * highlighted. When an entry is only highlighted, it looks visually * highlighted, but not logically selected. */ -class SVT_DLLPUBLIC SvViewDataEntry +class VCL_DLLPUBLIC SvViewDataEntry { friend class SvTreeList; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index b2c3fbcc2eb0..3152ecdeedf1 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -441,10 +441,7 @@ #include <svtools/statusbarcontroller.hxx> #include <svtools/svtdllapi.h> #include <svtools/toolboxcontroller.hxx> -#include <svtools/transfer.hxx> -#include <svtools/treelistentries.hxx> #include <svtools/valueset.hxx> -#include <svtools/viewdataentry.hxx> #include <svx/Palette.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/XPropertyEntry.hxx> @@ -578,5 +575,8 @@ #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> +#include <vcl/transfer.hxx> +#include <vcl/treelistentries.hxx> +#include <vcl/viewdataentry.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 41c969996839..83fe38f92de1 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -42,7 +42,7 @@ #include <comphelper/property.hxx> #include <svtools/imgdef.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> namespace rptui { diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index 73485b48f4fe..b2fad269dbd2 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -20,7 +20,7 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX #include <com/sun/star/beans/PropertyValue.hpp> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <GroupsSorting.hxx> namespace rptui diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index c03a13fc6505..8746c738c460 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -39,8 +39,8 @@ #include <comphelper/containermultiplexer.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/SelectionMultiplex.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> #include <svl/solar.hrc> #include <ReportVisitor.hxx> #include <core_resource.hxx> diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 42b4091c81e5..0b532e51c63b 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -22,8 +22,8 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <svtools/transfer.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/transfer.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/floatwin.hxx> #include <comphelper/propmultiplex.hxx> #include <comphelper/containermultiplexer.hxx> diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index e956cb434c97..683d0f5c5fdf 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -49,7 +49,7 @@ #include <comphelper/interfacecontainer2.hxx> #include <dbaccess/dbsubcomponentcontroller.hxx> #include <svl/lstner.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svx/svdedtv.hxx> #include <sfx2/zoomitem.hxx> diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index ece70bcb1320..ad334f194234 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -26,7 +26,7 @@ #include <cppuhelper/basemutex.hxx> #include "ReportDefines.hxx" #include "dlgedfunc.hxx" -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <rtl/ref.hxx> #include <memory> diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index 75ebfacf1785..d4974ed7c40a 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <com/sun/star/beans/NamedValue.hpp> namespace rptui diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index ecedf0c8dc03..3ad0ca074e95 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -274,7 +274,6 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <svtools/svtdllapi.h> -#include <svtools/transfer.hxx> #include <svx/algitem.hxx> #include <svx/itextprovider.hxx> #include <svx/msdffdef.hxx> @@ -324,6 +323,7 @@ #include <unotools/textsearch.hxx> #include <unotools/unotoolsdllapi.h> #include <userdat.hxx> +#include <vcl/transfer.hxx> #include <viewopti.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx index 244b05d121cb..e4b00da4a333 100644 --- a/sc/inc/pch/precompiled_scui.hxx +++ b/sc/inc/pch/precompiled_scui.hxx @@ -139,8 +139,6 @@ #include <svtools/collatorres.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> #include <svx/algitem.hxx> #include <svx/colorbox.hxx> #include <svx/dlgutil.hxx> @@ -161,6 +159,8 @@ #include <unotools/transliterationwrapper.hxx> #include <unotools/useroptions.hxx> #include <userlist.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <viewopti.hxx> #include <zforauto.hxx> diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index d3d9de0cfcc1..56874721f0f1 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SC_INC_USERDAT_HXX #include <svx/svdobj.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include "address.hxx" #include "drwlayer.hxx" diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx index e3a64a685c03..13101973d2c6 100644 --- a/sc/source/core/tool/orcusxml.cxx +++ b/sc/source/core/tool/orcusxml.cxx @@ -9,7 +9,7 @@ #include <orcusxml.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) : mnNamespaceID(0) diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 1bda4156adf2..d8cc0e371e1e 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -26,7 +26,7 @@ #include <sot/exchange.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svtools/embedtransfer.hxx> #include <svl/urihelper.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index 2b98a1285455..edfdb6b65aec 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -13,8 +13,8 @@ #include <document.hxx> #include <tokenarray.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> #include <ucbhelper/content.hxx> #include <o3tl/make_unique.hxx> #include <sal/log.hxx> diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 66634b542c9d..68a7fea25e00 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -34,8 +34,8 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <svtools/fmtfield.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <document.hxx> using namespace com::sun::star; diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 43f82ed302f5..e5f87de8f2c5 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -12,7 +12,7 @@ #include <PivotLayoutTreeList.hxx> #include <PivotLayoutDialog.hxx> #include <reffact.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <o3tl/make_unique.hxx> #include <rangeutl.hxx> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx index 91eaea1dfdc5..6bfba04a1875 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx @@ -14,7 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <pivot.hxx> #include <scabstdlg.hxx> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 85c8db0ce17a..c1fbecb99031 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -13,7 +13,7 @@ #include <PivotLayoutDialog.hxx> #include <reffact.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <scabstdlg.hxx> ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType) diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index b88862471bc1..10fc31d77efc 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -14,7 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <pivot.hxx> #include <scabstdlg.hxx> #include <globstr.hrc> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index 0672c7905632..fddd967edcde 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -14,7 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <pivot.hxx> #include <scabstdlg.hxx> diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 3b0a8299d1c1..e294c3d8a1d0 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -10,7 +10,7 @@ #include <searchresults.hxx> #include <svtools/simptabl.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <dociter.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 1bbfe5144d1a..242c3fc57a75 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -53,7 +53,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/cliplistener.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svl/whiter.hxx> #include <svl/languageoptions.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index d0a93a4001e9..92f09f3f61a6 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -28,7 +28,7 @@ #include <editeng/spltitem.hxx> #include <editeng/widwitem.hxx> #include <sot/exchange.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sc.hrc> #include <drtxtob.hxx> diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 8a15a58ac848..2c450ea7a3d2 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -25,7 +25,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svx/svdouno.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpagv.hxx> diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index b26e43aab1da..df788d2101d1 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -24,7 +24,7 @@ #include <sfx2/objsh.hxx> #include <svl/zforlist.hxx> #include <svl/stritem.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 147792ea5bac..fb5d9a0061b9 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -11,7 +11,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTTREELISTBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTTREELISTBASE_HXX -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <pivot.hxx> diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 681bdf7f2c06..8a5b6463e0ff 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -14,7 +14,7 @@ #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/timer.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/svlbitm.hxx> #include <memory> #include <unordered_set> diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index f02204ca34ed..024bde841d57 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_CONTENT_HXX #define INCLUDED_SC_SOURCE_UI_INC_CONTENT_HXX -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <address.hxx> #include <tools/solar.h> #include <o3tl/enumarray.hxx> diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 12c873fb0561..77bb377dd1bc 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SC_SOURCE_UI_INC_DRWTRANS_HXX #include <com/sun/star/uno/Reference.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/objsh.hxx> #include <charthelper.hxx> diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 24415a7041cb..37ff1afeebb6 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_GRIDWIN_HXX #define INCLUDED_SC_SOURCE_UI_INC_GRIDWIN_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include "viewutil.hxx" #include "viewdata.hxx" #include "cbutton.hxx" diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 1a78985ffee0..14ccb55dd4f3 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -29,7 +29,7 @@ #include <vcl/combobox.hxx> #include <vcl/scrbar.hxx> #include <vcl/window.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> class EditView; class ScAccessibleEditLineTextData; diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index b3f00e7be599..9f4e3136c812 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_LNKTRANS_HXX #define INCLUDED_SC_SOURCE_UI_INC_LNKTRANS_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <rtl/ustring.hxx> class ScLinkTransferObj : public TransferableHelper diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index cb757fbd6d14..af73f0adf896 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_SELTRANS_HXX #define INCLUDED_SC_SOURCE_UI_INC_SELTRANS_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <rtl/ref.hxx> class ScTabView; diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index d59af229d90d..5f41ac8c5919 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -22,7 +22,7 @@ #include <types.hxx> #include <svtools/tabbar.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> class ScViewData; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 9c2bd0a59b93..211fa8fc7ef2 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TRANSOBJ_HXX #define INCLUDED_SC_SOURCE_UI_INC_TRANSOBJ_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <address.hxx> #include <document.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 2e48dbfd8bab..822ac54b72ea 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -13,7 +13,7 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include "anyrefdg.hxx" #include <orcusxml.hxx> diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 18fea8c6a470..bcd6cd0549e1 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -26,8 +26,8 @@ #include <rtl/math.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/localedatawrapper.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <o3tl/make_unique.hxx> #include <algorithm> diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index ebbdcea7f80d..cd1f340dea28 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -30,8 +30,8 @@ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <svl/urlbmk.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <stdlib.h> #include <sal/log.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index cfbc5ee29efa..a5b2a9f225c1 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -21,8 +21,8 @@ #include <scopetools.hxx> #include <viewdata.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #if HAVE_FEATURE_OPENCL #include <formulagroup.hxx> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 94bd48e87301..ecef90136b04 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -54,7 +54,7 @@ #include <svtools/cliplistener.hxx> #include <svl/whiter.hxx> #include <sot/formats.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svl/stritem.hxx> #include <editsh.hxx> diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index a89e77adda2e..bcaa4c789c78 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -24,7 +24,7 @@ #include <editeng/editview.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 4f29020e36d3..ce86a71685e2 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -38,7 +38,7 @@ #include <svtools/langtab.hxx> #include <vcl/graphicfilter.hxx> #include <svl/stritem.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svl/urlbmk.hxx> #include <svl/sharedstringpool.hxx> #include <vcl/weld.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 68751d4e148b..fc5d357704cf 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -40,7 +40,7 @@ #include <sot/storage.hxx> #include <svl/ptitem.hxx> #include <svl/stritem.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <vcl/graph.hxx> #include <comphelper/lok.hxx> diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index fc5b3f067241..995498a4d6ee 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -18,9 +18,9 @@ #include <unotools/pathoptions.hxx> #include <tools/urlobj.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 <sfx2/objsh.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui index e4889f530bc6..aa153f6a9cc9 100644 --- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui +++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui @@ -109,7 +109,7 @@ <property name="column_spacing">12</property> <property name="row_homogeneous">True</property> <child> - <object class="svtlo-SvTreeListBox" id="tree:border"> + <object class="vcllo-SvTreeListBox" id="tree:border"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx index 2db510b2dc20..b5eb928ffeaa 100644 --- a/sd/inc/imapinfo.hxx +++ b/sd/inc/imapinfo.hxx @@ -22,7 +22,7 @@ #include "glob.hxx" #include <svx/svdobj.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> class SdIMapInfo : public SdrObjUserData, public SfxListener { diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 0f42d8defb23..66be4b1d39dd 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -427,11 +427,9 @@ #include <svtools/accessibilityoptions.hxx> #include <svtools/colorcfg.hxx> #include <svtools/ctrltool.hxx> -#include <svtools/imapobj.hxx> #include <svtools/langtab.hxx> #include <svtools/sfxecode.hxx> #include <svtools/svtdllapi.h> -#include <svtools/transfer.hxx> #include <svx/SvxColorChildWindow.hxx> #include <svx/bmpmask.hxx> #include <svx/dialmgr.hxx> @@ -564,6 +562,8 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/useroptions.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/transfer.hxx> #include <xmloff/autolayout.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 49668dcbc2ff..dd6dc1a1ce3c 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -445,9 +445,7 @@ #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/treelistentries.hxx> #include <svtools/valueset.hxx> -#include <svtools/viewdataentry.hxx> #include <svx/Palette.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/XPropertyEntry.hxx> @@ -582,5 +580,7 @@ #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> +#include <vcl/treelistentries.hxx> +#include <vcl/viewdataentry.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 11f30034c3e4..91613f50c961 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -43,7 +43,7 @@ #include <editeng/outliner.hxx> #include <svx/svditer.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <boost/property_tree/json_parser.hpp> #include <comphelper/lok.hxx> diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 13dd08e1607b..a8afa9567e42 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -44,9 +44,9 @@ #include <vcl/wrkwin.hxx> #include <svl/aeitem.hxx> #include <svx/svditer.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 <editeng/outlobj.hxx> #include <editeng/editobj.hxx> #include <svx/svdopath.hxx> diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 1d70cb38f7ff..909ea4d21bdf 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -36,9 +36,9 @@ #include <sdresid.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 <strings.hrc> diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 195d782bc455..2040e7f4f6eb 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -25,7 +25,7 @@ #include <memory> #include <com/sun/star/drawing/XShape.hpp> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <CustomAnimationEffect.hxx> #include <CustomAnimationPreset.hxx> diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index c9ea8f51b6cd..b01640be56ca 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -14,7 +14,7 @@ #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/field.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include "RemoteDialogClientBox.hxx" diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 4ece6d0e9c8f..be696d9ea04e 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -29,7 +29,7 @@ #include <customshowlist.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <unotools/charclass.hxx> // SdCustomShowDlg diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index d76038ba1481..c2e3ce59bb4e 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -54,8 +54,8 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <svtools/acceleratorexecute.hxx> #include <svtools/embedtransfer.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/processfactory.hxx> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 0f4fb18cd173..6b3872fefdae 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -32,7 +32,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <svx/svdpagv.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svx/svxids.hrc> #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index a2429c38c2f5..013b1c5aa829 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -52,7 +52,7 @@ #include <sfx2/printer.hxx> #include <comphelper/classids.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svl/urlbmk.hxx> #include <svx/svdobj.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 6ac2999d630e..81988e00a351 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -27,7 +27,7 @@ #include <svx/svdogrp.hxx> #include <svx/scene3d.hxx> #include <drawview.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svl/urihelper.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/securityoptions.hxx> diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index da080297ab87..3654f47026ce 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_LAYERTABBAR_HXX #include <svtools/tabbar.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sddllapi.h> namespace sd { diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 32ccc6741a7a..4fd3c496343f 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_TABCONTROL_HXX #include <svtools/tabbar.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> namespace sd { diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 4619b7035234..920deb89f0cc 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -23,7 +23,7 @@ #include <memory> #include <pres.hxx> #include <tools/gen.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svx/fmview.hxx> #include <svx/svdpage.hxx> #include <vcl/idle.hxx> diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 806cfa399e09..8ae24c4f0a64 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <vcl/window.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> namespace sd { diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 5f4a1d77195c..20e0a41ca917 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -22,7 +22,7 @@ #include <pres.hxx> #include <sddllapi.h> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svl/urlbmk.hxx> #include <tools/ref.hxx> #include "sdxfer.hxx" diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 33cafba9d536..92ed9e989cf4 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX #define INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/objsh.hxx> #include <svl/lstner.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index ffc06fc28fa8..19de3c96e7a9 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -31,7 +31,7 @@ #include <vcl/ctrl.hxx> #include <svtools/valueset.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/shell.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 998837c0409b..362b9403b7d5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -24,7 +24,7 @@ #include <controller/SlsFocusManager.hxx> #include <controller/SlsInsertionIndicatorHandler.hxx> #include <fupoor.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <memory> namespace sd { namespace slidesorter { diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 079cca3ddb51..654a08c76255 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -387,7 +387,6 @@ #include <svtools/embedhlp.hxx> #include <svtools/helpopt.hxx> #include <svtools/imagemgr.hxx> -#include <svtools/imapobj.hxx> #include <svtools/menuoptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/parhtml.hxx> @@ -395,7 +394,6 @@ #include <svtools/soerr.hxx> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> -#include <svtools/treelistentry.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -531,5 +529,7 @@ #include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/treelistentry.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index d372b47298e5..2accd6aabc29 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -29,7 +29,7 @@ #include "panelist.hxx" #include <srchdlg.hxx> #include <sfx2/sfxhelp.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <sal/log.hxx> #include <sfx2/strings.hrc> diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index f32be168ec5c..a70166bbd8e2 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -33,7 +33,7 @@ #include <vcl/button.hxx> #include <vcl/lstbox.hxx> #include <vcl/weld.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <unotools/moduleoptions.hxx> #include <srchdlg.hxx> diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 9b91b5901b63..060d1413bd7c 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <o3tl/any.hxx> #include <svl/urihelper.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sot/formats.hxx> #include <vcl/button.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index e6b94f77bd71..fc418a93d42a 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -27,11 +27,11 @@ #include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> -#include <svtools/imap.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imapobj.hxx> -#include <svtools/imappoly.hxx> -#include <svtools/imaprect.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/imappoly.hxx> +#include <vcl/imaprect.hxx> #include <svl/zforlist.hxx> #include <rtl/tencinfo.h> #include <tools/tenccvt.hxx> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 54124d7bc304..45959e32e135 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -63,8 +63,8 @@ #include <appdata.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <comphelper/string.hxx> #include <sfx2/StyleManager.hxx> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index c58401bb1a0d..ddd974ec5a93 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -31,7 +31,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/datetime.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <svtools/miscopt.hxx> #include <versdlg.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f47ce3020efd..72a4b7b00aed 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -81,7 +81,7 @@ #include <comphelper/fileformat.h> #include <comphelper/storagehelper.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> #include <rtl/strbuf.hxx> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index db1e8c250eb7..c371fb74e8fd 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -31,7 +31,7 @@ class SfxTemplateControllerItem; #include <vcl/lstbox.hxx> #include <vcl/weld.hxx> #include <svl/lstner.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svl/eitem.hxx> #include <svl/style.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 180b545ab6bc..eee7266b67b8 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7062,14 +7062,8 @@ include/svtools/hyperlabel.hxx include/svtools/iconview.hxx include/svtools/imagemgr.hxx include/svtools/imageresourceaccess.hxx -include/svtools/imap.hxx -include/svtools/imapcirc.hxx -include/svtools/imapobj.hxx -include/svtools/imappoly.hxx -include/svtools/imaprect.hxx include/svtools/imgdef.hxx include/svtools/indexentryres.hxx -include/svtools/inetimg.hxx include/svtools/inettbc.hxx include/svtools/insdlg.hxx include/svtools/ivctrl.hxx @@ -7103,7 +7097,6 @@ include/svtools/slidesorterbaropt.hxx include/svtools/soerr.hxx include/svtools/statusbarcontroller.hxx include/svtools/stringtransfer.hxx -include/svtools/svlbitm.hxx include/svtools/svmedit.hxx include/svtools/svmedit2.hxx include/svtools/svparser.hxx @@ -7120,17 +7113,11 @@ include/svtools/templatefoldercache.hxx include/svtools/textwindowpeer.hxx include/svtools/toolbarmenu.hxx include/svtools/toolboxcontroller.hxx -include/svtools/transfer.hxx -include/svtools/treelist.hxx -include/svtools/treelistbox.hxx -include/svtools/treelistentries.hxx -include/svtools/treelistentry.hxx include/svtools/unitconv.hxx include/svtools/unoevent.hxx include/svtools/unoimap.hxx include/svtools/urlcontrol.hxx include/svtools/valueset.hxx -include/svtools/viewdataentry.hxx include/svtools/wizardmachine.hxx include/svtools/wizdlg.hxx include/svx/AccessibleControlShape.hxx @@ -7969,6 +7956,12 @@ include/vcl/idle.hxx include/vcl/image.hxx include/vcl/imagerepository.hxx include/vcl/imgctrl.hxx +include/vcl/imap.hxx +include/vcl/imapcirc.hxx +include/vcl/imapobj.hxx +include/vcl/imappoly.hxx +include/vcl/imaprect.hxx +include/vcl/inetimg.hxx include/vcl/inputctx.hxx include/vcl/inputtypes.hxx include/vcl/introwin.hxx @@ -8032,6 +8025,8 @@ include/vcl/status.hxx include/vcl/stdtext.hxx include/vcl/strhelper.hxx include/vcl/svapp.hxx +include/vcl/svimpbox.hxx +include/vcl/svlbitm.hxx include/vcl/svmain.hxx include/vcl/syschild.hxx include/vcl/sysdata.hxx @@ -8052,6 +8047,11 @@ include/vcl/toolbox.hxx include/vcl/toolkit/group.hxx include/vcl/toolkit/morebtn.hxx include/vcl/toolkit/unowrap.hxx +include/vcl/transfer.hxx +include/vcl/treelist.hxx +include/vcl/treelistbox.hxx +include/vcl/treelistentries.hxx +include/vcl/treelistentry.hxx include/vcl/txtattr.hxx include/vcl/uitest/factory.hxx include/vcl/uitest/logger.hxx @@ -8068,6 +8068,7 @@ include/vcl/vclptr.hxx include/vcl/vclreferencebase.hxx include/vcl/vclstatuslistener.hxx include/vcl/vectorgraphicdata.hxx +include/vcl/viewdataentry.hxx include/vcl/virdev.hxx include/vcl/waitobj.hxx include/vcl/wall.hxx @@ -13872,7 +13873,6 @@ svtools/source/contnr/DocumentInfoPreview.cxx svtools/source/contnr/contentenumeration.cxx svtools/source/contnr/contentenumeration.hxx svtools/source/contnr/fileview.cxx -svtools/source/contnr/fileview.hxx svtools/source/contnr/foldertree.cxx svtools/source/contnr/iconview.cxx svtools/source/contnr/iconviewimpl.cxx @@ -13881,15 +13881,9 @@ svtools/source/contnr/imivctl1.cxx svtools/source/contnr/imivctl2.cxx svtools/source/contnr/ivctrl.cxx svtools/source/contnr/simptabl.cxx -svtools/source/contnr/svimpbox.cxx -svtools/source/contnr/svlbitm.cxx svtools/source/contnr/svtabbx.cxx svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx -svtools/source/contnr/treelist.cxx -svtools/source/contnr/treelistbox.cxx -svtools/source/contnr/treelistentry.cxx -svtools/source/contnr/viewdataentry.cxx svtools/source/control/accessibleruler.cxx svtools/source/control/asynclink.cxx svtools/source/control/autocmpledit.cxx @@ -13946,7 +13940,6 @@ svtools/source/hatchwindow/ipwin.cxx svtools/source/hatchwindow/ipwin.hxx svtools/source/inc/hatchwindow.hxx svtools/source/inc/iconviewimpl.hxx -svtools/source/inc/svimpbox.hxx svtools/source/inc/svtaccessiblefactory.hxx svtools/source/inc/unoiface.hxx svtools/source/java/javacontext.cxx @@ -13962,9 +13955,6 @@ svtools/source/misc/embedtransfer.cxx svtools/source/misc/filechangedchecker.cxx svtools/source/misc/imagemgr.cxx svtools/source/misc/imageresourceaccess.cxx -svtools/source/misc/imap.cxx -svtools/source/misc/imap2.cxx -svtools/source/misc/imap3.cxx svtools/source/misc/langhelp.cxx svtools/source/misc/langtab.cxx svtools/source/misc/openfiledroptargetlistener.cxx @@ -13973,8 +13963,6 @@ svtools/source/misc/stringtransfer.cxx svtools/source/misc/svtaccessiblefactory.cxx svtools/source/misc/svtresid.cxx svtools/source/misc/templatefoldercache.cxx -svtools/source/misc/transfer.cxx -svtools/source/misc/transfer2.cxx svtools/source/misc/unitconv.cxx svtools/source/svhtml/HtmlWriter.cxx svtools/source/svhtml/htmlkywd.cxx @@ -14026,7 +14014,6 @@ svtools/source/uno/wizard/wizardpagecontroller.cxx svtools/source/uno/wizard/wizardpagecontroller.hxx svtools/source/uno/wizard/wizardshell.cxx svtools/source/uno/wizard/wizardshell.hxx -svtools/source/urlobj/inetimg.cxx svx/inc/AccessibleSvxFindReplaceDialog.hxx svx/inc/AccessibleTableShape.hxx svx/inc/GalleryControl.hxx @@ -18175,6 +18162,19 @@ vcl/source/outdev/transparent.cxx vcl/source/outdev/vclreferencebase.cxx vcl/source/outdev/wallpaper.cxx vcl/source/salmain/salmain.cxx +vcl/source/treelist/transfer.cxx +vcl/source/treelist/transfer2.cxx +vcl/source/treelist/imap.cxx +vcl/source/treelist/imap2.cxx +vcl/source/treelist/imap3.cxx +vcl/source/treelist/inetimg.cxx +vcl/source/treelist/treelist.cxx +vcl/source/treelist/treelistbox.cxx +vcl/source/treelist/treelistentry.cxx +vcl/source/treelist/viewdataentry.cxx +vcl/source/treelist/svimpbox.cxx +vcl/source/treelist/svlbitm.cxx +vcl/source/treelist/uiobject.cxx vcl/source/toolkit/group.cxx vcl/source/toolkit/morebtn.cxx vcl/source/uipreviewer/previewer.cxx diff --git a/solenv/sanitizers/ui/dbaccess.suppr b/solenv/sanitizers/ui/dbaccess.suppr index 27348d11b5ba..3dbe2c71529c 100644 --- a/solenv/sanitizers/ui/dbaccess.suppr +++ b/solenv/sanitizers/ui/dbaccess.suppr @@ -115,7 +115,7 @@ dbaccess/uiconfig/ui/tablesfilterpage.ui://dbulo-OTableTreeListBox[@id='treeview dbaccess/uiconfig/ui/tablesjoindialog.ui://dbulo-OTableTreeListBox[@id='tablelist:border'] no-labelled-by dbaccess/uiconfig/ui/tablesjoindialog.ui://GtkLabel[@id='title'] orphan-label dbaccess/uiconfig/ui/tablesjoindialog.ui://GtkLabel[@id='alttitle'] orphan-label -dbaccess/uiconfig/ui/tablesjoindialog.ui://svtlo-SvTreeListBox[@id='querylist:border'] no-labelled-by +dbaccess/uiconfig/ui/tablesjoindialog.ui://vcllo-SvTreeListBox[@id='querylist:border'] no-labelled-by dbaccess/uiconfig/ui/textpage.ui://GtkEntry[@id='extension'] no-labelled-by dbaccess/uiconfig/ui/textpage.ui://GtkLabel[@id='example'] orphan-label dbaccess/uiconfig/ui/useradminpage.ui://GtkLabel[@id='label3'] orphan-label diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index d42ca3eba9ea..3ce7f2635669 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -228,6 +228,6 @@ sc/uiconfig/scalc/ui/validationcriteriapage.ui://sclo-ScRefButtonEx[@id='validre sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkTextView[@id='minlist:border'] no-labelled-by sc/uiconfig/scalc/ui/validationcriteriapage.ui://GtkLabel[@id='hintft'] orphan-label sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='sourcefile'] orphan-label -sc/uiconfig/scalc/ui/xmlsourcedialog.ui://svtlo-SvTreeListBox[@id='tree:border'] no-labelled-by +sc/uiconfig/scalc/ui/xmlsourcedialog.ui://vcllo-SvTreeListBox[@id='tree:border'] no-labelled-by sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='label5'] orphan-label sc/uiconfig/scalc/ui/xmlsourcedialog.ui://foruilo-RefEdit[@id='edit'] no-labelled-by diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 54bfdbce5cb9..fad4ac4fc1ab 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -22,7 +22,7 @@ #include <vcl/window.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> #include <memory> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 4b3647d42efe..5d59faa78b96 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -42,7 +42,7 @@ #include <svl/itemset.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svtools/miscopt.hxx> #include <svl/whiter.hxx> #include <svx/zoomslideritem.hxx> diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 66cdda687dc6..5bbfb0925363 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -97,14 +97,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/contnr/imivctl2 \ svtools/source/contnr/ivctrl \ svtools/source/contnr/simptabl \ - svtools/source/contnr/svimpbox \ - svtools/source/contnr/svlbitm \ svtools/source/contnr/svtabbx \ svtools/source/contnr/templwin \ - svtools/source/contnr/treelist \ - svtools/source/contnr/treelistbox \ - svtools/source/contnr/treelistentry \ - svtools/source/contnr/viewdataentry \ svtools/source/control/accessibleruler \ svtools/source/control/asynclink \ svtools/source/control/autocmpledit \ @@ -169,9 +163,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/filechangedchecker \ svtools/source/misc/imagemgr \ svtools/source/misc/imageresourceaccess \ - svtools/source/misc/imap \ - svtools/source/misc/imap2 \ - svtools/source/misc/imap3 \ svtools/source/misc/langtab \ svtools/source/misc/langhelp \ svtools/source/misc/openfiledroptargetlistener \ @@ -180,8 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/svtaccessiblefactory \ svtools/source/misc/svtresid \ svtools/source/misc/templatefoldercache \ - svtools/source/misc/transfer \ - svtools/source/misc/transfer2 \ svtools/source/misc/unitconv \ svtools/source/svhtml/htmlkywd \ svtools/source/svhtml/htmlout \ @@ -221,7 +210,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/uno/wizard/unowizard \ svtools/source/uno/wizard/wizardpagecontroller \ svtools/source/uno/wizard/wizardshell \ - svtools/source/urlobj/inetimg \ )) ifeq ($(OS),WNT) diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst index 1f31a7f22a62..27c5f85a9858 100644 --- a/svtools/inc/bitmaps.hlst +++ b/svtools/inc/bitmaps.hlst @@ -104,8 +104,6 @@ #define BMP_PLUGIN "res/plugin.png" #define RID_BMP_FOLDER "svtools/res/folder.png" #define RID_BMP_FOLDER_OPEN "res/folderop.png" -#define RID_BMP_TREENODE_COLLAPSED "res/plus.png" -#define RID_BMP_TREENODE_EXPANDED "res/minus.png" #define BMP_CURRENT "svtools/res/ed01.png" #define BMP_MODIFIED "svtools/res/ed02.png" #define BMP_NEW "svtools/res/ed03.png" diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index d3ed09986710..3d7c3869a9d8 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -421,21 +421,21 @@ #include <svtools/htmltokn.h> #include <svtools/iconview.hxx> #include <svtools/imagemgr.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imappoly.hxx> -#include <svtools/imaprect.hxx> #include <svtools/imgdef.hxx> #include <svtools/inettbc.hxx> #include <svtools/miscopt.hxx> -#include <svtools/svlbitm.hxx> #include <svtools/svmedit.hxx> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/table/tabletypes.hxx> -#include <svtools/transfer.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/transfer.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imappoly.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/uitest/uiobject.hxx b/svtools/inc/uitest/uiobject.hxx index ff169749bf1a..16a137da7c7c 100644 --- a/svtools/inc/uitest/uiobject.hxx +++ b/svtools/inc/uitest/uiobject.hxx @@ -10,59 +10,8 @@ #include <memory> #include <vcl/uitest/uiobject.hxx> -class SvTreeListBox; -class SvTreeListEntry; class SvSimpleTable; -class TreeListUIObject : public WindowUIObject -{ -public: - TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList); - - virtual StringMap get_state() override; - - static std::unique_ptr<UIObject> create(vcl::Window* pWindow); - - virtual void execute(const OUString& rAction, - const StringMap& rParameters) override; - - virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; - - virtual std::set<OUString> get_children() const override; - -protected: - - virtual OUString get_name() const override; - -private: - - VclPtr<SvTreeListBox> mxTreeList; -}; - -class TreeListEntryUIObject : public UIObject -{ -public: - - TreeListEntryUIObject(const VclPtr<SvTreeListBox>& xTreeList, SvTreeListEntry* pEntry); - - virtual StringMap get_state() override; - - virtual void execute(const OUString& rAction, - const StringMap& rParameters) override; - - virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override; - - virtual std::set<OUString> get_children() const override; - - virtual OUString get_type() const override; - -private: - - VclPtr<SvTreeListBox> mxTreeList; - - SvTreeListEntry* const mpEntry; -}; - class SimpleTableUIObject : public TreeListUIObject { public: diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 5c30c0955e18..ef9a9ec5ab01 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -24,7 +24,7 @@ #include <svtools/brwhead.hxx> #include <vcl/timer.hxx> #include <vcl/image.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <memory> #include <vector> diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 42e0f6698da3..f4e7c89b0671 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -40,7 +40,6 @@ #include <tools/urlobj.hxx> #include <unotools/ucbhelper.hxx> -#include "fileview.hxx" #include <templwin.hrc> #include "templwin.hxx" diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index be2282ee9710..8cc3fef8c864 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svtools/iconview.hxx> -#include "fileview.hxx" #include <sal/config.h> #include <sal/log.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <svtools/fileview.hxx> #include <svtools/svtresid.hxx> #include <svtools/imagemgr.hxx> @@ -30,7 +29,7 @@ #include <svtools/svtabbx.hxx> #include <svtools/strings.hrc> #include <bitmaps.hlst> -#include <svtools/viewdataentry.hxx> +#include <vcl/viewdataentry.hxx> #include <toolkit/helper/vclunohelper.hxx> #include "contentenumeration.hxx" #include <svtools/AccessibleBrowseBoxObjType.hxx> @@ -419,50 +418,52 @@ inline void SvtFileView_Impl::EndEditing() mpCurView->EndEditing(); } -// functions ------------------------------------------------------------- - -OUString CreateExactSizeText( sal_Int64 nSize ) +namespace { - double fSize( static_cast<double>(nSize) ); - int nDec; + // functions ------------------------------------------------------------- - long nMega = 1024 * 1024; - long nGiga = nMega * 1024; + OUString CreateExactSizeText( sal_Int64 nSize ) + { + double fSize( static_cast<double>(nSize) ); + int nDec; - OUString aUnitStr(' '); + long nMega = 1024 * 1024; + long nGiga = nMega * 1024; - if ( nSize < 10000 ) - { - aUnitStr += SvtResId(STR_SVT_BYTES ); - nDec = 0; - } - else if ( nSize < nMega ) - { - fSize /= 1024; - aUnitStr += SvtResId(STR_SVT_KB); - nDec = 1; - } - else if ( nSize < nGiga ) - { - fSize /= nMega; - aUnitStr += SvtResId(STR_SVT_MB); - nDec = 2; - } - else - { - fSize /= nGiga; - aUnitStr += SvtResId(STR_SVT_GB); - nDec = 3; - } + OUString aUnitStr(' '); - OUString aSizeStr( ::rtl::math::doubleToUString( fSize, - rtl_math_StringFormat_F, nDec, - SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]) ); - aSizeStr += aUnitStr; + if ( nSize < 10000 ) + { + aUnitStr += SvtResId(STR_SVT_BYTES ); + nDec = 0; + } + else if ( nSize < nMega ) + { + fSize /= 1024; + aUnitStr += SvtResId(STR_SVT_KB); + nDec = 1; + } + else if ( nSize < nGiga ) + { + fSize /= nMega; + aUnitStr += SvtResId(STR_SVT_MB); + nDec = 2; + } + else + { + fSize /= nGiga; + aUnitStr += SvtResId(STR_SVT_GB); + nDec = 3; + } - return aSizeStr; -} + OUString aSizeStr( ::rtl::math::doubleToUString( fSize, + rtl_math_StringFormat_F, nDec, + SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]) ); + aSizeStr += aUnitStr; + return aSizeStr; + } +} ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, diff --git a/svtools/source/contnr/fileview.hxx b/svtools/source/contnr/fileview.hxx deleted file mode 100644 index c1dad51e3da4..000000000000 --- a/svtools/source/contnr/fileview.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * 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_SOURCE_CONTNR_FILEVIEW_HXX -#define INCLUDED_SVTOOLS_SOURCE_CONTNR_FILEVIEW_HXX - -#include <sal/config.h> - -#include <sal/types.h> -#include <rtl/ustring.hxx> - -OUString CreateExactSizeText(sal_Int64 nSize); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx index 9af84362f45f..f00e10b77b5e 100644 --- a/svtools/source/contnr/iconview.cxx +++ b/svtools/source/contnr/iconview.cxx @@ -18,7 +18,7 @@ */ #include <svtools/iconview.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <svtools/fileview.hxx> #include <iconviewimpl.hxx> diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 66860faba759..cea94c5eba7e 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -18,8 +18,8 @@ */ #include <svtools/simptabl.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 8fb4aef8d84a..12bcc3dfc6d3 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -21,9 +21,9 @@ #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/svlbitm.hxx> #include <svtools/strings.hrc> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <vcl/builderfactory.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/svtools/source/inc/iconviewimpl.hxx b/svtools/source/inc/iconviewimpl.hxx index 516923f3f40c..df11f5952426 100644 --- a/svtools/source/inc/iconviewimpl.hxx +++ b/svtools/source/inc/iconviewimpl.hxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SOURCE_INC_ICONVIEWIMPL_HXX -#define INCLUDED_SVTOOLS_SOURCE_INC_ICONVIEWIMPL_HXX +#ifndef INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX +#define INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX -#include "svimpbox.hxx" +#include <vcl/svimpbox.hxx> class SvTreeListBox; class Point; @@ -63,6 +63,6 @@ protected: void AdjustScrollBars( Size& rSize ) override; }; -#endif // INCLUDED_SVTOOLS_SOURCE_INC_ICONVIEWIMPL_HXX +#endif // INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index c2d21d4a47c1..992d9efb9370 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -24,7 +24,7 @@ #include <vcl/window.hxx> #include <svtools/cliplistener.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> using namespace ::com::sun::star; diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 06e92db659ae..4baed7364fd7 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sot/filelist.hxx> #include <osl/file.hxx> diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 08bb8710a555..8d0bbcc04e3c 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -110,15 +110,6 @@ namespace svt } virtual css::uno::Reference< css::accessibility::XAccessible > - createAccessibleTreeListBox( - SvTreeListBox& /*_rListBox*/, - const css::uno::Reference< css::accessibility::XAccessible >& /*_xParent*/ - ) const override - { - return nullptr; - } - - virtual css::uno::Reference< css::accessibility::XAccessible > createAccessibleBrowseBoxHeaderBar( const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/, IAccessibleTableProvider& /*_rOwningTable*/, diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index dd94023011de..65b7da3e7317 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -26,10 +26,10 @@ #include <svtools/htmlout.hxx> #include <svtools/htmlkywd.hxx> -#include <svtools/imap.hxx> -#include <svtools/imaprect.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imappoly.hxx> +#include <vcl/imap.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imappoly.hxx> #include <svl/urihelper.hxx> #include <rtl/character.hxx> diff --git a/svtools/source/uitest/uiobject.cxx b/svtools/source/uitest/uiobject.cxx index 99eac13cabc5..3c0a34b26a8d 100644 --- a/svtools/source/uitest/uiobject.cxx +++ b/svtools/source/uitest/uiobject.cxx @@ -10,163 +10,11 @@ #include <memory> #include <uitest/uiobject.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svtools/simptabl.hxx> -TreeListUIObject::TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList): - WindowUIObject(xTreeList), - mxTreeList(xTreeList) -{ -} - namespace { -bool isCheckBoxList(const VclPtr<SvTreeListBox>& xTreeList) -{ - return (xTreeList->GetTreeFlags() & SvTreeFlags::CHKBTN) == SvTreeFlags::CHKBTN; -} - -} - -StringMap TreeListUIObject::get_state() -{ - StringMap aMap = WindowUIObject::get_state(); - - aMap["SelectionCount"] = OUString::number(mxTreeList->GetSelectionCount()); - aMap["VisibleCount"] = OUString::number(mxTreeList->GetVisibleCount()); - aMap["Children"] = OUString::number(mxTreeList->GetChildCount(nullptr)); - aMap["LevelChildren"] = OUString::number(mxTreeList->GetLevelChildCount(nullptr)); - aMap["CheckBoxList"] = OUString::boolean(isCheckBoxList(mxTreeList)); - return aMap; -} - -void TreeListUIObject::execute(const OUString& rAction, - const StringMap& rParameters) -{ - if (rAction.isEmpty()) - { - } - else - WindowUIObject::execute(rAction, rParameters); -} - -std::unique_ptr<UIObject> TreeListUIObject::get_child(const OUString& rID) -{ - sal_Int32 nID = rID.toInt32(); - if (nID >= 0) - { - SvTreeListEntry* pEntry = mxTreeList->GetEntry(nullptr, nID); - if (!pEntry) - return nullptr; - - return std::unique_ptr<UIObject>(new TreeListEntryUIObject(mxTreeList, pEntry)); - } - - return nullptr; -} - -std::set<OUString> TreeListUIObject::get_children() const -{ - std::set<OUString> aChildren; - - size_t nChildren = mxTreeList->GetLevelChildCount(nullptr); - for (size_t i = 0; i < nChildren; ++i) - { - aChildren.insert(OUString::number(i)); - } - - return aChildren; -} - -OUString TreeListUIObject::get_name() const -{ - return OUString("TreeListUIObject"); -} - -std::unique_ptr<UIObject> TreeListUIObject::create(vcl::Window* pWindow) -{ - SvTreeListBox* pTreeList = dynamic_cast<SvTreeListBox*>(pWindow); - assert(pTreeList); - return std::unique_ptr<UIObject>(new TreeListUIObject(pTreeList)); -} - -TreeListEntryUIObject::TreeListEntryUIObject(const VclPtr<SvTreeListBox>& xTreeList, SvTreeListEntry* pEntry): - mxTreeList(xTreeList), - mpEntry(pEntry) -{ -} - -StringMap TreeListEntryUIObject::get_state() -{ - StringMap aMap; - - aMap["Text"] = mxTreeList->GetEntryText(mpEntry); - aMap["Children"] = OUString::number(mxTreeList->GetLevelChildCount(mpEntry)); - aMap["VisibleChildCount"] = OUString::number(mxTreeList->GetVisibleChildCount(mpEntry)); - - return aMap; -} - -void TreeListEntryUIObject::execute(const OUString& rAction, const StringMap& /*rParameters*/) -{ - if (rAction == "COLLAPSE") - { - mxTreeList->Collapse(mpEntry); - } - else if (rAction == "EXPAND") - { - mxTreeList->Expand(mpEntry); - } - else if (rAction == "SELECT") - { - mxTreeList->Select(mpEntry); - } - else if (rAction == "DESELECT") - { - mxTreeList->Select(mpEntry, false); - } - else if (rAction == "CLICK") - { - if (!isCheckBoxList(mxTreeList)) - return; - SvButtonState eState = mxTreeList->GetCheckButtonState(mpEntry); - eState = eState == SvButtonState::Checked ? SvButtonState::Unchecked : SvButtonState::Checked; - mxTreeList->SetCheckButtonState(mpEntry, eState); - mxTreeList->CheckButtonHdl(); - } -} - -std::unique_ptr<UIObject> TreeListEntryUIObject::get_child(const OUString& rID) -{ - sal_Int32 nID = rID.toInt32(); - if (nID >= 0) - { - SvTreeListEntry* pEntry = mxTreeList->GetEntry(mpEntry, nID); - if (!pEntry) - return nullptr; - - return std::unique_ptr<UIObject>(new TreeListEntryUIObject(mxTreeList, pEntry)); - } - - return nullptr; -} - -std::set<OUString> TreeListEntryUIObject::get_children() const -{ - std::set<OUString> aChildren; - - size_t nChildren = mxTreeList->GetLevelChildCount(mpEntry); - for (size_t i = 0; i < nChildren; ++i) - { - aChildren.insert(OUString::number(i)); - } - - return aChildren; -} - -OUString TreeListEntryUIObject::get_type() const -{ - return OUString("TreeListEntry"); } SimpleTableUIObject::SimpleTableUIObject(const VclPtr<SvSimpleTable>& xTable): diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index d11d57e377fb..f38861d4442b 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -35,10 +35,10 @@ #include <rtl/ref.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> +#include <vcl/svlbitm.hxx> #include <map> #include <o3tl/make_unique.hxx> diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index a14848fd3de7..e5f3cade1ec4 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -35,7 +35,7 @@ #include <svtools/fmtfield.hxx> #include <svl/numuno.hxx> #include <svtools/calendar.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include "treecontrolpeer.hxx" #include "svtxgridcontrol.hxx" #include <table/tablecontrol.hxx> diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index e863a2ed5389..cbfe92690b66 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -39,10 +39,10 @@ #include <vcl/svapp.hxx> #include <svtools/unoevent.hxx> #include <svtools/unoimap.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imaprect.hxx> -#include <svtools/imappoly.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/imappoly.hxx> using namespace comphelper; using namespace cppu; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index cbfef1097bfc..02394d5114bc 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svl/lstner.hxx> #include <svx/galctrl.hxx> #include <svtools/miscopt.hxx> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index ee003c9aef65..824e1d800d25 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -397,17 +397,11 @@ #include <svtools/ctrltool.hxx> #include <svtools/ehdl.hxx> #include <svtools/framestatuslistener.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> #include <svtools/miscopt.hxx> -#include <svtools/svlbitm.hxx> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/toolbarmenu.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/transfer.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> #include <svtools/valueset.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -526,5 +520,11 @@ #include <svx/xtable.hxx> #include <svx/xtextit0.hxx> #include <svx/zoomslideritem.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/transfer.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index eabbd7fc21da..e25009af9c64 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -432,7 +432,6 @@ #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/transfer.hxx> #include <svtools/valueset.hxx> #include <toolkit/dllapi.h> #include <toolkit/helper/macros.hxx> @@ -590,5 +589,6 @@ #include <svx/xpoly.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> +#include <vcl/transfer.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 41c5a42ed93c..85c4a7a42112 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <svx/checklbx.hxx> #include <vcl/builderfactory.hxx> diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 5af2ce7f0b44..16aacb3e580a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -25,8 +25,8 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <unotools/textsearch.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/viewdataentry.hxx> #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 68e2d115dbfd..13677d4c63fc 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -54,7 +54,7 @@ #include <osl/security.hxx> #include <rtl/bootstrap.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <officecfg/Office/Recovery.hxx> #include <o3tl/make_unique.hxx> namespace svx{ diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 2df75372dffd..dd81735ef070 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -22,8 +22,8 @@ #include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> SvLBoxFontString::SvLBoxFontString() : SvLBoxString() diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 35daf17e8bb0..ea8feb26521b 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -20,9 +20,9 @@ #include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <sfx2/sfxsids.hrc> -#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> diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 2644bb8bd0c9..5a69d5593a7d 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -23,9 +23,9 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/menu.hxx> -#include <svtools/imapobj.hxx> -#include <svtools/transfer.hxx> -#include <svtools/imap.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/transfer.hxx> +#include <vcl/imap.hxx> #include <sfx2/frame.hxx> #include <svx/graphctl.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index a5d3d79fba5c..741c9c191e5e 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -36,7 +36,7 @@ #include <svtools/miscopt.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/objitem.hxx> diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 24b601d57bdc..48ca4b5cecf9 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -49,9 +49,9 @@ #include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> -#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 <bitmaps.hlst> diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 29aea2ffe67f..c21f29fe000a 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -23,8 +23,8 @@ #include <svl/itempool.hxx> #include <sot/formats.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentry.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 72ca4f43a4bf..29392f811489 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -52,7 +52,7 @@ #include <svx/svxdlg.hxx> #include <svx/strings.hrc> #include <bitmaps.hlst> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> namespace svxform { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index b28120fe1f55..de3ee78e37fe 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -50,7 +50,7 @@ #include <comphelper/property.hxx> #include <sfx2/frame.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <vcl/settings.hxx> #include <tabwin.hrc> diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 1337951b9894..319944412d4b 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -23,7 +23,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index c0f1ad4a2f69..8a3c89362662 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -33,7 +33,7 @@ #include <svtools/inettbc.hxx> #include <svtools/simptabl.hxx> #include <svtools/svmedit.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index f0caa6fcb448..c6c8a0138214 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -27,9 +27,9 @@ #include <vcl/tabdlg.hxx> #include <vcl/tabpage.hxx> #include <svtools/simptabl.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/svlbitm.hxx> #include <svtools/svmedit2.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <o3tl/typed_flags_set.hxx> #include <cppuhelper/implbase.hxx> diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 1996960bc70e..cd61c69bfbe7 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -32,7 +32,7 @@ #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> #include <vcl/image.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svx/fmtools.hxx> #include "fmexch.hxx" diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index c0c210f963f0..62f0c6cb682c 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -24,7 +24,7 @@ #include <set> #include <sot/exchange.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/form/XForms.hpp> diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index b79465ed17a3..4f26008fa054 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svx/fmview.hxx> diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index e4aafd8bca5b..2f04e2ee3f74 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_SOURCE_INC_TABWIN_HXX #define INCLUDED_SVX_SOURCE_INC_TABWIN_HXX -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/floatwin.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> @@ -27,7 +27,7 @@ #include <com/sun/star/form/XForm.hpp> #include <comphelper/propmultiplex.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <connectivity/dbtools.hxx> diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 1292d3205bdf..fde2d73dd67e 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -19,7 +19,7 @@ #include "sdrmediawindow.hxx" -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx> #include <vcl/window.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 812852b905f8..0b8fac18ca8f 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -58,7 +58,7 @@ #include <comphelper/classids.hxx> #include <sot/formats.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <cppuhelper/implbase.hxx> #include <svl/solar.hrc> diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 09f5268d097c..660bdfa58bcb 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -21,7 +21,7 @@ #include <svx/svxdllapi.h> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svtools/toolbarmenu.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index f862d3852edc..1712a8f63781 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -28,8 +28,8 @@ #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/Locale.hpp> #include <svtools/headbar.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> #include <vcl/settings.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 6db67fe0824a..fea8c6a5fc5a 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -466,8 +466,6 @@ #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> #include <svtools/langtab.hxx> #include <svtools/svtdllapi.h> #include <svtools/valueset.hxx> @@ -591,6 +589,8 @@ #include <unotools/useroptions.hxx> #include <unotxdoc.hxx> #include <usrfld.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <viewopt.hxx> #include <viewsh.hxx> #include <viscrs.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index fcf1c65967b7..0f4f008a07e8 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -600,13 +600,7 @@ #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/transfer.hxx> -#include <svtools/treelist.hxx> -#include <svtools/treelistbox.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> @@ -683,6 +677,12 @@ #include <unotools/syslocale.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> +#include <vcl/transfer.hxx> +#include <vcl/treelist.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/treelistentries.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> #include <viewopt.hxx> #include <wdocsh.hxx> diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 804eb3b3893d..395f23110a10 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -29,7 +29,7 @@ #include "accnotextframe.hxx" #include <fmturl.hxx> #include "accnotexthyperlink.hxx" -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <doc.hxx> diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index 4682f701bbd2..a1c2ec85906c 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -27,8 +27,8 @@ #include <fmturl.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <accmap.hxx> diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 8eef3570d749..8cab339903b6 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -21,8 +21,8 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <basic/sbx.hxx> #include <frmfmt.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 4f5cc43636ad..51c43fa0e2a1 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -22,8 +22,8 @@ #include <vcl/print.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> -#include <svtools/imapobj.hxx> -#include <svtools/imap.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/imap.hxx> #include <svl/urihelper.hxx> #include <svtools/soerr.hxx> #include <sfx2/progress.hxx> diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 4a173ffa8dcf..84762f89cea1 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -18,7 +18,7 @@ */ #include <basic/basmgr.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svl/urihelper.hxx> #include <unotools/securityoptions.hxx> #include <vcl/help.hxx> diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index c56986b7ea6c..e1ba7f7d2adf 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -20,7 +20,7 @@ #include <hintids.hxx> #include <o3tl/any.hxx> #include <svl/itemiter.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svtools/soerr.hxx> #include <editeng/protitem.hxx> #include <svx/svdogrp.hxx> diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 46598f206082..e439cef7fb11 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -24,7 +24,7 @@ #include <tools/fract.hxx> #include <svl/undo.hxx> #include <svl/fstathelper.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <vcl/graphicfilter.hxx> #include <sot/storage.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index d7b894c092c0..ea1980c31fd1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -25,8 +25,8 @@ #include <o3tl/any.hxx> #include <o3tl/safeint.hxx> #include <svtools/unoimap.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <unotools/intlwrapper.hxx> #include <frmfmt.hxx> #include <unocoll.hxx> diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 41e2292d4dc4..f81a62266a5e 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -18,7 +18,7 @@ */ #include <svl/itemiter.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <tools/helpers.hxx> #include <editeng/protitem.hxx> #include <editeng/opaqitem.hxx> diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index d6060c690553..6a43962550da 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -22,8 +22,8 @@ #include <swtypes.hxx> #include <osl/diagnose.h> #include <vcl/outdev.hxx> -#include <svtools/imaprect.hxx> -#include <svtools/imap.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/imap.hxx> // Global variable SwNoteURL *pNoteURL = nullptr; diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 4993f21176a7..290289dc8281 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -30,8 +30,8 @@ #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <svtools/htmlcfg.hxx> #include <svx/svdouno.hxx> #include <svx/xoutbmp.hxx> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index e34ff99a90ea..3565f9115861 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -37,7 +37,7 @@ #include <editeng/scripttypeitem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/event.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <unotools/eventcfg.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index eb6952eb5156..6e4f3b9993a6 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -38,7 +38,7 @@ #include <vcl/errinf.hxx> #include <svl/stritem.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <svtools/ctrltool.hxx> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 04a1ad1ff658..29fb4b385d5e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -84,8 +84,8 @@ #include <txtinet.hxx> #include <fmturl.hxx> #include <fesh.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> #include <tools/urlobj.hxx> #include <mdiexp.hxx> #include <strings.hrc> diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 8752338a7ede..07e9aa06022c 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -32,7 +32,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <IDocumentSettingAccess.hxx> #include <vector> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index faec48efbde8..77f8bd0813d9 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <svtools/insdlg.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <tools/resary.hxx> #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 6345de75d88f..ebbbc9ccad7f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -32,7 +32,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> #include <svtools/simptabl.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 29b99cf6a8c1..0ec9436aaab6 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <comphelper/string.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <sal/log.hxx> #include <vector> diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index b87ba20cb1ff..d671a9083a50 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -28,7 +28,7 @@ #include <vcl/lstbox.hxx> #include <svtools/svmedit.hxx> #include <svtools/headbar.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/combobox.hxx> #include <svl/lstner.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 28765408fc59..5573d8bb2bf9 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -21,7 +21,7 @@ #include "selectdbtabledialog.hxx" #include "dbtablepreviewdialog.hxx" #include <svtools/simptabl.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index db86dd7bc182..87f0be102844 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -34,7 +34,7 @@ #include <sfx2/filedlghelper.hxx> #include <editeng/sizeitem.hxx> #include <svtools/htmlcfg.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <uitool.hxx> #include <IMark.hxx> diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index a6f7e0afe580..1d91a70a7388 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -21,7 +21,7 @@ #include <vcl/waitobj.hxx> #include <rtl/ustring.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <com/sun/star/uno/Sequence.h> #include <swtypes.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index cbd8d665271c..19895107d65d 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/text/AutoTextContainer.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <swtypes.hxx> #include "labfmt.hxx" #include <unotools.hxx> diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 412b1e7a875f..6f7631f4489c 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDREFTREELISTBOX_HXX #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDREFTREELISTBOX_HXX -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> class SwFieldRefTreeListBox : public SvTreeListBox { diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 12855877550c..715b99016593 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdb/XDatabaseAccess.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <view.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index d88cd478b5ad..9b8f1b6a4d8a 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -22,7 +22,7 @@ #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <swtypes.hxx> #include <globals.hrc> diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index bcda0fcaafab..5353cd8b620d 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -24,7 +24,7 @@ #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/button.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <numfmtlb.hxx> #include "fldpage.hxx" diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 0f77186c9f6b..d1144d08eb72 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -37,7 +37,7 @@ #include <comphelper/string.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #define REFFLDFLAG 0x4000 #define REFFLDFLAG_BOOKMARK 0x4800 diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b234569aa86b..fc12daa00696 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -32,7 +32,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <svtools/simptabl.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> #include <svx/flagsdef.hxx> diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 03584d8cf387..cb54e8eee021 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -22,7 +22,7 @@ #include <vcl/weld.hxx> #include <vcl/builderfactory.hxx> #include <svtools/headbar.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <swabstdlg.hxx> diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 38e26e86d5b8..5066f1eadbce 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -26,7 +26,7 @@ #include <unotools/transliterationwrapper.hxx> #include <unotools/tempfile.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <swtypes.hxx> #include <glosbib.hxx> diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9572219f7d6c..9a5b7a4c6127 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <svl/urihelper.hxx> #include <unotools/charclass.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <swwait.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index b77c8d9951ec..45c287eab510 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -40,7 +40,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index ce554219d9e9..e0674f90e44b 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -38,7 +38,7 @@ #include <dbtree.hxx> #include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <bitmaps.hlst> diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 2fffef5820de..4d03ac063bf4 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -45,7 +45,7 @@ #include <vcl/weld.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <sot/storage.hxx> #include <vcl/graph.hxx> #include <svl/urihelper.hxx> @@ -59,12 +59,12 @@ #include <svl/urlbmk.hxx> #include <svtools/htmlout.hxx> #include <svx/hlnkitem.hxx> -#include <svtools/inetimg.hxx> +#include <vcl/inetimg.hxx> #include <editeng/paperinf.hxx> #include <svx/fmview.hxx> #include <editeng/scripttypeitem.hxx> #include <sfx2/docfilt.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <sfx2/docfile.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/streamwrap.hxx> diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index a3062c4c9766..62a91b165373 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -22,9 +22,9 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <svtools/imap.hxx> -#include <svtools/inetimg.hxx> -#include <svtools/transfer.hxx> +#include <vcl/imap.hxx> +#include <vcl/inetimg.hxx> +#include <vcl/transfer.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <svx/gallery.hxx> diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 23ae2c6430a2..b2563f0e85c8 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -22,7 +22,7 @@ #include <vcl/bitmap.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svx/stddlg.hxx> #include "dbtree.hxx" diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx index 74433e54d30f..04bb890f29ae 100644 --- a/sw/source/uibase/inc/cnttab.hxx +++ b/sw/source/uibase/inc/cnttab.hxx @@ -30,7 +30,7 @@ #include <tox.hxx> #include "toxmgr.hxx" #include <svx/checklbx.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index 76a38f0ab6d4..1f7c3225fb38 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX #include <vcl/edit.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <swdllapi.h> class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 3be6342ee7c7..98ce484e830d 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -20,8 +20,8 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX #include <svl/lstner.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/svlbitm.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/svlbitm.hxx> #include "swcont.hxx" #include <map> diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index 6b34da94c9e7..333f850d2137 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_DBTREE_HXX #include <memory> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <swdllapi.h> #include <swtypes.hxx> diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index bee952662082..b8f473f35fe3 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -26,7 +26,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/window.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <swevent.hxx> #include <swtypes.hxx> diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 8911634211dd..6aede63170d5 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX #include <vcl/edit.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <svx/stddlg.hxx> #include <vcl/button.hxx> diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx index 2cd379e45950..e6d4fe147f19 100644 --- a/sw/source/uibase/inc/labimp.hxx +++ b/sw/source/uibase/inc/labimp.hxx @@ -24,7 +24,7 @@ #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> #include <vcl/field.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include "label.hxx" #include "labimg.hxx" diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 6bf64aac0675..f5c6659da7b8 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -23,7 +23,7 @@ #include <vcl/toolbox.hxx> #include <vcl/idle.hxx> #include <svl/lstner.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/tbxctrl.hxx> diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index d597be16229c..c01209d886fb 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -27,7 +27,7 @@ #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <vcl/layout.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 4fef3bd1e6c4..f9dc71623477 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -21,7 +21,7 @@ #include <sfx2/objsh.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <vcl/graph.hxx> #include <sfx2/lnkbase.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 2c14d57e0c71..3a25eef1a3bc 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -34,7 +34,7 @@ #include <tox.hxx> #include "toxmgr.hxx" #include <svx/checklbx.hxx> -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> #include "cnttab.hxx" diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 1806c0e2fe50..aa509ab2bc8d 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -21,10 +21,10 @@ #include <hintids.hxx> #include <svl/whiter.hxx> -#include <svtools/imapobj.hxx> +#include <vcl/imapobj.hxx> #include <svtools/miscopt.hxx> #include <svl/srchitem.hxx> -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <sfx2/viewfrm.hxx> #include <basic/sbstar.hxx> #include <svl/rectitem.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index a2b0383922ff..80d11e67ec02 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -36,7 +36,7 @@ #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <unotools/saveopt.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svx/svxids.hrc> diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 014dcfb22493..ae98385adf70 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -83,7 +83,7 @@ #include <postithelper.hxx> #include <redline.hxx> #include <docary.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <swabstdlg.hxx> #include <globals.hrc> diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 53a69ea6f2ac..5593709267ca 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -30,7 +30,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/settings.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <sfx2/docinsert.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui index b5f4d5d2cb71..37c3081bfce5 100644 --- a/sw/uiconfig/swriter/ui/editsectiondialog.ui +++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui @@ -146,7 +146,7 @@ </packing> </child> <child> - <object class="svtlo-SvTreeListBox" id="tree:border"> + <object class="vcllo-SvTreeListBox" id="tree:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index 703ae0bad228..d2a44868d106 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -166,7 +166,7 @@ Use the browse button to select a database file.</property> </packing> </child> <child> - <object class="svtlo-SvTreeListBox" id="inuselb:border"> + <object class="vcllo-SvTreeListBox" id="inuselb:border"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui index ec1b76c8f7b5..a4c1e7e23933 100644 --- a/sw/uiconfig/swriter/ui/flddocinfopage.ui +++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui @@ -22,7 +22,7 @@ <property name="hexpand">True</property> <property name="top_padding">6</property> <child> - <object class="svtlo-SvTreeListBox" id="type:border"> + <object class="vcllo-SvTreeListBox" id="type:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6b124c7c22eb..bf2422ed7d67 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -229,6 +229,19 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/outdev/vclreferencebase \ vcl/source/outdev/nativecontrols \ vcl/source/outdev/map \ + vcl/source/treelist/imap \ + vcl/source/treelist/imap2 \ + vcl/source/treelist/imap3 \ + vcl/source/treelist/inetimg \ + vcl/source/treelist/transfer \ + vcl/source/treelist/transfer2 \ + vcl/source/treelist/viewdataentry \ + vcl/source/treelist/treelist \ + vcl/source/treelist/treelistbox \ + vcl/source/treelist/treelistentry \ + vcl/source/treelist/svimpbox \ + vcl/source/treelist/svlbitm \ + vcl/source/treelist/uiobject \ vcl/source/gdi/alpha \ vcl/source/gdi/animate \ vcl/source/gdi/bitmap3 \ diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst index d71840e3f3ef..a45f8019b69f 100644 --- a/vcl/inc/bitmaps.hlst +++ b/vcl/inc/bitmaps.hlst @@ -143,6 +143,9 @@ #define IMG_ERROR "dbaccess/res/exerror.png" #define IMG_INFO "dbaccess/res/exinfo.png" +#define RID_BMP_TREENODE_COLLAPSED "res/plus.png" +#define RID_BMP_TREENODE_EXPANDED "res/minus.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/svtools/source/misc/imap.cxx b/vcl/source/treelist/imap.cxx index 0a2739f7eb4c..bcd69ad5a6fb 100644 --- a/svtools/source/misc/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -25,11 +25,11 @@ #include <vcl/window.hxx> #include <o3tl/numeric.hxx> #include <svl/urihelper.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imaprect.hxx> -#include <svtools/imappoly.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/imappoly.hxx> #include <string.h> #include <math.h> diff --git a/svtools/source/misc/imap2.cxx b/vcl/source/treelist/imap2.cxx index da99028254fa..d2bcc37a8520 100644 --- a/svtools/source/misc/imap2.cxx +++ b/vcl/source/treelist/imap2.cxx @@ -27,11 +27,11 @@ #include <sot/formats.hxx> #include <svl/urihelper.hxx> -#include <svtools/imap.hxx> -#include <svtools/imapobj.hxx> -#include <svtools/imaprect.hxx> -#include <svtools/imapcirc.hxx> -#include <svtools/imappoly.hxx> +#include <vcl/imap.hxx> +#include <vcl/imapobj.hxx> +#include <vcl/imaprect.hxx> +#include <vcl/imapcirc.hxx> +#include <vcl/imappoly.hxx> #include <math.h> diff --git a/svtools/source/misc/imap3.cxx b/vcl/source/treelist/imap3.cxx index eed27dd2a729..32c6523e4cf6 100644 --- a/svtools/source/misc/imap3.cxx +++ b/vcl/source/treelist/imap3.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/imap.hxx> +#include <vcl/imap.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/urlobj/inetimg.cxx b/vcl/source/treelist/inetimg.cxx index f3b92c69b305..fe549a94ce3a 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/vcl/source/treelist/inetimg.cxx @@ -21,7 +21,7 @@ #include <sot/formats.hxx> #include <tools/stream.hxx> -#include <svtools/inetimg.hxx> +#include <vcl/inetimg.hxx> static const sal_Unicode TOKEN_SEPARATOR = '\001'; diff --git a/svtools/source/contnr/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 11a1f6e6890a..5b37c1b6960c 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -26,19 +26,17 @@ #include <memory> #include <stack> -#include <svtools/treelistbox.hxx> -#include <svtools/iconview.hxx> -#include <svtools/svlbitm.hxx> -#include <svimpbox.hxx> -#include <iconviewimpl.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/svimpbox.hxx> #include <rtl/instance.hxx> #include <tools/wintypes.hxx> #include <bitmaps.hlst> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> // #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no destructors Image* SvImpLBox::s_pDefCollapsed = nullptr; diff --git a/svtools/source/contnr/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx index 11eeb0165f5e..734c5a43a976 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/vcl/source/treelist/svlbitm.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/treelistbox.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/treelistbox.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> #include <vcl/svapp.hxx> #include <vcl/button.hxx> #include <vcl/decoview.hxx> diff --git a/svtools/source/misc/transfer.cxx b/vcl/source/treelist/transfer.cxx index 44c01059684d..cc1a79c6068c 100644 --- a/svtools/source/misc/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -54,10 +54,10 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <svl/urlbmk.hxx> -#include <svtools/inetimg.hxx> +#include <vcl/inetimg.hxx> #include <vcl/wmf.hxx> -#include <svtools/imap.hxx> -#include <svtools/transfer.hxx> +#include <vcl/imap.hxx> +#include <vcl/transfer.hxx> #include <rtl/strbuf.hxx> #include <cstdio> #include <vcl/dibtools.hxx> diff --git a/svtools/source/misc/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index 5405ce9683a2..020f98aae940 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -28,9 +28,9 @@ #include <comphelper/fileformat.h> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <svl/urlbmk.hxx> -#include <svtools/inetimg.hxx> -#include <svtools/imap.hxx> -#include <svtools/transfer.hxx> +#include <vcl/inetimg.hxx> +#include <vcl/imap.hxx> +#include <vcl/transfer.hxx> using namespace ::com::sun::star::uno; diff --git a/svtools/source/contnr/treelist.cxx b/vcl/source/treelist/treelist.cxx index e20e571f2d4a..cc5297111c78 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/vcl/source/treelist/treelist.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/treelist.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> +#include <vcl/treelist.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> #include <osl/diagnose.h> #include <o3tl/make_unique.hxx> diff --git a/svtools/source/contnr/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 190af932b858..a1f580e66a64 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -23,25 +23,24 @@ - SelectAll( false ) => only repaint the deselected entries */ -#include <svtools/treelistbox.hxx> +#include <vcl/treelistbox.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/svapp.hxx> #include <vcl/accel.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> +#include <vcl/uitest/uiobject.hxx> #include <sot/formats.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <rtl/instance.hxx> #include <comphelper/string.hxx> #include <sal/log.hxx> -#include <svtools/svmedit.hxx> -#include <svtools/svlbitm.hxx> -#include <svtools/treelistentry.hxx> -#include <svtools/viewdataentry.hxx> -#include <svimpbox.hxx> -#include <uitest/uiobject.hxx> +#include <vcl/svlbitm.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/viewdataentry.hxx> +#include <vcl/svimpbox.hxx> #include <set> #include <string.h> @@ -3597,25 +3596,6 @@ void SvTreeListBox::EnableList( bool _bEnable ) Invalidate(tools::Rectangle(Point(), GetSizePixel())); } -css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible() -{ - vcl::Window* pParent = GetAccessibleParentWindow(); - DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" ); - - css::uno::Reference< XAccessible > xAccessible; - if ( pParent ) - { - css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); - if ( xAccParent.is() ) - { - // need to be done here to get the vclxwindow later on in the accessible - css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface()); - xAccessible = pImpl->m_aFactoryAccess.getFactory().createAccessibleTreeListBox( *this, xAccParent ); - } - } - return xAccessible; -} - void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const { assert(pEntry && "SvTreeListBox::FillAccessibleEntryStateSet: invalid entry"); diff --git a/svtools/source/contnr/treelistentry.cxx b/vcl/source/treelist/treelistentry.cxx index 35c342f4a80f..8bcca01a5eaf 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/vcl/source/treelist/treelistentry.cxx @@ -18,8 +18,8 @@ */ #include <memory> -#include <svtools/treelistentry.hxx> -#include <svtools/treelist.hxx> +#include <vcl/treelistentry.hxx> +#include <vcl/treelist.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/treelist/uiobject.cxx b/vcl/source/treelist/uiobject.cxx new file mode 100644 index 000000000000..2c6312861865 --- /dev/null +++ b/vcl/source/treelist/uiobject.cxx @@ -0,0 +1,170 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <memory> +#include <vcl/uitest/uiobject.hxx> +#include <vcl/treelistbox.hxx> + +TreeListUIObject::TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList): + WindowUIObject(xTreeList), + mxTreeList(xTreeList) +{ +} + +namespace { + +bool isCheckBoxList(const VclPtr<SvTreeListBox>& xTreeList) +{ + return (xTreeList->GetTreeFlags() & SvTreeFlags::CHKBTN) == SvTreeFlags::CHKBTN; +} + +} + +StringMap TreeListUIObject::get_state() +{ + StringMap aMap = WindowUIObject::get_state(); + + aMap["SelectionCount"] = OUString::number(mxTreeList->GetSelectionCount()); + aMap["VisibleCount"] = OUString::number(mxTreeList->GetVisibleCount()); + aMap["Children"] = OUString::number(mxTreeList->GetChildCount(nullptr)); + aMap["LevelChildren"] = OUString::number(mxTreeList->GetLevelChildCount(nullptr)); + aMap["CheckBoxList"] = OUString::boolean(isCheckBoxList(mxTreeList)); + return aMap; +} + +void TreeListUIObject::execute(const OUString& rAction, + const StringMap& rParameters) +{ + if (rAction.isEmpty()) + { + } + else + WindowUIObject::execute(rAction, rParameters); +} + +std::unique_ptr<UIObject> TreeListUIObject::get_child(const OUString& rID) +{ + sal_Int32 nID = rID.toInt32(); + if (nID >= 0) + { + SvTreeListEntry* pEntry = mxTreeList->GetEntry(nullptr, nID); + if (!pEntry) + return nullptr; + + return std::unique_ptr<UIObject>(new TreeListEntryUIObject(mxTreeList, pEntry)); + } + + return nullptr; +} + +std::set<OUString> TreeListUIObject::get_children() const +{ + std::set<OUString> aChildren; + + size_t nChildren = mxTreeList->GetLevelChildCount(nullptr); + for (size_t i = 0; i < nChildren; ++i) + { + aChildren.insert(OUString::number(i)); + } + + return aChildren; +} + +OUString TreeListUIObject::get_name() const +{ + return OUString("TreeListUIObject"); +} + +std::unique_ptr<UIObject> TreeListUIObject::create(vcl::Window* pWindow) +{ + SvTreeListBox* pTreeList = dynamic_cast<SvTreeListBox*>(pWindow); + assert(pTreeList); + return std::unique_ptr<UIObject>(new TreeListUIObject(pTreeList)); +} + +TreeListEntryUIObject::TreeListEntryUIObject(const VclPtr<SvTreeListBox>& xTreeList, SvTreeListEntry* pEntry): + mxTreeList(xTreeList), + mpEntry(pEntry) +{ +} + +StringMap TreeListEntryUIObject::get_state() +{ + StringMap aMap; + + aMap["Text"] = mxTreeList->GetEntryText(mpEntry); + aMap["Children"] = OUString::number(mxTreeList->GetLevelChildCount(mpEntry)); + aMap["VisibleChildCount"] = OUString::number(mxTreeList->GetVisibleChildCount(mpEntry)); + + return aMap; +} + +void TreeListEntryUIObject::execute(const OUString& rAction, const StringMap& /*rParameters*/) +{ + if (rAction == "COLLAPSE") + { + mxTreeList->Collapse(mpEntry); + } + else if (rAction == "EXPAND") + { + mxTreeList->Expand(mpEntry); + } + else if (rAction == "SELECT") + { + mxTreeList->Select(mpEntry); + } + else if (rAction == "DESELECT") + { + mxTreeList->Select(mpEntry, false); + } + else if (rAction == "CLICK") + { + if (!isCheckBoxList(mxTreeList)) + return; + SvButtonState eState = mxTreeList->GetCheckButtonState(mpEntry); + eState = eState == SvButtonState::Checked ? SvButtonState::Unchecked : SvButtonState::Checked; + mxTreeList->SetCheckButtonState(mpEntry, eState); + mxTreeList->CheckButtonHdl(); + } +} + +std::unique_ptr<UIObject> TreeListEntryUIObject::get_child(const OUString& rID) +{ + sal_Int32 nID = rID.toInt32(); + if (nID >= 0) + { + SvTreeListEntry* pEntry = mxTreeList->GetEntry(mpEntry, nID); + if (!pEntry) + return nullptr; + + return std::unique_ptr<UIObject>(new TreeListEntryUIObject(mxTreeList, pEntry)); + } + + return nullptr; +} + +std::set<OUString> TreeListEntryUIObject::get_children() const +{ + std::set<OUString> aChildren; + + size_t nChildren = mxTreeList->GetLevelChildCount(mpEntry); + for (size_t i = 0; i < nChildren; ++i) + { + aChildren.insert(OUString::number(i)); + } + + return aChildren; +} + +OUString TreeListEntryUIObject::get_type() const +{ + return OUString("TreeListEntry"); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/viewdataentry.cxx b/vcl/source/treelist/viewdataentry.cxx index 53795b414db2..b6eb6d79562c 100644 --- a/svtools/source/contnr/viewdataentry.cxx +++ b/vcl/source/treelist/viewdataentry.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/viewdataentry.hxx> +#include <vcl/viewdataentry.hxx> SvViewDataEntry::SvViewDataEntry() : nVisPos(0), diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 069cac8e11e7..de117cce9554 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -143,7 +143,7 @@ void Window::SetAccessible( const css::uno::Reference< css::accessibility::XAcce mpWindowImpl->mxAccessible = x; } -// skip all border windows that are no top level frames +// skip all border windows that are not top level frames bool Window::ImplIsAccessibleCandidate() const { if( !mpWindowImpl->mbBorderWin ) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index e3c317099000..df0b82a9b6f6 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1809,11 +1809,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & else if (name == "GtkTreeView") { //To-Do - //a) move svtools SvTreeViewBox into vcl - //b) make that the default target for GtkTreeView - //c) remove the non-drop down mode of ListBox and convert + //a) make SvTreeViewBox the default target for GtkTreeView + //b) remove the non-drop down mode of ListBox and convert // everything over to SvTreeViewBox - //d) remove the users of makeSvTreeViewBox + //c) remove the users of makeSvTreeViewBox extractModel(id, rMap); WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; if (m_bLegacy) diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 66b02c04f3ba..89a346732205 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -308,11 +308,6 @@ #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <svtools/svtdllapi.h> -#include <svtools/transfer.hxx> -#include <svtools/treelist.hxx> -#include <svtools/treelistbox.hxx> -#include <svtools/treelistentries.hxx> -#include <svtools/viewdataentry.hxx> #include <tools/color.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> @@ -350,6 +345,11 @@ #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> #include <xsecctl.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 4900a8710d1f..4c891abae5f3 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/security/CertificateCharacters.hpp> #include <resourcemanager.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <unotools/useroptions.hxx> using namespace css; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 57c827af3801..3f262bf46580 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -27,7 +27,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/datetime.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <strings.hrc> #include <resourcemanager.hxx> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 689303e9355a..926b74371faa 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -48,7 +48,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <strings.hrc> #include <resourcemanager.hxx> diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index d86fc51bdd24..1188ad4a015e 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <tools/urlobj.hxx> -#include <svtools/treelistentry.hxx> +#include <vcl/treelistentry.hxx> #include <strings.hrc> #include <resourcemanager.hxx> diff --git a/xmlsecurity/uiconfig/ui/certpage.ui b/xmlsecurity/uiconfig/ui/certpage.ui index 1583014c6a02..c90dfda415a3 100644 --- a/xmlsecurity/uiconfig/ui/certpage.ui +++ b/xmlsecurity/uiconfig/ui/certpage.ui @@ -52,7 +52,7 @@ </packing> </child> <child> - <object class="svtlo-SvTreeListBox" id="signatures:border"> + <object class="vcllo-SvTreeListBox" id="signatures:border"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> |