diff options
119 files changed, 94 insertions, 135 deletions
diff --git a/editeng/IwyuFilter_editeng.yaml b/editeng/IwyuFilter_editeng.yaml index 45f989e4fb51..a75d143baf15 100644 --- a/editeng/IwyuFilter_editeng.yaml +++ b/editeng/IwyuFilter_editeng.yaml @@ -17,6 +17,9 @@ excludelist: - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp - com/sun/star/accessibility/XAccessible.hpp - com/sun/star/lang/XServiceInfo.hpp + editeng/source/editeng/impedit2.cxx: + # Needed for ValueRestorationGuard + - comphelper/flagguard.hxx editeng/source/items/CustomPropertyField.cxx: # Actually used - com/sun/star/document/XDocumentProperties.hpp diff --git a/editeng/inc/strings.hrc b/editeng/inc/strings.hrc index a7195a1d2e4e..b527e390d100 100644 --- a/editeng/inc/strings.hrc +++ b/editeng/inc/strings.hrc @@ -9,6 +9,8 @@ #pragma once +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId RID_SVXITEMS_HORJUST[] = diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 7c76acb3c952..896fa59810eb 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <config_features.h> #include <config_fonts.h> #include <test/bootstrapfixture.hxx> @@ -32,8 +31,6 @@ #include <svl/srchitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> -#include <unotools/transliterationwrapper.hxx> -#include <comphelper/processfactory.hxx> #include <com/sun/star/text/textfield/Type.hpp> diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 4e29bf941e5f..ce39e37d3d83 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -22,12 +22,10 @@ #include <o3tl/safeint.hxx> #include <sal/log.hxx> -#include <editeng/fieldupdater.hxx> #include <editeng/macros.hxx> #include <editeng/section.hxx> #include "editobj2.hxx" #include <editeng/editdata.hxx> -#include <editattr.hxx> #include <editeng/editeng.hxx> #include <editeng/flditem.hxx> diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index fe6711ff6eaf..6e3fe0437568 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -19,12 +19,10 @@ #include <memory> -#include <sal/macros.h> #include <vcl/image.hxx> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <vcl/metric.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> @@ -50,7 +48,6 @@ #include <vcl/window.hxx> #include <editeng/acorrcfg.hxx> #include <editeng/unolingu.hxx> -#include <editeng/fontitem.hxx> #include <unotools/lingucfg.hxx> #include <com/sun/star/frame/XStorable.hpp> @@ -64,7 +61,6 @@ #include <sfx2/viewsh.hxx> #include <osl/diagnose.h> #include <boost/property_tree/json_parser.hpp> -#include <sfx2/dispatch.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 2ec4519b6446..0002d68caafb 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -35,7 +35,6 @@ #include <editeng/scriptspaceitem.hxx> #include <editeng/hngpnctitem.hxx> #include <editeng/forbiddenruleitem.hxx> -#include <svl/itempool.hxx> #include <svl/grabbagitem.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 8c2d054e72ee..98805cfc522a 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -18,8 +18,6 @@ */ -#include <vcl/svapp.hxx> - #include <svl/srchitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/adjustitem.hxx> @@ -35,6 +33,7 @@ #include <sal/log.hxx> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> +#include <osl/thread.h> #include <editxml.hxx> diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 7d897595b0ef..6823a6616d03 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -45,7 +45,6 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/GenericTypeSerializer.hxx> -#include <tools/UnitConversion.hxx> #include <unotools/configmgr.hxx> #include <libxml/xmlwriter.h> #include <editeng/unonrule.hxx> diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 7bcfe11f9a55..50733ade4dd4 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmlcnimp.hxx> #include <xmloff/unoatrcn.hxx> #include <editeng/xmlcnitm.hxx> -#include <tools/solar.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index eec000787a6f..6bb39831bf01 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -43,7 +43,6 @@ #include <unotools/transliterationwrapper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/string.hxx> #include <editeng/editids.hrc> #include <sot/storage.hxx> #include <editeng/udlnitem.hxx> diff --git a/editeng/source/uno/unofored_internal.hxx b/editeng/source/uno/unofored_internal.hxx index f58b8aa98b55..cadb19415951 100644 --- a/editeng/source/uno/unofored_internal.hxx +++ b/editeng/source/uno/unofored_internal.hxx @@ -20,6 +20,7 @@ #pragma once #include <editeng/editeng.hxx> +#include <svl/poolitem.hxx> SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ); diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index d850f70265f6..399572a2eaca 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -41,7 +41,6 @@ #include <editeng/unofdesc.hxx> #include <editeng/unonrule.hxx> #include <editeng/editids.hrc> -#include <editeng/numdef.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/temporary.hxx> #include <memory> diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 538e0b72e3da..d65380cdc87e 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -33,7 +33,6 @@ #include <comphelper/storagehelper.hxx> #include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/interfacecontainer.h> #include <comphelper/mimeconfighelper.hxx> #include <vcl/svapp.hxx> diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index faf3209e1f32..2aeb60e8eda0 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/io/XTruncate.hpp> #include <comphelper/fileformat.h> #include <comphelper/storagehelper.hxx> diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 46508dbceb1d..4394486c21b2 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/io/IOException.hpp> -#include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/classids.hxx> diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 4f76cde853a8..2201d71130ae 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -27,7 +27,9 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <oleembobj.hxx> +#if defined (_WIN32) #include <comphelper/mimeconfighelper.hxx> +#endif #include <comphelper/seqstream.hxx> #include <filter/msfilter/classids.hxx> #include <sal/log.hxx> diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index e739359249b2..26f74f039f19 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/document/XEventListener.hpp> diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 8e3ccba65b84..84a012f183d6 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -27,6 +27,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/lineinfo.hxx> #include <vcl/rendercontext/State.hxx> +#include <vcl/metaact.hxx> #include <rtl/ref.hxx> #include "emfiodllapi.h" @@ -260,8 +261,6 @@ namespace emfio #define UNDOCUMENTED_WIN_RCL_RELATION 32 #define MS_FIXPOINT_BITCOUNT_28_4 4 -class MetaFontAction; - //============================ WmfReader ================================== namespace emfio diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index c436a53ab8e7..0f0bd76d199d 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -8,7 +8,6 @@ */ #include <sal/config.h> -#include <config_features.h> #include <config_fonts.h> #include <test/bootstrapfixture.hxx> @@ -21,11 +20,9 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <comphelper/seqstream.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/graphic/EmfTools.hpp> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/tools/primitive2dxmldump.hxx> #include <vcl/filter/PDFiumLibrary.hxx> diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx index bd9ad4ac6eb3..d5342edf747f 100644 --- a/emfio/source/emfuno/xemfparser.cxx +++ b/emfio/source/emfuno/xemfparser.cxx @@ -23,8 +23,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequence.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml index 4dd6ee91c36e..0e0ba4c9c16c 100644 --- a/extensions/IwyuFilter_extensions.yaml +++ b/extensions/IwyuFilter_extensions.yaml @@ -1,6 +1,9 @@ --- assumeFilename: extensions/source/propctrlr/formcomponenthandler.cxx excludelist: + extensions/inc/strings.hrc: + # Needed for TranslateId macro + - unotools/resmgr.hxx extensions/source/logging/loghandler.hxx: # Don't propose hxx -> h change in URE libs - cppuhelper/interfacecontainer.hxx @@ -80,3 +83,6 @@ excludelist: extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx: # Actually used - com/sun/star/inspection/XObjectInspectorUI.hpp + extensions/source/scanner/grid.cxx: + # Needed for rtl::math::expm1 + - rtl/math.hxx diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h index 30a8736db9fe..48a623dd1319 100644 --- a/extensions/inc/helpids.h +++ b/extensions/inc/helpids.h @@ -20,6 +20,8 @@ #ifndef EXTENSIONS_HELPIDS_H #define EXTENSIONS_HELPIDS_H +#include <rtl/ustring.hxx> + inline constexpr OStringLiteral HID_ABSPILOT_PREVIOUS = "EXTENSIONS_HID_ABSPILOT_PREVIOUS"; inline constexpr OStringLiteral HID_ABSPILOT_NEXT = "EXTENSIONS_HID_ABSPILOT_NEXT"; inline constexpr OStringLiteral HID_ABSPILOT_CANCEL = "EXTENSIONS_HID_ABSPILOT_CANCEL"; diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h index 5c0eb956f471..bad3d082de98 100644 --- a/extensions/inc/propctrlr.h +++ b/extensions/inc/propctrlr.h @@ -20,6 +20,8 @@ #ifndef EXTENSIONS_PROPCTRLR_H #define EXTENSIONS_PROPCTRLR_H +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral UID_PROP_DLG_FONT_TYPE = u"EXTENSIONS_UID_PROP_DLG_FONT_TYPE"; inline constexpr OUStringLiteral UID_PROP_DLG_IMAGE_URL = u"EXTENSIONS_UID_PROP_DLG_IMAGE_URL"; inline constexpr OUStringLiteral UID_PROP_DLG_BACKGROUNDCOLOR = u"EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR"; diff --git a/extensions/inc/showhide.hrc b/extensions/inc/showhide.hrc index 5f96170a71f9..226f8b48e8fd 100644 --- a/extensions/inc/showhide.hrc +++ b/extensions/inc/showhide.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC #define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) namespace { diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc index 2de092317cac..4c5a6ed75aca 100644 --- a/extensions/inc/stringarrays.hrc +++ b/extensions/inc/stringarrays.hrc @@ -20,6 +20,8 @@ #ifndef INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC #define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId RID_RSC_ENUM_VERTICAL_ALIGN[] = diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 09925e6c4ca4..b175fb78a5f9 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -28,9 +28,7 @@ #include <vcl/svapp.hxx> -#include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <vcl/weld.hxx> -#include <tools/debug.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::form; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index b5447af165ec..a6e6b20beeed 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -19,22 +19,18 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> +#include <com/sun/star/form/XBoundComponent.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <o3tl/safeint.hxx> #include <sal/log.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/event.hxx> #include <vcl/mnemonic.hxx> -#include <vcl/settings.hxx> #include "general.hxx" #include "bibresid.hxx" #include "datman.hxx" @@ -42,11 +38,7 @@ #include <strings.hrc> #include "bibmod.hxx" #include <helpids.h> -#include <tools/debug.hxx> -#include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> #include <algorithm> -#include <tools/urlobj.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/objsh.hxx> diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index ae8d587886ab..b4d981955891 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -21,15 +21,7 @@ #include <sal/config.h> -#include <string_view> - -#include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/form/XBoundComponent.hpp> -#include <com/sun/star/sdbc/XRowSetListener.hpp> - #include <vcl/InterimItemWindow.hxx> -#include <cppuhelper/implbase1.hxx> #include "bibshortcuthandler.hxx" diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index ef6c8b8559a1..8d32a1f4d205 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index a49f8de87c93..322ad7ab9ec7 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> -#include <rtl/ref.hxx> #include <map> diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx index 71e40a362562..b54fea5a645b 100644 --- a/extensions/source/logging/simpletextformatter.cxx +++ b/extensions/source/logging/simpletextformatter.cxx @@ -27,8 +27,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> - namespace logging { using css::logging::LogRecord; diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index a4fa97881085..08088e074f76 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include "controlfontdialog.hxx" #include <comphelper/propertyvalue.hxx> diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index c880f096b4b2..95d9eeb6aa99 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> #include <string_view> #include "eformshelper.hxx" diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 2ab06e8668de..4d9b68d8e974 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -24,11 +24,8 @@ #include <sal/config.h> -#include <string_view> - #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <comphelper/interfacecontainer3.hxx> namespace pcr diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx index 56e7bbbcde7f..3bb0a888c954 100644 --- a/extensions/source/propctrlr/pcrstrings.hxx +++ b/extensions/source/propctrlr/pcrstrings.hxx @@ -19,6 +19,7 @@ #pragma once +#include <rtl/ustring.hxx> namespace pcr { diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 5687d7a3861b..592557c2a315 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -21,7 +21,6 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -#include <rtl/string.hxx> #include <vector> diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index bd36d4994eb4..fabef68abf43 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include "selectlabeldialog.hxx" #include <strings.hrc> #include <bitmaps.hlst> @@ -37,7 +35,6 @@ #include <comphelper/types.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> -#include <rtl/ustrbuf.hxx> namespace pcr diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 6f7443700ec1..6a4462669090 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -33,11 +33,9 @@ #include <unotools/resmgr.hxx> #include <vcl/image.hxx> #include <vcl/menubarupdateicon.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/strings.hrc> -#include <rtl/ustrbuf.hxx> #include <bitmaps.hlst> diff --git a/filter/inc/strings.hxx b/filter/inc/strings.hxx index 5f2efaf37bca..eeeb161b9a92 100644 --- a/filter/inc/strings.hxx +++ b/filter/inc/strings.hxx @@ -9,6 +9,8 @@ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral STR_APPL_NAME_WRITER = u"%PRODUCTNAME Writer (.sxw)"; inline constexpr OUStringLiteral STR_APPL_NAME_CALC = u"%PRODUCTNAME Calc (.sxc)"; inline constexpr OUStringLiteral STR_APPL_NAME_IMPRESS = u"%PRODUCTNAME Impress (.sxi)"; diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 4caf8eea324a..659d6e696201 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <vector> #include <comphelper/sequenceashashmap.hxx> -#include <osl/mutex.hxx> namespace filter::config { diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index d5a9e53966c3..d033516733ac 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include "cacheitem.hxx" #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/multicontainer2.hxx> diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 6f72bf52fea8..86e6e6de985c 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -18,6 +18,8 @@ */ #pragma once +#include <rtl/ustring.hxx> + /* disable impl_loadOnDemand function of BaseContainer for certain functions, where it the feature "impl_loadItemOnDemand() of class FilterCache can be used instead of loadAll()!*/ diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index 89ce93e31bcf..64e63a750186 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -20,7 +20,6 @@ #include "bundles.hxx" -#include <memory> #include <string.h> void Bundle::SetColor( sal_uInt32 nColor ) diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index f13596184484..12e6e62be0a2 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -21,14 +21,14 @@ #include "eschesdo.hxx" #include <o3tl/any.hxx> #include <svx/svdobj.hxx> -#include <svx/unoapi.hxx> -#include <svx/unoshape.hxx> #include <tools/poly.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <tools/fract.hxx> #include <svx/fmdpage.hxx> #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/drawing/CircleKind.hpp> @@ -44,7 +44,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::text; using namespace ::com::sun::star::task; -using namespace ::com::sun::star::style; constexpr o3tl::Length geUnitsSrc(o3tl::Length::mm100); // PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 6ece40a69b10..cf46f49b6bee 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -19,7 +19,6 @@ #pragma once #include <filter/msfilter/escherex.hxx> #include <o3tl/any.hxx> -#include <o3tl/unit_conversion.hxx> // fractions of Draw PPTWriter etc. diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index f413af1db651..ee40bede6bd4 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/frame/XModel.hpp> #include <comphelper/servicehelper.hxx> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 9ab29d66458f..5dee2e32e509 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -24,7 +24,6 @@ #include <unotools/tempfile.hxx> #include <tools/diagnose_ex.h> #include <tools/UnitConversion.hxx> -#include <math.h> #include <editeng/eeitem.hxx> #include <editeng/editdata.hxx> #include <sot/storage.hxx> @@ -100,7 +99,6 @@ #include <editeng/brushitem.hxx> #include <editeng/langitem.hxx> #include <svx/svdoole2.hxx> -#include <svx/unoapi.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/drawing/XControlShape.hpp> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index e0168d954c05..170b2cf1437b 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -35,8 +35,6 @@ #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/drawing/RectanglePoint.hpp> #include <rtl/bootstrap.hxx> #include <svx/unopage.hxx> @@ -49,7 +47,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/lang.h> #include <svl/numformat.hxx> -#include <svl/zforlist.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 83f4a8c71159..6f4b1db3453b 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -21,7 +21,6 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/component.hxx> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 706148b9e126..6cfe82c30a2a 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -38,7 +38,6 @@ #include "LibXSLTTransformer.hxx" #include "OleHandler.hxx" -#include <memory> using namespace ::cppu; using namespace ::osl; diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 3ec4b56fb30e..bb2089935b32 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "OleHandler.hxx" -#include <memory> #include <optional> using namespace ::com::sun::star::uno; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index d449cee7ffd9..d22c372a72f5 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -63,7 +63,6 @@ #include <com/sun/star/util/XStringSubstitution.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/xml/xslt/XSLT2Transformer.hpp> #include <com/sun/star/xml/xslt/XSLTTransformer.hpp> diff --git a/forms/IwyuFilter_forms.yaml b/forms/IwyuFilter_forms.yaml index 51ae8148e320..cdc4d2cf066d 100644 --- a/forms/IwyuFilter_forms.yaml +++ b/forms/IwyuFilter_forms.yaml @@ -4,9 +4,11 @@ excludelist: forms/source/inc/property.hxx: # Needed for macro defines - frm_strings.hxx - - com/sun/star/beans/PropertyAttribute.hpp + forms/inc/strings.hrc: + # Needed for TranslateId macro + - unotools/resmgr.hxx forms/source/component/errorbroadcaster.hxx: - # + # Don't propose hxx -> h change in URE libs - cppuhelper/interfacecontainer.hxx forms/source/xforms/unohelper.hxx: # Needed for css shortcut diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 6ab64ec1798c..c3597da7d070 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -23,6 +23,7 @@ #include <services.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <comphelper/streamsection.hxx> diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index f82a49f7042c..fcfdabc53ae1 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -21,6 +21,8 @@ #include <property.hxx> #include <services.hxx> #include <comphelper/basicio.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> namespace frm diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 190af02c15c0..3453b15169ed 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -21,6 +21,7 @@ #include <property.hxx> #include <componenttools.hxx> #include "findpos.hxx" +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/form/XFormComponent.hpp> diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index c26b90f04778..7bf52797a98a 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -26,6 +26,7 @@ #include <strings.hrc> #include "BaseListBox.hxx" +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -34,7 +35,6 @@ #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> -#include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <unotools/sharedunocomponent.hxx> diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index fe3018659df8..e0eb2bddd19f 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -23,7 +23,9 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> #include <comphelper/types.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 873781f580ce..6ba5a380ee9c 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/awt/XTextComponent.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/DataSelectionType.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/TabulatorCycle.hpp> diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 35b2f3f7424b..764b9f732ecc 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -20,9 +20,11 @@ #include "Date.hxx" #include <property.hxx> #include <services.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <connectivity/dbconversion.hxx> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> using namespace dbtools; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 32d90aa7d87c..00b22a797b92 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -22,6 +22,7 @@ #include <property.hxx> #include <services.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/awt/XWindow.hpp> @@ -36,6 +37,7 @@ #include <comphelper/property.hxx> #include <comphelper/types.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index c18282a09d73..3f20bc90cc82 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -19,6 +19,7 @@ #include "File.hxx" +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <property.hxx> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 9c6459a0dd04..cc57cecf027a 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -22,8 +22,6 @@ #include <config_features.h> #include <config_fuzzers.h> -#include <string_view> - #include "Filter.hxx" #include <strings.hrc> #include <frm_resource.hxx> diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 46b1f52f828f..673c62d851d0 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XLoadable.hpp> @@ -43,7 +44,6 @@ #include <comphelper/basicio.hxx> #include <comphelper/guarding.hxx> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 432456802c4c..3ede69a641a0 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -28,13 +28,13 @@ #include <connectivity/dbconversion.hxx> #include <o3tl/any.hxx> #include <svl/numformat.hxx> -#include <svl/zforlist.hxx> #include <svl/numuno.hxx> #include <vcl/keycodes.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Date.hpp> diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index d09f03b4adfc..d3a0f3f68e5d 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -22,6 +22,7 @@ #include "Grid.hxx" #include <property.hxx> #include <services.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/text/WritingMode2.hpp> @@ -31,6 +32,7 @@ #include <comphelper/types.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star::uno; diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 092eeb773fe4..2bef53ca494f 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -23,6 +23,7 @@ #include <tools/debug.hxx> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 27c152035b41..57bbe396965d 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -18,11 +18,13 @@ */ #include "ImageButton.hxx" +#include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <comphelper/basicio.hxx> #include <com/sun/star/awt/MouseButton.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <property.hxx> #include <services.hxx> diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index af4c1e32f979..9f56265bee00 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/awt/PopupMenu.hpp> #include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/awt/PopupMenuDirection.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 12cd2be5f887..a4d579e92d42 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -28,6 +28,7 @@ #include "BaseListBox.hxx" #include <componenttools.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 41dea5c47e29..7ef40864787c 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -21,6 +21,8 @@ #include <services.hxx> #include <property.hxx> #include <comphelper/types.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> namespace frm diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 24e9ac10585d..6f315aa7b60d 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -20,6 +20,8 @@ #include "Pattern.hxx" #include <property.hxx> #include <services.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> using ::com::sun::star::uno::Reference; diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index e7829c39bc4c..8e686e10fda6 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -23,6 +23,8 @@ #include <services.hxx> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/form/FormComponentType.hpp> diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index fffcbd5466ed..fffccb83afbd 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -21,6 +21,8 @@ #include <property.hxx> #include <services.hxx> #include <connectivity/dbconversion.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/form/FormComponentType.hpp> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 3b9c1dd12499..c84ba34cfb95 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -41,7 +41,7 @@ #include <osl/mutex.hxx> #include <property.hxx> #include <services.hxx> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/property.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/types.hxx> diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 13abbf286423..96be7f44c642 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -28,6 +28,7 @@ #include <toolkit/helper/emptyfontdescriptor.hxx> #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> namespace frm diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index ba564141ab23..6209952b6a77 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -21,11 +21,13 @@ #include <property.hxx> #include <services.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> +#include <tools/debug.hxx> using namespace comphelper; diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index f5c77c707a99..af19ae139506 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -22,6 +22,7 @@ #include <property.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyExistException.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/NotRemoveableException.hpp> diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index afca400a78e3..85a6dd2ee765 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -21,8 +21,11 @@ #include <property.hxx> #include <comphelper/property.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/beans/PropertyAttribute.hpp> + #include <vector> diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 0bc5e0240900..897a1b9c806e 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -24,6 +24,8 @@ #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> #include <rtl/math.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> namespace frm diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 197497671860..3ae981350356 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -22,6 +22,8 @@ #include <comphelper/property.hxx> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> +#include <tools/debug.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <property.hxx> #include <services.hxx> diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index b99e4715c51d..e6879950a18b 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -23,9 +23,7 @@ #include <unordered_map> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/propagg.hxx> -#include <tools/debug.hxx> #include "frm_strings.hxx" diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index 3bc9fab75cdb..82a18ad6fb42 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -19,6 +19,7 @@ #pragma once +#include <rtl/ustring.hxx> inline constexpr OUStringLiteral VCL_CONTROL_LISTBOX = u"stardiv.vcl.control.ListBox"; inline constexpr OUStringLiteral VCL_CONTROL_COMBOBOX = u"stardiv.vcl.control.ComboBox"; diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 2dcfd7a18587..1f5037b62d71 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -25,15 +25,16 @@ #include <services.hxx> #include <com/sun/star/awt/LineEndFormat.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <comphelper/guarding.hxx> #include <comphelper/servicehelper.hxx> -#include <svl/itempool.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <editeng/editstat.hxx> #include <vcl/outdev.hxx> diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 948d526930f8..2dfab2d97eaa 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -21,7 +21,6 @@ #include "convert.hxx" #include <sstream> -#include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <tools/date.hxx> diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 72a9ffc1eee2..6114daeaf3dc 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/task/InteractionHandler.hpp> #include <tools/diagnose_ex.h> -#include <memory> - using namespace css::uno; using namespace css::ucb; using namespace css::task; diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index 071e527ea226..f49f6680451c 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -23,7 +23,6 @@ #include "submission_put.hxx" #include <comphelper/processfactory.hxx> -#include <osl/diagnose.h> #include <ucbhelper/content.hxx> #include <tools/diagnose_ex.h> diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc index ba09355ce284..111fafdedc88 100644 --- a/formula/inc/core_resource.hrc +++ b/formula/inc/core_resource.hrc @@ -21,6 +21,7 @@ #include <formula/compiler.hxx> #include <utility> +#include <unotools/resmgr.hxx> #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) diff --git a/formula/source/core/api/grammar.cxx b/formula/source/core/api/grammar.cxx index b43e5436093a..3974ee28d37e 100644 --- a/formula/source/core/api/grammar.cxx +++ b/formula/source/core/api/grammar.cxx @@ -18,7 +18,6 @@ */ #include <formula/grammar.hxx> -#include <tools/debug.hxx> #include <cassert> namespace formula { diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index dd4d4d32195a..64dccd911941 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -16,12 +16,10 @@ #include <fpicker/strings.hrc> #include <strings.hrc> #include <comphelper/docpasswordrequest.hxx> -#include <comphelper/stillreadwriteinteraction.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/PasswordContainer.hpp> #include <svtools/PlaceEditDialog.hxx> #include <tools/debug.hxx> -#include <ucbhelper/commandenvironment.hxx> #include <unotools/ucbhelper.hxx> #include <vcl/errinf.hxx> #include <officecfg/Office/Common.hxx> diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index d77fcda0edc1..3f9cad855509 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -28,7 +28,6 @@ #include <comphelper/processfactory.hxx> #include <ucbhelper/commandenvironment.hxx> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index 83fd40ac77f7..55f9435ffa51 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -19,6 +19,8 @@ #pragma once +#include <rtl/ustring.hxx> + namespace framework{ inline constexpr OUStringLiteral ATTRIBUTE_TYPE_CDATA = u"CDATA"; diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 1528c63c5b18..e8c9fff22da9 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/weakref.hxx> #include <vcl/window.hxx> namespace framework{ diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 30d87cc59336..bbadb7e71888 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -26,7 +26,6 @@ #include <string_view> #include <o3tl/string_view.hxx> -#include <rtl/ustring.hxx> namespace framework{ diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 0ccc056cf605..265daba7786e 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -21,8 +21,6 @@ #include <com/sun/star/awt/KeyEvent.hpp> -#include <rtl/ustring.hxx> - namespace framework{ /** diff --git a/framework/inc/targets.h b/framework/inc/targets.h index 5627a07cf2a5..9d7ffb9ef4d5 100644 --- a/framework/inc/targets.h +++ b/framework/inc/targets.h @@ -19,6 +19,8 @@ #pragma once +#include <rtl/ustring.hxx> + namespace framework{ // Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL() diff --git a/framework/inc/taskcreatordefs.hxx b/framework/inc/taskcreatordefs.hxx index e07c03d6dd2b..262de19f56fb 100644 --- a/framework/inc/taskcreatordefs.hxx +++ b/framework/inc/taskcreatordefs.hxx @@ -19,6 +19,8 @@ #pragma once +#include <rtl/ustring.hxx> + /// [XFrame] if it's set, it will be used as parent frame for the new created frame. inline constexpr OUStringLiteral ARGUMENT_PARENTFRAME = u"ParentFrame"; // XFrame diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 16d29a885db0..d04bc637a388 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -27,8 +27,6 @@ #include <rtl/ustring.hxx> #include <tools/long.hxx> -#include <memory> - namespace framework { class FontSizeMenuController final : public svt::PopupMenuControllerBase diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx index 4d2eaffd2a0a..399693044ec3 100644 --- a/framework/inc/xml/toolboxconfigurationdefines.hxx +++ b/framework/inc/xml/toolboxconfigurationdefines.hxx @@ -18,6 +18,8 @@ */ #pragma once +#include <rtl/ustring.hxx> + #define XMLNS_TOOLBAR "http://openoffice.org/2001/toolbar" #define XMLNS_XLINK "http://www.w3.org/1999/xlink" inline constexpr OUStringLiteral XMLNS_TOOLBAR_PREFIX = u"toolbar:"; diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 2764cff556ff..d82ace76f304 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -28,7 +28,6 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> -#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> namespace framework{ diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index fdacff5e3327..82f5d558f3be 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <toolkit/awt/vclxmenu.hxx> #include <tools/stream.hxx> -#include <comphelper/servicehelper.hxx> -#include <cppuhelper/weak.hxx> #include <vcl/dibtools.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index ac3a8d830cc4..740d98a753ec 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include <framework/titlehelper.hxx> #include <classes/fwkresid.hxx> #include <strings.hrc> @@ -38,7 +36,6 @@ #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> #include <tools/urlobj.hxx> -#include <vcl/skia/SkiaHelper.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index eb1542287d2b..c982267d834b 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <vcl/svapp.hxx> #include <vcl/status.hxx> #include <comphelper/attributelist.hxx> diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 57e28628273e..9efcc76db60c 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -30,8 +30,8 @@ #include <sal/config.h> #include <sal/macros.h> -#include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/attributelist.hxx> diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 33a722a725eb..b113c4b96f6d 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/frame/FrameAction.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 556d59dbb581..40487c83b88f 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -21,8 +21,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/XUpdatable.hpp> -#include <osl/mutex.hxx> -#include <osl/time.h> #include <helper/wakeupthread.hxx> #include <chrono> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 107ce2e2afa5..e63c13073a90 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -96,8 +96,6 @@ #include <officecfg/Office/Recovery.hxx> #include <officecfg/Setup.hxx> -#include <stdtypes.h> - using namespace css::uno; using namespace css::document; using namespace css::frame; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index fde9da72234a..a1e0e745cf54 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -37,7 +37,6 @@ #include <pattern/window.hxx> #include <properties.h> -#include <stdtypes.h> #include <targets.h> #include <com/sun/star/awt/Toolkit.hpp> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index fd18bb9b7c06..c60e7d3c1dd2 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -39,7 +39,6 @@ #include <vcl/graph.hxx> #include <vcl/svapp.hxx> #include <o3tl/enumrange.hxx> -#include <osl/mutex.hxx> #include <comphelper/sequence.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/filter/PngImageReader.hxx> diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index d44f4a45d418..b3b443b99d5c 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/embed/StorageWrappedTargetException.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XStream.hpp> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index a656a9b3846f..2c31081bbe6b 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -32,8 +32,6 @@ #include <vcl/image.hxx> #include <svtools/popupmenucontrollerbase.hxx> #include <osl/mutex.hxx> -#include <memory> -#include <string_view> #include <unordered_map> #include <classes/fwkresid.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 5dfdb4cb7f72..c0dd19e2e71a 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <toolkit/awt/vclxmenu.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx index efc7f76204f6..fb7f3175ae5d 100644 --- a/framework/source/uielement/thesaurusmenucontroller.cxx +++ b/framework/source/uielement/thesaurusmenucontroller.cxx @@ -23,7 +23,7 @@ #include <sal/log.hxx> #include <svl/lngmisc.hxx> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> +#include <tools/diagnose_ex.h> #include <unotools/lingucfg.hxx> #include <vcl/commandinfoprovider.hxx> diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 0a52ac084ccb..0bc41af3e05c 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -30,11 +30,9 @@ #include <vcl/svapp.hxx> #include <vcl/EnumContext.hxx> #include <rtl/ustrbuf.hxx> -#include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/types.hxx> -#include <svtools/miscopt.hxx> #include <unotools/confignode.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 5ac74c19ea86..73e3689e4714 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -44,15 +44,12 @@ #include <comphelper/propertyvalue.hxx> #include <officecfg/Office/Common.hxx> #include <vcl/svapp.hxx> -#include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> #include <rtl/ustrbuf.hxx> -#include <sal/log.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <unotools/cmdoptions.hxx> -#include <svtools/miscopt.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/syslocale.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 399f2e50872d..655cf1843491 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index ea31cd6b1d0d..ad6bc7259a4a 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -27,8 +27,6 @@ #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/KeyEvent.hpp> -#include <rtl/ustrbuf.hxx> - namespace framework{ /* Throws a SaxException in case a wrong formatted XML diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 6092d40d5b54..19d09ce97993 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -25,7 +25,6 @@ #include <acceleratorconst.h> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <comphelper/attributelist.hxx> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 2c0716d8eb47..30f178416cae 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> -#include <vcl/svapp.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/attributelist.hxx> |