drop some unneeded includes

Change-Id: I78b9682968acea7564554fb589d2759b6c8e67d0
Reviewed-on: https://gerrit.libreoffice.org/70126
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

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
 {

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()

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>

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>

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>

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>
 

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>

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>

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;

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;

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>

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
 {

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>

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
 {

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>

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>
 

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>

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>

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>

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>

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>
 

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>

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>

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;

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 )

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>
 

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>

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>

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>

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>

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>
 

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>

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;

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"
 

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>

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

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>

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>

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;

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>

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>