tdf#42949 Fix IWYU warnings in svtools/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ifc70900022efcd089c0874bd46e0aacaef0efb72
Reviewed-on: https://gerrit.libreoffice.org/78767
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

include/svtools/genericunodialog.hxx

@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/lang/NotInitializedException.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>

svtools/IwyuFilter_svtools.yaml

@@ -0,0 +1,12 @@
+---
+assumeFilename: svtools/source/control/ruler.cxx
+blacklist:
+    svtools/source/dialogs/insdlg.cxx:
+    # Needed on WIN
+    - comphelper/classids.hxx
+    include/svtools/statusbarcontroller.hxx:
+    # Silence warning while checking statusbarcontroller.cxx
+    - cppuhelper/interfacecontainer.hxx
+    include/svtools/toolboxcontroller.hxx:
+    # Silence warning while checking toolboxcontroller.cxx
+    - cppuhelper/interfacecontainer.hxx

svtools/inc/FltCallDialogParameter.hxx

@@ -19,16 +19,15 @@
 
 #ifndef INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
 #define INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
-#include <sal/types.h>
+
-#include <vcl/field.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/FilterConfigItem.hxx>
+#include <tools/fldunit.hxx>
 
 class FilterConfigItem;
 class SvStream;
 class Graphic;
-namespace vcl
+namespace weld
 {
 class Window;
 }

svtools/inc/table/defaultinputhandler.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
 
 #include <svtools/table/tableinputhandler.hxx>
-#include <svtools/table/tabletypes.hxx>
 
 #include <memory>
 

svtools/inc/table/tablecontrol.hxx

@@ -23,7 +23,6 @@
 #include <svtools/svtdllapi.h>
 #include <svtools/table/tablemodel.hxx>
 #include <vcl/accessibletable.hxx>
-#include <vcl/accessiblefactory.hxx>
 
 #include <vcl/ctrl.hxx>
 #include <vcl/seleng.hxx>

svtools/inc/table/tablecontrolinterface.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_INC_TABLE_TABLECONTROLINTERFACE_HXX
 
 #include <sal/types.h>
-#include <vcl/event.hxx>
 #include <vcl/seleng.hxx>
 
 #include <svtools/table/tabletypes.hxx>

svtools/inc/templwin.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
 #define INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
 
-#include <svtools/controldims.hxx>
+#include <utility>
 
 #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 

svtools/inc/uitest/uiobject.hxx

@@ -8,6 +8,7 @@
  */
 
 #include <memory>
+#include <svtools/simptabl.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
 class SvSimpleTable;

svtools/qa/unit/GraphicObjectTest.cxx

@@ -13,18 +13,9 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <tools/stream.hxx>
-
-#include <vcl/image.hxx>
-
 #include <com/sun/star/frame/Desktop.hpp>
-#include <officecfg/Office/Common.hxx>
 #include <unotest/macros_test.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotxdoc.hxx>
-#include <docsh.hxx>
-#include <doc.hxx>
-#include <ndgrf.hxx>
 
 using namespace css;
 

svtools/qa/unit/svtools-dialogs-test.cxx

@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;

svtools/qa/unit/testHtmlWriter.cxx

@@ -8,10 +8,7 @@
  *
  */
 
-#include <cppunit/TestCase.h>
 #include <cppunit/TestFixture.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
 #include <unotest/bootstrapfixturebase.hxx>

svtools/source/brwbox/brwbox1.cxx

@@ -22,16 +22,13 @@
 #include <o3tl/numeric.hxx>
 #include "datwin.hxx"
 #include <tools/debug.hxx>
-#include <tools/stream.hxx>
 #include <tools/fract.hxx>
 #include <sal/log.hxx>
 
-#include <functional>
 #include <algorithm>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <tools/multisel.hxx>
 #include "brwimpl.hxx"
 

svtools/source/brwbox/brwbox2.cxx

@@ -23,7 +23,6 @@
 #include <svtools/brwbox.hxx>
 #include "datwin.hxx"
 #include <svtools/colorcfg.hxx>
-#include <vcl/salgtype.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/ptrstyle.hxx>

svtools/source/brwbox/brwbox3.cxx

@@ -24,10 +24,8 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/multisel.hxx>
-#include "datwin.hxx"
 #include "brwimpl.hxx"
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 // Accessibility ==============================================================
 

svtools/source/brwbox/brwimpl.hxx

@@ -19,8 +19,10 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
 #define INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
 
+#include <vcl/accessibletableprovider.hxx>
 #include <vcl/svtaccessiblefactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <osl/diagnose.h>
 
 #include <map>

svtools/source/brwbox/datwin.cxx

@@ -21,12 +21,9 @@
 #include "datwin.hxx"
 #include <o3tl/numeric.hxx>
 #include <vcl/commandevent.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
-#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <rtl/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
 

svtools/source/brwbox/datwin.hxx

@@ -23,9 +23,7 @@
 #include <svtools/brwbox.hxx>
 #include <svtools/brwhead.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/image.hxx>
 #include <vcl/transfer.hxx>
-#include <memory>
 #include <vector>
 
 

svtools/source/brwbox/ebbcontrols.cxx

@@ -17,13 +17,10 @@
  */
 
 #include <svtools/editbrowsebox.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
 
-#include <algorithm>
-
 
 namespace svt
 {

svtools/source/brwbox/editbrowsebox.cxx

@@ -24,13 +24,11 @@
 #include <vcl/window.hxx>
 
 #include <vcl/edit.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/settings.hxx>
 
 #include <bitmaps.hlst>
 
 #include <algorithm>
-#include <tools/multisel.hxx>
 #include "editbrowseboximpl.hxx"
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 

svtools/source/brwbox/editbrowsebox2.cxx

@@ -23,7 +23,6 @@
 #include "editbrowseboximpl.hxx"
 #include <comphelper/types.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/svtaccessiblefactory.hxx>
 #include <vcl/accessiblefactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/diagnose.h>

svtools/source/config/accessibilityoptions.cxx

@@ -30,8 +30,6 @@
 
 #include <svl/hint.hxx>
 
-#include <svtools/colorcfg.hxx>
-
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>

svtools/source/config/apearcfg.cxx

@@ -24,7 +24,6 @@
 #include <tools/debug.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <sal/macros.h>
 
 #include <com/sun/star/uno/Sequence.hxx>
 

svtools/source/config/colorcfg.cxx

@@ -21,7 +21,6 @@
 #include <svtools/colorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/configitem.hxx>
@@ -34,9 +33,6 @@
 
 #include "itemholder2.hxx"
 
- /* #100822# ----
-#include <vcl/wrkwin.hxx>
- ------------- */
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>

svtools/source/config/extcolorcfg.cxx

@@ -24,14 +24,11 @@
 #include <svtools/extcolorcfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <tools/color.hxx>
 #include <unotools/configitem.hxx>
-#include <unotools/configpaths.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <comphelper/sequence.hxx>
-#include <svl/poolitem.hxx>
 #include <svl/hint.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
@@ -41,7 +38,6 @@
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <rtl/instance.hxx>
-#include <rtl/strbuf.hxx>
 
 
 using namespace utl;

svtools/source/config/helpopt.cxx

@@ -19,10 +19,7 @@
 
 #include <sal/config.h>
 
-#include <map>
-
 #include <svtools/helpopt.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>

svtools/source/config/htmlcfg.cxx

@@ -25,10 +25,7 @@
 #include <svtools/parhtml.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
-#include <tools/link.hxx>
-#include <sal/macros.h>
 #include <rtl/instance.hxx>
-#include <list>
 #include <o3tl/typed_flags_set.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 

svtools/source/config/itemholder2.cxx

@@ -21,16 +21,13 @@
 #include "itemholder2.hxx"
 
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 
 #include <svtools/accessibilityoptions.hxx>
-#include <svtools/apearcfg.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/fontsubstconfig.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/printoptions.hxx>
 #include <unotools/options.hxx>

svtools/source/config/menuoptions.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <svtools/menuoptions.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -28,8 +27,6 @@
 
 #include "itemholder2.hxx"
 
-#include <list>
-
 //  namespaces
 
 using namespace ::utl                   ;
@@ -54,8 +51,6 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYHANDLE_SYSTEMICONSINMENUES      3
 #define PROPERTYHANDLE_SHORTCUTSINCONTEXMENU    4
 
-#include <tools/link.hxx>
-
 //  private declarations!
 
 class SvtMenuOptions_Impl : public ConfigItem

svtools/source/config/miscopt.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <svtools/miscopt.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>

svtools/source/config/printoptions.cxx

@@ -18,15 +18,11 @@
  */
 
 #include <svtools/printoptions.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
 #include <vcl/print.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>

svtools/source/config/slidesorterbaropt.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <svtools/slidesorterbaropt.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>

svtools/source/contnr/DocumentInfoPreview.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
@@ -28,19 +27,14 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <rtl/ustring.hxx>
-#include <svl/inettype.hxx>
 #include <svtools/DocumentInfoPreview.hxx>
-#include <svtools/imagemgr.hxx>
 #include <svtools/svmedit2.hxx>
-#include <vcl/builder.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
 #include <tools/datetime.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
-#include <unotools/ucbhelper.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <templwin.hrc>

svtools/source/contnr/contentenumeration.cxx

@@ -18,7 +18,6 @@
  */
 
 #include "contentenumeration.hxx"
-#include <svtools/inettbc.hxx>
 #include <svtools/imagemgr.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
@@ -27,7 +26,6 @@
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/document/DocumentProperties.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -36,6 +34,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
+#include <tools/urlobj.hxx>
 
 namespace svt
 {

svtools/source/contnr/contentenumeration.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <salhelper/thread.hxx>
 #include <ucbhelper/content.hxx>
 #include <rtl/ustring.hxx>

svtools/source/contnr/fileview.cxx

@@ -26,56 +26,40 @@
 #include <svtools/fileview.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/imagemgr.hxx>
+#include <vcl/event.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/svtabbx.hxx>
 #include <svtools/strings.hrc>
 #include <bitmaps.hlst>
-#include <vcl/viewdataentry.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include "contentenumeration.hxx"
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
-#include <com/sun/star/io/XPersist.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <algorithm>
 #include <vector>
-#include <unordered_map>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
-#include <vcl/layout.hxx>
 #include <rtl/math.hxx>
-#include <tools/config.hxx>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
 #include <salhelper/timer.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/dialog.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/ucbhelper.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <svl/urlfilter.hxx>

svtools/source/contnr/simptabl.cxx

@@ -22,8 +22,6 @@
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <uitest/uiobject.hxx>
 

svtools/source/contnr/templwin.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include "templwin.hxx"
 #include <templwin.hrc>

svtools/source/contnr/templwin.hxx

@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
 #define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
 
+#include <rtl/ustring.hxx>
+
 namespace SvtDocInfoTable_Impl
 {
     OUString GetString(int nId);

svtools/source/control/accessibleruler.cxx

@@ -18,19 +18,14 @@
  */
 #include <svtools/accessibleruler.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/uuid.h>
 #include <tools/gen.hxx>
 
 #include <svtools/ruler.hxx>

svtools/source/control/calendar.cxx

@@ -17,29 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/strbuf.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/event.hxx>
-#include <vcl/commandevent.hxx>
-#include <comphelper/processfactory.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <com/sun/star/i18n/Weekdays.hpp>
-#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
-#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#include <sal/log.hxx>
 
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/calendar.hxx>
-#include <memory>
 
 #define CALFIELD_EXTRA_BUTTON_WIDTH         14
 #define CALFIELD_EXTRA_BUTTON_HEIGHT        8

svtools/source/control/ctrlbox.cxx

@@ -21,7 +21,7 @@
 
 #include <i18nutil/unicode.hxx>
 #include <tools/stream.hxx>
-#include <vcl/builderfactory.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -46,14 +46,10 @@
 #include <svtools/borderhelper.hxx>
 #include <svtools/valueset.hxx>
 
-#include <vcl/i18nhelp.hxx>
-#include <vcl/fontcapabilities.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <editeng/borderline.hxx>
 
-#include <com/sun/star/table/BorderLineStyle.hpp>
-
 #include <rtl/bootstrap.hxx>
 
 #include <borderline.hrc>

svtools/source/control/ctrltool.cxx

@@ -24,9 +24,8 @@
 #include <tools/fract.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 #include <sal/macros.h>
 #include <svtools/strings.hrc>

svtools/source/control/filectrl.cxx

@@ -27,7 +27,6 @@
 #include <svtools/svtresid.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/stdtext.hxx>
 #include <svtools/strings.hrc>
 
 using namespace ::com::sun::star::uno;

svtools/source/control/fileurlbox.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <svtools/fileurlbox.hxx>
-#include <osl/file.h>
 #include <svl/filenotation.hxx>
 #include <vcl/event.hxx>
 

svtools/source/control/inettbc.cxx

@@ -19,7 +19,6 @@
 
 #ifdef UNX
 #include <pwd.h>
-#include <sys/types.h>
 #endif
 
 #include <svtools/inettbc.hxx>
@@ -28,7 +27,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -42,20 +40,14 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <rtl/instance.hxx>
-#include <sal/log.hxx>
 #include <salhelper/thread.hxx>
 #include <tools/debug.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/builderfactory.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/toolbox.hxx>
 #include <unotools/historyoptions.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <svl/itemset.hxx>
-#include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>

svtools/source/control/ruler.cxx

@@ -17,12 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>
 #include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
 #include <vcl/event.hxx>
-#include <vcl/i18nhelp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vcllayout.hxx>
 #include <vcl/virdev.hxx>

svtools/source/control/tabbar.cxx

@@ -20,7 +20,6 @@
 
 #include <svtools/tabbar.hxx>
 #include <tools/time.hxx>
-#include <tools/debug.hxx>
 #include <tools/poly.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
@@ -28,7 +27,6 @@
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/event.hxx>
-#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svtaccessiblefactory.hxx>

svtools/source/control/toolbarmenu.cxx

@@ -27,7 +27,6 @@
 #include <vcl/decoview.hxx>
 #include <vcl/image.hxx>
 #include <vcl/taskpanelist.hxx>
-#include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>

svtools/source/control/toolbarmenuacc.cxx

@@ -29,8 +29,8 @@
 #include <vcl/settings.hxx>
 #include <tools/debug.hxx>
 
-#include <svtools/framestatuslistener.hxx>
 #include <svtools/toolbarmenu.hxx>
+#include <svtools/framestatuslistener.hxx>
 
 #include "toolbarmenuimp.hxx"
 

svtools/source/control/toolbarmenuimp.hxx

@@ -21,8 +21,8 @@
 #define INCLUDED_SVTOOLS_SOURCE_CONTROL_TOOLBARMENUIMP_HXX
 
 #include <osl/mutex.hxx>
+#include <vcl/ctrl.hxx>
 #include <vcl/image.hxx>
-#include <vcl/menu.hxx>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -32,7 +32,6 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 #include <rtl/ref.hxx>
 

svtools/source/control/valueimp.hxx

@@ -32,7 +32,6 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 #include <vector>
 

svtools/source/control/valueset.cxx

@@ -28,9 +28,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/virdev.hxx>
 
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>

svtools/source/dialogs/ServerDetailsControls.cxx

@@ -17,16 +17,13 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <officecfg/Office/Common.hxx>
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <tools/diagnose_ex.h>
-#include <toolkit/helper/vclunohelper.hxx>
 
 #include <svtools/PlaceEditDialog.hxx>
 #include <svtools/ServerDetailsControls.hxx>
-#include <sal/log.hxx>
 
 #include <config_oauth2.h>
 

svtools/source/dialogs/addresstemplate.cxx

@@ -28,15 +28,11 @@
 #include <unotools/configitem.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
 #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -47,7 +43,6 @@
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <svl/filenotation.hxx>
 #include <tools/urlobj.hxx>
 #include <algorithm>

svtools/source/dialogs/colrdlg.cxx

@@ -19,15 +19,12 @@
 
 
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/cui/ColorPicker.hpp>
 
 #include <comphelper/processfactory.hxx>
 
-#include <toolkit/helper/vclunohelper.hxx>
-
 #include <svtools/colrdlg.hxx>
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>

svtools/source/dialogs/insdlg.cxx

@@ -27,7 +27,6 @@
 #include <sal/macros.h>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>

svtools/source/edit/textwindowpeer.cxx

@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <sal/types.h>
 #include <svtools/textwindowpeer.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/texteng.hxx>

svtools/source/filter/SvFilterOptionsDialog.cxx

@@ -21,20 +21,12 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/file.hxx>
-#include <osl/module.hxx>
-#include <rtl/ref.hxx>
-#include <svl/solar.hrc>
 #include <FltCallDialogParameter.hxx>
-#include <vcl/settings.hxx>
 #include "exportdialog.hxx"
-#include <uno/mapping.hxx>
 #include <tools/fldunit.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -47,7 +39,6 @@
 #include <unotools/syslocale.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <memory>
 
 using namespace ::com::sun::star;
 

svtools/source/filter/exportdialog.cxx

@@ -34,7 +34,6 @@
 #include <com/sun/star/graphic/PrimitiveFactory2D.hpp>
 #include <com/sun/star/geometry/AffineMatrix2D.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <unotools/streamwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>

svtools/source/filter/exportdialog.hxx

@@ -24,10 +24,12 @@
 #include <FltCallDialogParameter.hxx>
 #include <vcl/weld.hxx>
 #include <tools/stream.hxx>
-#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include <memory>
 
 /*************************************************************************

svtools/source/graphic/renderer.cxx

@@ -18,8 +18,6 @@
  */
 
 
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
@@ -34,7 +32,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <rtl/ref.hxx>
-#include <svl/itemprop.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/outdev.hxx>
 

svtools/source/hatchwindow/documentcloser.cxx

@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -30,8 +29,6 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
-#include <osl/thread.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
 #include <tools/link.hxx>

svtools/source/hatchwindow/hatchwindow.cxx

@@ -25,7 +25,7 @@
 
 #include <toolkit/helper/convert.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <osl/mutex.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 

svtools/source/hatchwindow/hatchwindowfactory.cxx

@@ -23,7 +23,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/svapp.hxx>
 
 #include <hatchwindow.hxx>

svtools/source/hatchwindow/ipwin.cxx

@@ -21,7 +21,6 @@
 
 #include <osl/diagnose.h>
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
 

svtools/source/inc/hatchwindow.hxx

@@ -23,7 +23,6 @@
 #include <com/sun/star/embed/XHatchWindow.hpp>
 
 #include <toolkit/awt/vclxwindow.hxx>
-#include <cppuhelper/typeprovider.hxx>
 
 class SvResizeWindow;
 class VCLXHatchWindow : public css::embed::XHatchWindow,

svtools/source/inc/unoiface.hxx

@@ -24,17 +24,12 @@
 #include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
-#include <cppuhelper/typeprovider.hxx>
-
 #include <com/sun/star/awt/XProgressBar.hpp>
 #include <com/sun/star/awt/XTextArea.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
 #include <tools/lineend.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/edit.hxx>
-
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
 
 
 namespace com { namespace sun { namespace star { namespace util {

svtools/source/java/javainteractionhandler.cxx

@@ -34,7 +34,6 @@
 #include <svtools/restartdialog.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/javainteractionhandler.hxx>
-#include <svtools/javacontext.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::task;

svtools/source/misc/acceleratorexecute.cxx

@@ -26,17 +26,13 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <vcl/evntpost.hxx>
-#include <vcl/window.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
 namespace svt

svtools/source/misc/ehdl.cxx

@@ -21,17 +21,13 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/settings.hxx>
 #include <sal/log.hxx>
 
 #include <svtools/ehdl.hxx>
-#include <svtools/soerr.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/strings.hrc>
 #include <svtools/sfxecode.hxx>
 #include <memory>
 #include <errtxt.hrc>
-#include <strings.hxx>
 
 static DialogMask aWndFunc(
     weld::Window *pWin,            // Parent of the dialog

svtools/source/misc/embedhlp.cxx

@@ -42,13 +42,11 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStateChangeListener.hpp>
 #include <com/sun/star/embed/XLinkageSupport.hpp>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>

svtools/source/misc/embedtransfer.cxx

@@ -17,10 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>

svtools/source/misc/imagemgr.cxx

@@ -21,24 +21,18 @@
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <sal/log.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/image.hxx>
-#include <vcl/settings.hxx>
 #include <sot/storage.hxx>
 #include <comphelper/classids.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ucbhelper/content.hxx>
-#include <unotools/configmgr.hxx>
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <bitmaps.hlst>

svtools/source/misc/langhelp.cxx

@@ -18,12 +18,10 @@
 #include <officecfg/System.hxx>
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 #include <svtools/langhelp.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/sysdata.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/window.hxx>
 #include <config_langs.h>

svtools/source/misc/langtab.cxx

@@ -27,7 +27,6 @@
 #include <i18nlangtag/languagetag.hxx>
 
 #include <sal/log.hxx>
-#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/langtab.hxx>
 #include <unotools/syslocale.hxx>

svtools/source/misc/sampletext.cxx

@@ -10,7 +10,6 @@
 #include <vcl/font.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <i18nutil/unicode.hxx>
 #include <sal/log.hxx>

svtools/source/misc/templatefoldercache.cxx

@@ -42,7 +42,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include <vector>
-#include <list>
 #include <algorithm>
 
 

svtools/source/svhtml/htmlkywd.cxx

@@ -19,14 +19,11 @@
 
 
 #include <algorithm>
-#include <limits.h>
 #include <sal/types.h>
-#include <stdlib.h>
 #include <string.h>
 #include <rtl/ustring.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
-#include <sal/log.hxx>
 
 template<typename T>
 struct TokenEntry

svtools/source/svhtml/parhtml.cxx

@@ -23,7 +23,6 @@
 #include <tools/debug.hxx>
 #include <tools/color.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/character.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
@@ -38,7 +37,6 @@
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 
-#include <memory>
 #include <utility>
 
 using namespace ::com::sun::star;

svtools/source/svrtf/parrtf.cxx

@@ -26,7 +26,6 @@
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <svtools/rtftoken.h>
-#include <svtools/rtfkeywd.hxx>
 #include <svtools/parrtf.hxx>
 
 const int MAX_STRING_LEN = 1024;

svtools/source/svrtf/rtfkeywd.cxx

@@ -23,7 +23,6 @@
 
 #include <algorithm>
 #include <string.h>
-#include <stdlib.h>
 
 // the table is still to be sorted
 struct RTF_TokenEntry

svtools/source/svrtf/rtfout.cxx

@@ -21,7 +21,6 @@
 #include <tools/stream.hxx>
 #include <tools/solar.h>
 #include <rtl/string.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtfout.hxx>
 

svtools/source/table/cellvalueconversion.cxx

@@ -27,7 +27,6 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
-#include <rtl/strbuf.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <tools/date.hxx>

svtools/source/table/cellvalueconversion.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_CELLVALUECONVERSION_HXX
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 

svtools/source/table/defaultinputhandler.cxx

@@ -21,11 +21,9 @@
 #include <table/defaultinputhandler.hxx>
 #include <table/tablecontrolinterface.hxx>
 
-#include "tabledatawindow.hxx"
 #include "mousefunction.hxx"
 
 #include <vcl/event.hxx>
-#include <vcl/cursor.hxx>
 #include <osl/diagnose.h>
 
 

svtools/source/table/gridtablerenderer.cxx

@@ -21,7 +21,6 @@
 #include "cellvalueconversion.hxx"
 #include <table/gridtablerenderer.hxx>
 #include <svtools/table/tablesort.hxx>
-#include <svtools/colorcfg.hxx>
 
 #include <com/sun/star/graphic/XGraphic.hpp>
 

svtools/source/table/mousefunction.hxx

@@ -22,7 +22,6 @@
 
 #include <svtools/table/tabletypes.hxx>
 
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 class MouseEvent;

svtools/source/table/tablecontrol.cxx

@@ -19,12 +19,10 @@
 
 #include <table/tablecontrol.hxx>
 
-#include "tablegeometry.hxx"
 #include "tablecontrol_impl.hxx"
 #include "tabledatawindow.hxx"
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 #include <sal/log.hxx>

svtools/source/table/tablecontrol_impl.cxx

@@ -32,16 +32,15 @@
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
 
 #include <comphelper/flagguard.hxx>
+#include <vcl/accessiblefactory.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/settings.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/image.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 
 #include <cstdlib>
-#include <functional>
 #include <numeric>
 
 #define MIN_COLUMN_WIDTH_PIXEL  4

svtools/source/table/tablecontrol_impl.hxx

@@ -24,7 +24,7 @@
 #include <table/tablecontrolinterface.hxx>
 
 #include <vcl/svtaccessiblefactory.hxx>
-#include <vcl/accessiblefactory.hxx>
+#include <vcl/accessibletable.hxx>
 
 #include <vcl/seleng.hxx>
 

svtools/source/table/tabledatawindow.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
 
 #include <vcl/window.hxx>
-#include <vcl/seleng.hxx>
 
 
 namespace svt { namespace table

svtools/source/uno/addrtempuno.cxx

@@ -19,7 +19,6 @@
 
 #include <svtools/addresstemplate.hxx>
 #include <svtools/genericunodialog.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -27,7 +26,6 @@
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <vcl/svapp.hxx>
-#include <rtl/ref.hxx>
 
 using namespace svt;
 

svtools/source/uno/fpicker.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>

svtools/source/uno/fpicker.hxx

@@ -21,11 +21,11 @@
 #define INCLUDED_SVTOOLS_SOURCE_UNO_FPICKER_HXX
 
 #include <sal/config.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace lang { class XMultiServiceFactory; }

svtools/source/uno/generictoolboxcontroller.cxx

@@ -19,7 +19,6 @@
 
 #include <svtools/generictoolboxcontroller.hxx>
 
-#include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>

svtools/source/uno/genericunodialog.cxx

@@ -25,10 +25,8 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 
-#include <toolkit/awt/vclxwindow.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <osl/mutex.hxx>

svtools/source/uno/popupmenucontrollerbase.cxx

@@ -19,17 +19,13 @@
 
 #include <svtools/popupmenucontrollerbase.hxx>
 
-#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 
-#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 

svtools/source/uno/statusbarcontroller.cxx

@@ -19,7 +19,6 @@
 
 #include <svtools/statusbarcontroller.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -30,11 +29,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#include <svtools/imgdef.hxx>
-#include <svtools/miscopt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 
 using namespace ::cppu;
 using namespace css::awt;

svtools/source/uno/svtxgridcontrol.cxx

@@ -23,18 +23,15 @@
 #include <table/gridtablerenderer.hxx>
 #include <table/tablecontrol.hxx>
 #include "unocontroltablemodel.hxx"
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/property.hxx>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-#include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/grid/GridInvalidDataException.hpp>
 #include <com/sun/star/awt/grid/GridInvalidModelException.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/util/Color.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <vcl/svapp.hxx>

svtools/source/uno/svtxgridcontrol.hxx

@@ -26,14 +26,9 @@
 #include <com/sun/star/awt/grid/XGridRowSelection.hpp>
 #include <com/sun/star/awt/grid/XGridDataListener.hpp>
 #include <com/sun/star/awt/grid/GridDataEvent.hpp>
-#include <com/sun/star/awt/grid/GridColumnEvent.hpp>
-#include <com/sun/star/awt/grid/XGridColumnModel.hpp>
-#include <com/sun/star/awt/grid/XGridDataModel.hpp>
 #include <com/sun/star/awt/grid/XGridSelectionListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/awt/vclxwindows.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>