drop some unnecessary includes

Change-Id: Ic3ccc7f0e93258cce30a42c71011154bc9313f52 Reviewed-on: https://gerrit.libreoffice.org/78343 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-08-31 12:52:39 +01:00
parent 8d3f424555
commit 48912b3516
18 changed files with 38 additions and 47 deletions
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -34,10 +34,6 @@

 #include <comphelper/types.hxx>
 #include <osl/file.hxx>
-#include <vcl/accel.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>

--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -23,10 +23,6 @@
 #include "adminpages.hxx"
 #include <charsets.hxx>
 #include <charsetlistbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/button.hxx>
 #include "TextConnectionHelper.hxx"
 #include "admincontrols.hxx"

--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -27,9 +27,6 @@
 #include <connectivity/dbtools.hxx>
 #include <UITools.hxx>
 #include <SqlNameEdit.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -22,9 +22,6 @@

 #include "adminpages.hxx"
 #include <opendoccontrols.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>

 namespace dbaui
 {
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CURLEDIT_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_CURLEDIT_HXX

-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/weld.hxx>
 #include <dsntypes.hxx>

--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -24,7 +24,6 @@
 #include "abptypes.hxx"

 #include <svx/databaselocationinput.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/vclptr.hxx>

 namespace abp
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_EDIT_HXX

 #include <vcl/ctrl.hxx>
+#include <vcl/textfilter.hxx>

 #include <memory>

@@ -52,19 +53,6 @@ struct Impl_IMEInfos;

 typedef OUString (*FncGetSpecialChars)( weld::Widget* pWin, const vcl::Font& rFont );

-class VCL_DLLPUBLIC TextFilter
-{
-private:
-    OUString sForbiddenChars;
-public:
-    void SetForbiddenChars(const OUString& rSet) { sForbiddenChars = rSet; }
-
-    virtual OUString filter(const OUString &rText);
-
-    TextFilter(const OUString &rForbiddenChars = OUString(" "));
-    virtual ~TextFilter();
-};
-
 class Timer;

 class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient
--- a/include/vcl/textfilter.hxx
+++ b/include/vcl/textfilter.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+#ifndef INCLUDED_VCL_TEXTFILTER_HXX
+#define INCLUDED_VCL_TEXTFILTER_HXX
+
+#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+
+class VCL_DLLPUBLIC TextFilter
+{
+private:
+    OUString sForbiddenChars;
+
+public:
+    void SetForbiddenChars(const OUString& rSet) { sForbiddenChars = rSet; }
+
+    virtual OUString filter(const OUString& rText);
+
+    TextFilter(const OUString& rForbiddenChars = OUString(" "));
+    virtual ~TextFilter();
+};
+
+#endif // INCLUDED_VCL_TEXTFILTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -13,7 +13,6 @@
 #include <vcl/weld.hxx>
 #include <svx/colorbox.hxx>
 #include <address.hxx>
-#include <vcl/edit.hxx>

 struct ScDataBarFormatData;
 class ScDocument;
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_EDITFIELD_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_EDITFIELD_HXX

-#include <vcl/edit.hxx>
 #include <vcl/weld.hxx>

 /** An edit control that contains a double precision floating-point value. */
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -27,7 +27,6 @@
 #include <scresid.hxx>
 #include <formula/grammar.hxx>
 #include "calcoptionsdlg.hxx"
-#include <vcl/edit.hxx>

 #include <unotools/localedatawrapper.hxx>

--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -27,11 +27,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>

-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-
 #include <Outliner.hxx>
 #include <headerfooterdlg.hxx>
 #include <DrawDocShell.hxx>
@@ -40,13 +35,12 @@
 #include <sdmod.hxx>

 // preview control for presentation layout
-#include <vcl/ctrl.hxx>
 #include <tools/color.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/colorcfg.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/builderfactory.hxx>
+#include <vcl/svapp.hxx>

 #include <undoheaderfooter.hxx>
 #include <sdundogr.hxx>
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -39,8 +39,6 @@
 #include <unotools/viewoptions.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/event.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>

--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -24,7 +24,7 @@
 #include <vcl/button.hxx>
 #include <mailmergehelper.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/edit.hxx>
+#include <vcl/textfilter.hxx>
 #include <vcl/layout.hxx>
 #include <svl/lstner.hxx>
 #include <o3tl/typed_flags_set.hxx>
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX

-#include <vcl/edit.hxx>
 #include <vcl/customweld.hxx>
+#include <vcl/textfilter.hxx>
 #include <vcl/weld.hxx>

 #include <com/sun/star/text/XAutoTextContainer2.hpp>
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
-#include <vcl/edit.hxx>
+#include <vcl/textfilter.hxx>

 #include "wrtsh.hxx"
 #include "autoformatpreview.hxx"
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tabdlg.hxx>

 #include <vcl/customweld.hxx>
-#include <vcl/edit.hxx>
+#include <vcl/textfilter.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/basedlgs.hxx>

--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX

-#include <vcl/edit.hxx>
+#include <vcl/textfilter.hxx>
 #include <vcl/weld.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>