diff options
Diffstat (limited to 'sw')
57 files changed, 76 insertions, 76 deletions
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> |