basctl/source/basicide/bastype3.hxx | 2
cui/source/customize/acccfg.cxx | 61 -------------
cui/source/customize/eventdlg.cxx | 1
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/linkdlg.cxx | 6 -
cui/source/dialogs/pastedlg.cxx | 2
cui/source/inc/SvxMenuConfigPage.hxx | 9 -
cui/source/inc/SvxToolbarConfigPage.hxx | 9 -
cui/source/inc/acccfg.hxx | 17 ---
cui/source/inc/autocdlg.hxx | 9 -
cui/source/inc/cfg.hxx | 3
cui/source/inc/headertablistbox.hxx | 3
cui/source/tabpages/macroass.cxx | 2
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 2
desktop/source/deployment/gui/dp_gui.h | 1
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2
desktop/source/deployment/gui/license_dialog.cxx | 1
extensions/source/bibliography/bibload.cxx | 1
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/general.hxx | 1
reportdesign/source/ui/inc/GroupsSorting.hxx | 1
sc/source/ui/miscdlgs/scuiautofmt.cxx | 3
sfx2/source/doc/new.cxx | 1
sfx2/source/inc/versdlg.hxx | 2
svtools/source/edit/svmedit.cxx | 2
svtools/source/inc/unoiface.hxx | 3
svx/source/fmcomp/gridcell.cxx | 1
svx/source/inc/datanavi.hxx | 3
svx/source/inc/docrecovery.hxx | 1
sw/source/ui/config/mailconfigpage.cxx | 3
sw/source/ui/dbui/addresslistdialog.hxx | 3
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/mmgreetingspage.hxx | 1
sw/source/ui/fldui/flddinf.hxx | 6 -
sw/source/uibase/app/appenv.cxx | 1
sw/source/uibase/inc/cnttab.hxx | 6 -
sw/source/uibase/inc/envlop.hxx | 1
sw/source/uibase/inc/regionsw.hxx | 7 -
sw/source/uibase/inc/swuiccoll.hxx | 1
sw/source/uibase/inc/swuicnttab.hxx | 3
sw/source/uibase/shells/textsh2.cxx | 1
41 files changed, 16 insertions(+), 172 deletions(-)
New commits:
commit 32c2ecb607af3176a806969e26a8cad0364be286
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 2 10:20:38 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 2 14:50:02 2019 +0200
drop some unneeded includes
Change-Id: I78b9682968acea7564554fb589d2759b6c8e67d0
Reviewed-on: https://gerrit.libreoffice.org/70126
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/basctl/source/basicide/bastype3.hxx
b/basctl/source/basicide/bastype3.hxx
index 19887f9f7dc7..41ddf81b93f8 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE3_HXX
#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE3_HXX
-#include <svtools/svmedit.hxx>
#include <vcl/accel.hxx>
+#include <vcl/edit.hxx>
namespace basctl
{
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 83ded12b470f..df18306af9f4 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -34,6 +34,7 @@
#include <sal/macros.h>
#include <vcl/builderfactory.hxx>
+#include <vcl/edit.hxx>
#include <strings.hrc>
#include <sfx2/strings.hrc>
@@ -779,66 +780,6 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSfxAccCfgTabListBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
-{
- WinBits nWinBits = WB_TABSTOP;
-
- OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
- if (!sBorder.isEmpty())
- nWinBits |= WB_BORDER;
-
- rRet = VclPtr<SfxAccCfgTabListBox_Impl>::Create(pParent, nWinBits);
-}
-
-SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
-{
- disposeOnce();
-}
-
-/** select the entry, which match the current key input ... excepting
- keys, which are used for the dialog itself.
- */
-void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
-{
- vcl::KeyCode aCode1 = aKey.GetKeyCode();
- sal_uInt16 nCode1 = aCode1.GetCode();
- sal_uInt16 nMod1 = aCode1.GetModifier();
-
- // is it related to our list box ?
- if (
- (nCode1 != KEY_DOWN ) &&
- (nCode1 != KEY_UP ) &&
- (nCode1 != KEY_LEFT ) &&
- (nCode1 != KEY_RIGHT ) &&
- (nCode1 != KEY_PAGEUP ) &&
- (nCode1 != KEY_PAGEDOWN)
- )
- {
- SvTreeListEntry* pEntry = First();
- while (pEntry)
- {
- TAccInfo* pUserData =
static_cast<TAccInfo*>(pEntry->GetUserData());
- if (pUserData)
- {
- sal_uInt16 nCode2 = pUserData->m_aKey.GetCode();
- sal_uInt16 nMod2 = pUserData->m_aKey.GetModifier();
-
- if ((nCode1 == nCode2) &&
- (nMod1 == nMod2 ))
- {
- Select(pEntry);
- MakeVisible(pEntry);
- return;
- }
- }
- pEntry = Next(pEntry);
- }
- }
-
- // no - handle it as normal dialog input
- SvTabListBox::KeyInput(aKey);
-}
-
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent,
const SfxItemSet& aSet )
: SfxTabPage(pParent, "cui/ui/accelconfigpage.ui", "AccelConfigPage",
&aSet)
, m_pMacroInfoItem()
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index d052a07ca8f0..3a2b5d3490cf 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtools/svmedit.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0058fbfe635f..af28aec6eb89 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -21,10 +21,10 @@
#include <macropg.hxx>
#include <vcl/layout.hxx>
-#include <svtools/svmedit.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <svl/eitem.hxx>
+#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 5e3becb76b90..0141f908c38d 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -23,10 +23,10 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/weld.hxx>
-#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
#include <strings.hrc>
#include <sfx2/linkmgr.hxx>
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index b0acc4b8f2ee..9b47043138a6 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -21,12 +21,12 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <pastedlg.hxx>
-#include <svtools/svmedit.hxx>
#include <svtools/insdlg.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <svtools/strings.hrc>
#include <svtools/svtresid.hxx>
+#include <tools/lineend.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx
b/cui/source/inc/SvxMenuConfigPage.hxx
index 8ac919f2e8e8..8dca571c2080 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -19,14 +19,7 @@
#ifndef INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX
#define INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/treelistbox.hxx>
-#include <svtools/svmedit2.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/weld.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx
b/cui/source/inc/SvxToolbarConfigPage.hxx
index 9f827ba9e39d..7c82bd8a61ea 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -19,14 +19,7 @@
#ifndef INCLUDED_CUI_SOURCE_INC_SVXTOOLBARCONFIGPAGE_HXX
#define INCLUDED_CUI_SOURCE_INC_SVXTOOLBARCONFIGPAGE_HXX
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/treelistbox.hxx>
-#include <svtools/svmedit2.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/weld.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 539411b98966..beaad3acd394 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -31,10 +31,6 @@
#include <algorithm>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/treelistbox.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
#include <i18nutil/searchopt.hxx>
@@ -45,18 +41,6 @@ class CuiConfigFunctionListBox;
class SfxAcceleratorConfigPage;
class SfxStringItem;
-class SfxAccCfgTabListBox_Impl : public SvTabListBox
-{
- void KeyInput( const KeyEvent &rKEvt ) override;
-
-public:
- SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle)
- : SvTabListBox(pParent, nStyle)
- {
- }
- virtual ~SfxAccCfgTabListBox_Impl() override;
-};
-
// class SfxAcceleratorConfigPage ----------------------------------------
struct TAccInfo
@@ -94,7 +78,6 @@ enum class StartFileDialogType { Open, SaveAs };
class SfxAcceleratorConfigPage : public SfxTabPage
{
- friend class SfxAccCfgTabListBox_Impl;
private:
const SfxMacroInfoItem* m_pMacroInfoItem;
std::unique_ptr<sfx2::FileDialogHelper> m_pFileDlg;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 135cb0d72f22..eb6c80c62f6d 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -21,15 +21,8 @@
#include <sfx2/tabdlg.hxx>
#include <svtools/langtab.hxx>
-#include <svtools/simptabl.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/treelistentry.hxx>
-#include <svx/checklbx.hxx>
#include <svx/langbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
+#include <tools/debug.hxx>
#include <vcl/metric.hxx>
class CharClass;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 8ae11c40271d..fbbd96214145 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -26,9 +26,6 @@
#include <vcl/weld.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <vcl/treelistbox.hxx>
-#include <svtools/svmedit2.hxx>
-#include <svtools/svmedit.hxx>
#include <svtools/valueset.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/cui/source/inc/headertablistbox.hxx
b/cui/source/inc/headertablistbox.hxx
index 5793d511fb7e..c4c65feacce0 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_CUI_SOURCE_INC_HEADERTABLISTBOX_HXX
#define INCLUDED_CUI_SOURCE_INC_HEADERTABLISTBOX_HXX
-#include <vcl/headbar.hxx>
-#include <vcl/svtabbx.hxx>
+#include <vcl/weld.hxx>
class MacroEventListBox final
{
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index f077c5d2a14f..2f284d4b51b1 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -25,7 +25,7 @@
#include <comphelper/processfactory.hxx>
#include <svl/macitem.hxx>
#include <svx/dialogs.hrc>
-#include <svtools/svmedit.hxx>
+#include <tools/debug.hxx>
#include <vcl/idle.hxx>
#include <cfgutil.hxx>
#include <sfx2/app.hxx>
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 8c28cfd3076d..3d42bb4e8062 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -23,12 +23,12 @@
#include "migrationprogress.hxx"
#include "rangeprogressbar.hxx"
-#include <svtools/svmedit.hxx>
#include <svtools/urlcontrol.hxx>
#include <svtools/wizardmachine.hxx>
#include <svx/databaselocationinput.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
+#include <vcl/vclmedit.hxx>
namespace svt
{
diff --git a/desktop/source/deployment/gui/dp_gui.h
b/desktop/source/deployment/gui/dp_gui.h
index 62d3311b81e2..01eaadd75936 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -30,7 +30,6 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <com/sun/star/ucb/XContentEventListener.hpp>
#include <osl/mutex.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 90a28f71f87c..6a1c40083c84 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -32,8 +32,6 @@
#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
-#include <svtools/svmedit.hxx>
-
#include <osl/conditn.hxx>
#include <osl/mutex.hxx>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx
b/desktop/source/deployment/gui/license_dialog.cxx
index aa8d45d4cf65..92bfb4bf0e8a 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -26,7 +26,6 @@
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <svtools/svmedit.hxx>
#include <svl/lstner.hxx>
#include <vcl/xtextedt.hxx>
#include <vcl/textview.hxx>
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index 420b7eed6057..12af26f4cede 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -50,7 +50,6 @@
#include <vcl/window.hxx>
#include <vcl/edit.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/svmedit.hxx>
#include "bibresid.hxx"
#include <strings.hrc>
diff --git a/extensions/source/bibliography/datman.cxx
b/extensions/source/bibliography/datman.cxx
index b1d7dac8d267..19413d9f5ba6 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -50,8 +50,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <svl/urihelper.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/headbar.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/extensions/source/bibliography/general.hxx
b/extensions/source/bibliography/general.hxx
index b701d6ec9631..bed1d5cc08c0 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/sdbc/XRowSetListener.hpp>
#include <vcl/layout.hxx>
-#include <svtools/svmedit.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/combobox.hxx>
#include <vcl/scrbar.hxx>
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx
b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 702ed3ab560f..453963c8687d 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -33,7 +33,6 @@
#include <GroupProperties.hxx>
#include <comphelper/propmultiplex.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <svtools/svmedit.hxx>
#include <rtl/ref.hxx>
#include <osl/diagnose.h>
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx
b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index fa5ced63c8b2..f933fc0ffa41 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -19,9 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/strings.hrc>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 2b0c9b566e5e..0c77b75d13c3 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -23,7 +23,6 @@
#include <vcl/layout.hxx>
#include <vcl/idle.hxx>
#include <vcl/gdimtf.hxx>
-#include <svtools/svmedit.hxx>
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
#include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 123a744f897b..8f9377881e91 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_SFX2_SOURCE_INC_VERSDLG_HXX
#include <sfx2/basedlgs.hxx>
-#include <svtools/simptabl.hxx>
-#include <svtools/svmedit.hxx>
#include <vcl/weld.hxx>
class SfxViewFrame;
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 8f83f5b183db..e8666a83ddd1 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
+#include <svtools/svmedit.hxx>
#include <unoiface.hxx>
MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle )
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 049cab08dfa1..efdd1a8cfe79 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -31,10 +31,9 @@
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <svtools/svmedit.hxx>
+#include <tools/lineend.hxx>
#include <vcl/fmtfield.hxx>
-
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b0fa861ed605..85e26dbfe79e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -61,7 +61,6 @@
#include <vcl/fmtfield.hxx>
#include <svl/numuno.hxx>
#include <svl/zforlist.hxx>
-#include <svtools/svmedit.hxx>
#include <svx/dialmgr.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 431ad1c6a523..a03e80a4af06 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
#include <vcl/builder.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
@@ -31,8 +30,6 @@
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
#include <svtools/inettbc.hxx>
-#include <svtools/simptabl.hxx>
-#include <svtools/svmedit.hxx>
#include <vcl/treelistbox.hxx>
#include <sfx2/dockwin.hxx>
#include <sfx2/childwin.hxx>
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index e5d5de31988e..22cb6799be7d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_SOURCE_INC_DOCRECOVERY_HXX
#include <vcl/weld.hxx>
-#include <svtools/svmedit2.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index f0656f6ad481..a4c8a1f3a7a8 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -20,9 +20,6 @@
#include <swmodule.hxx>
#include <swtypes.hxx>
#include <mailconfigpage.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/headbar.hxx>
#include <mmconfigitem.hxx>
#include <mailmergehelper.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx
b/sw/source/ui/dbui/addresslistdialog.hxx
index 1f56408bcb45..aba1d8db8104 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -20,9 +20,6 @@
#define INCLUDED_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
-#include <vcl/button.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/headbar.hxx>
#include <swdbdata.hxx>
#include <sharedconnection.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 3d33daf8246c..9251c27573f6 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -25,7 +25,7 @@
#include <sfx2/basedlgs.hxx>
#include <vcl/edit.hxx>
#include <vcl/layout.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/vclmedit.hxx>
#include <vcl/headbar.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/combobox.hxx>
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx
b/sw/source/ui/dbui/mmgreetingspage.hxx
index 6342200ef316..9a1dd59e475d 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -22,7 +22,6 @@
#include <svtools/wizardmachine.hxx>
#include <sfx2/basedlgs.hxx>
#include <mailmergehelper.hxx>
-#include <svtools/svmedit.hxx>
#include <vcl/weld.hxx>
class SwMailMergeWizard;
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index f62b340811c2..b4d7032e92d3 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -20,12 +20,6 @@
#define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDINF_HXX
#include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/treelistbox.hxx>
-
#include <numfmtlb.hxx>
#include "fldpage.hxx"
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index e86419508340..7f6a13c476e1 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -25,7 +25,6 @@
#include <sfx2/request.hxx>
#include <svx/svxids.hrc>
-#include <svtools/svmedit.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index d6e1f56f8fd5..9a1c9104a49b 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -20,17 +20,11 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
#include <svx/stddlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
#include <sfx2/tabdlg.hxx>
#include <tox.hxx>
#include "toxmgr.hxx"
#include <svx/checklbx.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/menubtn.hxx>
#include <svx/langbox.hxx>
#define TOX_PAGE_SELECT 1
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 630f79b862b3..04686afdf93f 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
-#include <svtools/svmedit.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/weld.hxx>
#include <vcl/customweld.hxx>
diff --git a/sw/source/uibase/inc/regionsw.hxx
b/sw/source/uibase/inc/regionsw.hxx
index aa10c154d2fa..5cb7257deb3e 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -20,13 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_REGIONSW_HXX
#include <hintids.hxx>
-#include <vcl/field.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/treelistbox.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
#include <editeng/brushitem.hxx>
diff --git a/sw/source/uibase/inc/swuiccoll.hxx
b/sw/source/uibase/inc/swuiccoll.hxx
index aa5eeae370d8..59a2b5a39edf 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
#include <sfx2/tabdlg.hxx>
-#include <vcl/svtabbx.hxx>
class SwWrtShell;
class SwFormat;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx
b/sw/source/uibase/inc/swuicnttab.hxx
index 6072df352f6d..d93d4032a802 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -33,9 +33,6 @@
#include <tox.hxx>
#include "toxmgr.hxx"
-#include <svx/checklbx.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/menubtn.hxx>
#include <svx/langbox.hxx>
#include "cnttab.hxx"
#include <vector>
diff --git a/sw/source/uibase/shells/textsh2.cxx
b/sw/source/uibase/shells/textsh2.cxx
index e5369fa3cef2..4400cada0a57 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -19,7 +19,6 @@
#include <cstdarg>
-#include <svtools/svmedit.hxx>
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
#include <sfx2/event.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
