diff options
Diffstat (limited to 'cui')
47 files changed, 70 insertions, 70 deletions
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> |