diff options
104 files changed, 49 insertions, 207 deletions
diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml index e46992e6d134..7d15949a9e78 100644 --- a/dbaccess/IwyuFilter_dbaccess.yaml +++ b/dbaccess/IwyuFilter_dbaccess.yaml @@ -76,6 +76,12 @@ excludelist: dbaccess/source/filter/hsqldb/rowinputbinary.cxx: # Needed boost wrapper header - boost/date_time/posix_time/posix_time.hpp + dbaccess/source/filter/xml/xmlDatabase.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp + dbaccess/source/filter/xml/xmlExport.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp dbaccess/source/shared/flt_reghelper.cxx: # Needed for weird included cxx file - comphelper/sequence.hxx @@ -85,6 +91,9 @@ excludelist: dbaccess/source/ui/app/AppDetailPageHelper.cxx: # Actually used - com/sun/star/sdbc/XConnection.hpp + dbaccess/source/ui/app/DocumentInfoPreview.cxx: + # Needed for direct member access + - com/sun/star/document/XDocumentProperties.hpp dbaccess/source/ui/browser/brwview.cxx: # Needed for direct member access - com/sun/star/awt/XControlContainer.hpp @@ -101,6 +110,9 @@ excludelist: dbaccess/source/ui/control/RelationControl.cxx: # Actually used - com/sun/star/awt/XWindow.hpp + dbaccess/source/ui/control/sqledit.cxx: + # Needed for template + - com/sun/star/container/XHierarchicalNameAccess.hpp dbaccess/source/ui/dlg/ConnectionHelper.cxx: # Actually used - com/sun/star/awt/XSystemDependentWindowPeer.hpp @@ -108,6 +120,9 @@ excludelist: dbaccess/source/ui/dlg/DbAdminImpl.cxx: # Actually used - com/sun/star/sdbc/XDriver.hpp + dbaccess/source/ui/dlg/UserAdmin.cxx: + # Needed for template + - com/sun/star/sdbc/XDriver.hpp dbaccess/source/ui/dlg/dbfindex.cxx: # Keep for osl_getThreadTextEncoding - osl/thread.hxx diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index c9f9ac8a3e22..513f99105962 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <comphelper/types.hxx> -#include <com/sun/star/sdbcx/KeyType.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <algorithm> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 443e78a67de7..2752de8e853c 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -20,7 +20,6 @@ #include <apitools.hxx> #include <tablecontainer.hxx> #include <table.hxx> -#include <sal/log.hxx> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> #include <core_resource.hxx> diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index e54712ff9ae5..c24e2376e41a 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -43,7 +43,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/documentinfo.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 77b5ef45fca0..4e9bde5f31d2 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -40,8 +40,6 @@ #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> -#include <com/sun/star/security/DocumentDigitalSignatures.hpp> -#include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> @@ -62,7 +60,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/numberedcollection.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/types.hxx> @@ -72,9 +69,7 @@ #include <cppuhelper/supportsservice.hxx> #include <framework/titlehelper.hxx> #include <unotools/saveopt.hxx> -#include <unotools/tempfile.hxx> #include <tools/diagnose_ex.h> -#include <osl/file.hxx> #include <osl/diagnose.h> #include <vcl/GraphicObject.hxx> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 8ccf9e5d7a02..60810ad04308 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> @@ -47,7 +46,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 9d67ab95d197..144eb4ec9234 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -23,6 +23,7 @@ #include <xmloff/xmlnamespace.hxx> #include <strings.hxx> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/diagnose_ex.h> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 333d09dd15c2..985b6daf0249 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -23,7 +23,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnamespace.hxx> #include <xmloff/namespacemap.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <strings.hxx> @@ -51,7 +50,6 @@ #include <optional> #include <memory> -#include <iterator> using namespace comphelper; using namespace ::com::sun::star::sdb; diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 0e11bf51ea79..7e1d148e197c 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <xmloff/maptype.hxx> #include <xmloff/txtprmap.hxx> diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index b3ea220ab996..45f0c6ad2d8c 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -25,6 +25,7 @@ #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/propertysequence.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 7a6cda3b5b79..24516771289c 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -53,7 +53,6 @@ #include <svtools/sfxecode.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 7b86419be610..c3e5623906eb 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b6c1c16ffca5..1d23f3af8715 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -20,6 +20,7 @@ #include <memory> #include "AppController.hxx" #include <core_resource.hxx> +#include <dbexchange.hxx> #include <strings.hxx> #include <advancedsettingsdlg.hxx> #include "subcomponentmanager.hxx" @@ -66,7 +67,6 @@ #include <comphelper/uno3.hxx> #include <comphelper/types.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 5b6daaf7fbc0..dcad078bd59e 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -49,8 +49,6 @@ #include <connectivity/dbtools.hxx> #include <dbexchange.hxx> #include <UITools.hxx> -#include <algorithm> -#include <iterator> #include <com/sun/star/sdb/XReportDocumentsSupplier.hpp> #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp> #include <svtools/querydelete.hxx> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d65d5bcbc7a3..cd4d9c6e8b80 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> +#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> @@ -41,7 +42,6 @@ #include <com/sun/star/util/XCloseable.hpp> #include <comphelper/propertyvalue.hxx> #include <comphelper/string.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include "AppView.hxx" #include <helpids.h> #include <strings.hxx> @@ -49,9 +49,7 @@ #include <databaseobjectview.hxx> #include <imageprovider.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/settings.hxx> #include <vcl/cvtgrf.hxx> -#include <vcl/event.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <tools/stream.hxx> #include <rtl/ustrbuf.hxx> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 03107f5ecf8b..44d40273115c 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <sfx2/weldutils.hxx> #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/customweld.hxx> diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 57a4f3038448..8570db552fe1 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -30,13 +30,11 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/util/URL.hpp> #include <core_resource.hxx> -#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include "AppDetailPageHelper.hxx" #include <dbaccess/IController.hxx> #include <algorithm> #include <dbtreelistbox.hxx> -#include <imageprovider.hxx> #include "AppController.hxx" using namespace ::dbaui; diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 21f830cc3c62..d481077bdd49 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -21,6 +21,7 @@ #include <core_resource.hxx> #include <strings.hrc> #include <bitmaps.hlst> +#include <sfx2/thumbnailviewitem.hxx> #include <vcl/bitmapex.hxx> #include <vcl/event.hxx> #include <vcl/i18nhelp.hxx> diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 91f81b71a038..1146a77a1f06 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -19,9 +19,7 @@ #pragma once #include <sfx2/thumbnailview.hxx> -#include <sfx2/thumbnailviewitem.hxx> #include <vcl/transfer.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld.hxx> #include <AppElementType.hxx> diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index ec113838371a..01952da0eb03 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -20,9 +20,9 @@ #include "AppSwapWindow.hxx" #include <helpids.h> #include "AppView.hxx" +#include <sfx2/thumbnailviewitem.hxx> #include <vcl/event.hxx> #include <vcl/mnemonic.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include "AppController.hxx" diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index be384b2d9076..d69aabf6f032 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/awt/XWindow.hpp> #include <core_resource.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <vcl/event.hxx> #include "AppTitleWindow.hxx" namespace dbaui diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 4f85ca5bc2bc..394ae39273b7 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -26,16 +26,13 @@ #include <com/sun/star/frame/XFrameLoader.hpp> #include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/sdb/ReportDesign.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index d98f9dedadc2..0db9f29f5236 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -23,7 +23,6 @@ #include <unodatbr.hxx> #include <browserids.hxx> -#include <imageprovider.hxx> #include <osl/diagnose.h> #include <dbtreelistbox.hxx> #include "dbtreemodel.hxx" diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 966ab8b90859..b4da55e02ffc 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <formadapter.hxx> -#include <comphelper/processfactory.hxx> #include <strings.hxx> #include <o3tl/any.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 2f4fe58aa76f..41a30c9df178 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -44,7 +44,6 @@ #include <svl/zforlist.hxx> #include <cppuhelper/queryinterface.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index aa465eff620a..b05ad037377f 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -72,7 +72,6 @@ #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> -#include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index a4c826f6a60f..d63beff8c346 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -18,11 +18,13 @@ */ #include <dbtreelistbox.hxx> +#include <dbexchange.hxx> #include <callbacks.hxx> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> @@ -35,7 +37,6 @@ #include <svx/dbaobjectex.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> -#include <vcl/help.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 60a95a8f45bb..dd0560daca8c 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -31,12 +31,6 @@ #include <editeng/fontitem.hxx> #include <editeng/wghtitem.hxx> #include <sqledit.hxx> -#include <QueryTextView.hxx> -#include <querycontainerwindow.hxx> -#include <helpids.h> -#include <undosqledit.hxx> -#include <QueryDesignView.hxx> -#include <svx/svxids.hrc> #include <cppuhelper/implbase.hxx> #include <i18nlangtag/languagetag.hxx> #include <svl/itemset.hxx> diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 415cc97d5fd7..73d3b8134f00 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -28,13 +28,9 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <connectivity/dbmetadata.hxx> -#include <vcl/event.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> #include <algorithm> @@ -46,7 +42,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdb::application; diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index a3e24939709f..b7733b79e94c 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XDrop.hpp> -#include <ucbhelper/interactionrequest.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XUser.hpp> @@ -46,7 +45,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace dbaui; -using namespace ucbhelper; using namespace comphelper; namespace { diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 41415850bbc4..ffd174ba1d29 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -22,14 +22,9 @@ #include <sqledit.hxx> #include <strings.hrc> #include <comphelper/types.hxx> -#include <editeng/colritem.hxx> -#include <editeng/wghtitem.hxx> -#include <editeng/eeitem.hxx> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> -#include <svl/itemset.hxx> #include <tools/diagnose_ex.h> -#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <com/sun/star/sdbc/SQLException.hpp> diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 1fc2cc423cbb..ed3b2a8faf99 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -20,7 +20,6 @@ #include <memory> #include "JoinController.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace weld { diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index b7be9b4d58a8..ce2017b586d1 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -20,7 +20,6 @@ #include "singledoccontroller.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "TypeInfo.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 73f1576e67e0..af68b9e9b8d7 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -18,17 +18,12 @@ */ #pragma once -#include <com/sun/star/frame/XPopupMenuController.hpp> - #include <vcl/InterimItemWindow.hxx> #include <vcl/transfer.hxx> #include <vcl/timer.hxx> #include <vcl/weld.hxx> #include <memory> -#include <set> - -#include "dbexchange.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index cbf257e8a080..b67ad6d264fc 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -21,10 +21,7 @@ #include <sal/config.h> -#include <comphelper/syntaxhighlight.hxx> #include <sal/log.hxx> -#include <svtools/colorcfg.hxx> -#include <vcl/timer.hxx> #include <vcl/weld.hxx> #include <deque> diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 495baa59a806..94bb5d8f4ffa 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -24,7 +24,6 @@ #include <svx/ParseContext.hxx> #include "TableFieldDescription.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XSQLQueryComposer.hpp> #include <com/sun/star/sdbcx/XAlterView.hpp> diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 087300bfc76d..c084ef240b7d 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -20,7 +20,6 @@ #pragma once #include <svtools/genericunodialog.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/proparrhlp.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 495d447030ba..202cc96a6e00 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -17,14 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sfxsids.hrc> #include <svx/svxids.hrc> #include <QueryTextView.hxx> #include <querycontainerwindow.hxx> #include <helpids.h> +#include <querycontroller.hxx> #include <sqledit.hxx> #include <undosqledit.hxx> -#include <QueryDesignView.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index fec372e29038..a51f2941addb 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -23,7 +23,6 @@ #include <querycontainerwindow.hxx> #include <adtabdlg.hxx> #include <querycontroller.hxx> -#include <sqledit.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index ae83c8714458..a90c70b21148 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> -#include <vcl/event.hxx> using namespace dbaui; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 8b3677cee7ce..af8f5983da24 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -21,7 +21,6 @@ #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/processfactory.hxx> #include <core_resource.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index d7753e3557b2..0304a2b9d337 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -10,10 +10,8 @@ #pragma once #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <connectivity/CommonTools.hxx> #include <svtools/toolboxcontroller.hxx> -#include <rtl/ustring.hxx> #include <vcl/vclptr.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index b6ef3fedff6c..6a77aa548855 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/ui/XUIElement.hpp> #include <comphelper/propertysequence.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index d6181459ca6f..e16054f6b768 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <iterator> #include <map> #include <strings.hrc> @@ -30,7 +29,6 @@ #include <comphelper/types.hxx> #include <core_resource.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/processfactory.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 57af83b361f3..25e0f08ee50b 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <comphelper/processfactory.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbmetadata.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 1928766c07bd..fe3912fa1eb5 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -18,8 +18,6 @@ */ #include <TableDesignHelpBar.hxx> -#include <vcl/event.hxx> -#include <vcl/settings.hxx> #include <helpids.h> using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index bb2657f91a6f..f0570ddba9db 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -27,7 +27,6 @@ #include <i18nlangtag/languagetag.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/syslocale.hxx> -#include <vcl/settings.hxx> #include <memory> using namespace ::dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index af7dfd6168b7..7e6c4f111e5f 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -18,12 +18,9 @@ */ #include "TableFieldDescWin.hxx" -#include <osl/diagnose.h> #include <FieldDescriptions.hxx> #include <strings.hrc> #include <TableDesignHelpBar.hxx> -#include <vcl/event.hxx> -#include <vcl/settings.hxx> #include <helpids.h> #include <core_resource.hxx> diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index a6ab43f483f7..3d24cfc242a7 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -21,7 +21,6 @@ #include <unoadmin.hxx> #include <advancedsettingsdlg.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 781fdd351d74..f2d0642275a9 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -21,7 +21,6 @@ #include "ColumnPeer.hxx" #include <apitools.hxx> #include <com/sun/star/awt/PosSize.hpp> -#include <comphelper/processfactory.hxx> extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dbu_OColumnControl_get_implementation( diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index efea97979d65..9c6054d623e2 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -20,7 +20,6 @@ #include <connectivity/CommonTools.hxx> #include <toolkit/controls/unocontrol.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace com::sun::star::uno { class XComponentContext; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 3d07cd48d993..8c9d16596386 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -19,7 +19,6 @@ #include "DBTypeWizDlg.hxx" #include <dbwiz.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 1408e4f0046f..63c3d6304b0d 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -21,7 +21,6 @@ #include <dbwizsetup.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 7d3a5a61a274..cd01f2587370 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -19,7 +19,6 @@ #include "TableFilterDlg.hxx" #include <TablesSingleDlg.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 8000add8def5..7039c7396d86 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -19,7 +19,6 @@ #include "UserSettingsDlg.hxx" #include <UserAdminDlg.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index bd9de4b36aa7..f609863e1881 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -19,7 +19,6 @@ #include "admindlg.hxx" #include <dbadmin.hxx> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 433b588d69b2..650f1fe26932 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <queryfilter.hxx> #include <queryorder.hxx> -#include <comphelper/processfactory.hxx> #include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index b33c068483e7..c2e67359b908 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -34,7 +34,6 @@ #include <paramdialog.hxx> #include <vcl/svapp.hxx> #include <CollectionView.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 12037bf4522f..fdb0dbd2c946 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XInteractionHandler2.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/ParametersRequest.hpp> #include <com/sun/star/sdb/DocumentSaveRequest.hpp> diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index a846d44b71dd..620e4917ea93 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdb/XTextConnectionSettings.hpp> -#include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 494407a117f0..0fa9b6ee5e19 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -26,7 +26,6 @@ #include <directsql.hxx> #include <datasourceconnector.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 85e87dbab83f..39364ba254ca 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -21,7 +21,6 @@ #include <unosqlmessage.hxx> #include <stringconstants.hxx> #include <strings.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <connectivity/dbexception.hxx> #include <vcl/svapp.hxx> diff --git a/desktop/IwyuFilter_desktop.yaml b/desktop/IwyuFilter_desktop.yaml index 0729ec1c7e89..cfe94e22cc28 100644 --- a/desktop/IwyuFilter_desktop.yaml +++ b/desktop/IwyuFilter_desktop.yaml @@ -49,6 +49,12 @@ excludelist: desktop/source/minidump/minidump.cxx: # Needed for ostringstream - sstream + desktop/source/deployment/gui/dp_gui_updatedialog.cxx: + # Actually used + - vector + desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx: + # Actually used + - vector desktop/source/deployment/manager/dp_properties.cxx: # Actually used - com/sun/star/ucb/XCommandEnvironment.hpp @@ -85,3 +91,6 @@ excludelist: desktop/source/deployment/registry/help/dp_help.cxx: # Actually used - com/sun/star/util/XMacroExpander.hpp + desktop/source/splash/splash.cxx: + # Needed for rtl::math::round + - rtl/math.hxx diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 6b3bb13a9ecb..944653b72640 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/deployment/XExtensionManager.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <com/sun/star/deployment/XPackageManagerFactory.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <osl/mutex.hxx> #include <vector> #include <unordered_map> diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 165c73cd3894..8076dada5cb0 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -23,6 +23,7 @@ #include <unotools/bootstrap.hxx> #include <sal/log.hxx> #include <osl/file.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::com::sun::star; diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index c25b48ba11ac..889b9245d04b 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 2e963c096ae5..83f687703e9f 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -24,6 +24,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <sal/log.hxx> #include <osl/file.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 40deda7e5431..a6388fa421b1 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index f09697590a59..36b3e181cc93 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -21,7 +21,6 @@ #include <sal/config.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/connection/XAcceptor.hpp> diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index 2cf813ac2165..0396a5bf5cbf 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -22,7 +22,7 @@ #include <osl/process.h> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> -#include <rtl/ref.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace com::sun::star; diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index e5de0f678dd8..52b148abf0ef 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -12,12 +12,9 @@ #include <stdio.h> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> namespace desktop { diff --git a/drawinglayer/IwyuFilter_drawinglayer.yaml b/drawinglayer/IwyuFilter_drawinglayer.yaml index 5d430b2fd490..c3f3a169cb7b 100644 --- a/drawinglayer/IwyuFilter_drawinglayer.yaml +++ b/drawinglayer/IwyuFilter_drawinglayer.yaml @@ -1,9 +1,6 @@ --- assumeFilename: drawinglayer/source/primitive2d/svggradientprimitive2d.cxx excludelist: - drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx: - # Actually used - - com/sun/star/lang/XMultiServiceFactory.hpp drawinglayer/source/dumper/EnhancedShapeDumper.cxx: # Actually used - com/sun/star/beans/XPropertySet.hpp @@ -13,6 +10,12 @@ excludelist: drawinglayer/source/primitive2d/sceneprimitive2d.cxx: # Needed for direct member access - drawinglayer/attribute/sdrlightattribute3d.hxx + drawinglayer/source/primitive2d/textlayoutdevice.cxx: + # Needed for template + - com/sun/star/uno/XComponentContext.hpp drawinglayer/source/processor2d/vclhelperbufferdevice.cxx: # Needed for direct member access - basegfx/matrix/b2dhommatrix.hxx + drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx: + # Needed for rtl::math::sin + - rtl/math.hxx diff --git a/drawinglayer/inc/converters.hxx b/drawinglayer/inc/converters.hxx index 4f585d5d08db..cd1fdba37bbc 100644 --- a/drawinglayer/inc/converters.hxx +++ b/drawinglayer/inc/converters.hxx @@ -20,7 +20,7 @@ #pragma once #include <vcl/bitmapex.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> namespace drawinglayer { diff --git a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx index 818e6f2b3771..86297687ad5f 100644 --- a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx @@ -19,7 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx index fb1431152b16..001ff3159305 100644 --- a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx +++ b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx @@ -19,8 +19,8 @@ #pragma once -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <vcl/GraphicObject.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> +#include <vcl/GraphicAttributes.hxx> class Graphic; diff --git a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx index 9a856c9f6f59..45a21f67dab8 100644 --- a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx @@ -19,7 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx index 500190658a5d..c84deefd8547 100644 --- a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx index 21efcebfd3cd..1843d5ef9f11 100644 --- a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx index 1b6080437583..c92006b36db3 100644 --- a/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <vcl/wall.hxx> diff --git a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx index b897ff4273d0..151fa67ea9da 100644 --- a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <primitive3d/textureprimitive3d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> diff --git a/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx index 6ea90a9a09e8..45de83380bf5 100644 --- a/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive3d/groupprimitive3d.hxx> diff --git a/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx index b0de7d82b935..38372977e1c4 100644 --- a/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> diff --git a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx index 204019dfc41f..6e549289b24c 100644 --- a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <vector> diff --git a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx index 93b62a4c685b..627d2b8c1b9b 100644 --- a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> diff --git a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx index 2e39c07864b4..855ee34363a3 100644 --- a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> #include <basegfx/vector/b2dvector.hxx> diff --git a/drawinglayer/inc/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/processor3d/geometry2dextractor.hxx index d5ff9f5b31eb..e490ecfc538c 100644 --- a/drawinglayer/inc/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/processor3d/geometry2dextractor.hxx @@ -19,10 +19,8 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/processor3d/baseprocessor3d.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> diff --git a/drawinglayer/inc/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/processor3d/shadow3dextractor.hxx index 526199b7d009..9fa877fec552 100644 --- a/drawinglayer/inc/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/processor3d/shadow3dextractor.hxx @@ -19,10 +19,8 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/processor3d/baseprocessor3d.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/drawinglayer/inc/texture/texture.hxx b/drawinglayer/inc/texture/texture.hxx index 24e23a4b241c..9cfb2d6d56f7 100644 --- a/drawinglayer/inc/texture/texture.hxx +++ b/drawinglayer/inc/texture/texture.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolor.hxx> diff --git a/drawinglayer/inc/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx index e7cf87d764ff..935fa09883f2 100644 --- a/drawinglayer/inc/texture/texture3d.hxx +++ b/drawinglayer/inc/texture/texture3d.hxx @@ -19,8 +19,6 @@ #pragma once -#include <drawinglayer/drawinglayerdllapi.h> - #include <texture/texture.hxx> #include <vcl/bitmapex.hxx> diff --git a/drawinglayer/source/attribute/sdrglowattribute.cxx b/drawinglayer/source/attribute/sdrglowattribute.cxx index f0c0174e7bf5..36339dac0933 100644 --- a/drawinglayer/source/attribute/sdrglowattribute.cxx +++ b/drawinglayer/source/attribute/sdrglowattribute.cxx @@ -8,14 +8,6 @@ */ #include <drawinglayer/attribute/sdrglowattribute.hxx> -#include <basegfx/vector/b2dvector.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/color/bcolor.hxx> -#include <rtl/instance.hxx> - -#include <utility> - -#include <sal/log.hxx> namespace drawinglayer::attribute { diff --git a/drawinglayer/source/primitive2d/Primitive2DContainer.cxx b/drawinglayer/source/primitive2d/Primitive2DContainer.cxx index 3df6dd791528..3ae4a9b3e3c4 100644 --- a/drawinglayer/source/primitive2d/Primitive2DContainer.cxx +++ b/drawinglayer/source/primitive2d/Primitive2DContainer.cxx @@ -20,10 +20,8 @@ #include <sal/config.h> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/Tools.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <basegfx/utils/canvastools.hxx> using namespace css; diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index ef7055ebdaa4..a3650a57807d 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -19,9 +19,6 @@ #include <sal/config.h> -#include <iterator> -#include <utility> - #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/Tools.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index 708b3f2ce48d..ee67bd305810 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -25,6 +25,7 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <primitive2d/graphicprimitivehelper2d.hxx> +#include <vcl/graph.hxx> using namespace com::sun::star; diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx b/drawinglayer/source/primitive2d/glowprimitive2d.cxx index fb6a599ab4e2..f6dfab2b3c45 100644 --- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx @@ -18,14 +18,8 @@ */ #include <drawinglayer/primitive2d/glowprimitive2d.hxx> -#include <basegfx/color/bcolormodifier.hxx> -#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> -#include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -#include <sal/log.hxx> -#include <memory> - using namespace com::sun::star; namespace drawinglayer::primitive2d diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index e74be52cf98d..de0b5fad2d13 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -26,8 +26,6 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <com/sun/star/drawing/LineCap.hpp> -#include <converters.hxx> - using namespace com::sun::star; using namespace std; diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index e2c0be36ec9e..f0efd64c7bdc 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -23,7 +23,6 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -#include <sal/log.hxx> #include <memory> using namespace com::sun::star; diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index d2101cc9952f..927dacd12b65 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <osl/diagnose.h> #include <algorithm> #include <map> diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 1a3e27ee3afd..27e21a881540 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -39,12 +39,7 @@ #include <vcl/graph.hxx> // for PDFExtOutDevData Graphic support #include <toolkit/helper/formpdfexport.hxx> // for PDFExtOutDevData Graphic support #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> -#include <drawinglayer/primitive2d/glowprimitive2d.hxx> -#include <drawinglayer/primitive2d/softedgeprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 266e118f19ef..0aceee40a631 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -22,25 +22,18 @@ #include "helperwrongspellrenderer.hxx" #include <sal/log.hxx> -#include <tools/stream.hxx> #include <vcl/BitmapBasicMorphologyFilter.hxx> #include <vcl/BitmapFilterStackBlur.hxx> #include <vcl/outdev.hxx> -#include <vcl/dibtools.hxx> #include <vcl/hatch.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/Tools.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx> @@ -67,12 +60,7 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <vcl/window.hxx> #include <vcl/gradient.hxx> -#include <svtools/borderhelper.hxx> -#include <editeng/borderline.hxx> - -#include <com/sun/star/table/BorderLineStyle.hpp> using namespace com::sun::star; diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index e4083043f1b7..c2c835e5291d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -39,14 +39,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index cc0770c9a8fb..d9aed087885f 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -30,13 +30,8 @@ #include <basegfx/curve/b2dcubicbezier.hxx> #include <wmfemfhelper.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx> #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> @@ -51,7 +46,6 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <sal/log.hxx> -#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/drawinglayer/source/tools/emfpimageattributes.hxx b/drawinglayer/source/tools/emfpimageattributes.hxx index 9d26f8f407da..a8ba375538b5 100644 --- a/drawinglayer/source/tools/emfpimageattributes.hxx +++ b/drawinglayer/source/tools/emfpimageattributes.hxx @@ -10,7 +10,6 @@ #pragma once #include "emfphelperdata.hxx" -#include <vector> namespace emfplushelper { diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx index 7e68a780a84c..b9c4e2f83d1d 100644 --- a/drawinglayer/source/tools/primitive2dxmldump.cxx +++ b/drawinglayer/source/tools/primitive2dxmldump.cxx @@ -19,13 +19,8 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/Tools.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx> #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 8439b10957de..583be2e38cf2 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -25,13 +25,8 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx> #include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx> -#include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> |