[Libreoffice-commits] core.git: dbaccess/source extensions/source include/vcl sc/source sd/source sfx2/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 31 13:08:54 UTC 2019
dbaccess/source/ui/dlg/adminpages.cxx | 4 ---
dbaccess/source/ui/dlg/detailpages.hxx | 4 ---
dbaccess/source/ui/dlg/dlgsave.cxx | 3 --
dbaccess/source/ui/dlg/generalpage.hxx | 3 --
dbaccess/source/ui/inc/curledit.hxx | 2 -
extensions/source/abpilot/abpfinalpage.hxx | 1
include/vcl/edit.hxx | 14 -------------
include/vcl/textfilter.hxx | 31 +++++++++++++++++++++++++++++
sc/source/ui/inc/colorformat.hxx | 1
sc/source/ui/inc/editfield.hxx | 1
sc/source/ui/optdlg/tpformula.cxx | 1
sd/source/ui/dlg/headerfooterdlg.cxx | 8 -------
sfx2/source/doc/templatedlg.cxx | 2 -
sw/source/ui/dbui/mmaddressblockpage.hxx | 2 -
sw/source/uibase/inc/glossary.hxx | 2 -
sw/source/uibase/inc/instable.hxx | 2 -
sw/source/uibase/inc/optload.hxx | 2 -
sw/source/uibase/inc/swrenamexnameddlg.hxx | 2 -
18 files changed, 38 insertions(+), 47 deletions(-)
New commits:
commit 48912b3516ef7790ba5e18c000e88cbb1989587f
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 31 12:52:39 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 31 15:08:11 2019 +0200
drop some unnecessary includes
Change-Id: Ic3ccc7f0e93258cce30a42c71011154bc9313f52
Reviewed-on: https://gerrit.libreoffice.org/78343
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 3672e247de5c..1133a0961e5c 100644
--- 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>
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index ead3a3af6c24..da0f28fbb942 100644
--- 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"
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 09c950d02b99..ebd84975853a 100644
--- 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>
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 63d8736ea38b..2b18c1c80ca9 100644
--- 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
{
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index f87695ef7e3d..1b53358c4f77 100644
--- 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>
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 915ec6abc932..a4d7330c9f59 100644
--- 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
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index bc18f3a412e6..f5b1bd6e7ff1 100644
--- 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
diff --git a/include/vcl/textfilter.hxx b/include/vcl/textfilter.hxx
new file mode 100644
index 000000000000..603daafd97c8
--- /dev/null
+++ 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: */
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index 16330783675a..2c243c756f54 100644
--- 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;
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index 359ab20549ad..1986790ad953 100644
--- 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. */
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index abdd14a99f3f..c948608ae76b 100644
--- 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>
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 9145304ab2c4..320e6fe54695 100644
--- 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>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f3c91a28c767..54cd6ffd96d8 100644
--- 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>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 910110814740..ff4efd8ee1d7 100644
--- 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>
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 899b3a7bea1b..596ca184813b 100644
--- 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>
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index f71f17575179..3145227e84a1 100644
--- 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"
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index d49924b961bf..d277a4d89e26 100644
--- 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>
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index b847d54e7ac4..381f9e7a35b2 100644
--- 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>
More information about the Libreoffice-commits
mailing list