diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-02-01 22:47:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-14 10:55:43 +0100 |
| commit | f0c8312bc6630ed64f174acc6f65bb5172765951 (patch) | |
| tree | d7441b13c6872b626b34c913b2cf73330f6bbb52 | |
| parent | 1b0397a519bf6923c2dae7919d73c0662d2da2af (diff) | |
tdf#42949 Fix IWYU warnings in forms/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I4afb3616c4f93155c187da11b2981b84d0984e9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87943
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
115 files changed, 183 insertions, 312 deletions
diff --git a/forms/IwyuFilter_forms.yaml b/forms/IwyuFilter_forms.yaml new file mode 100644 index 000000000000..309c0d6d3da3 --- /dev/null +++ b/forms/IwyuFilter_forms.yaml @@ -0,0 +1,67 @@ +--- +assumeFilename: forms/source/component/DatabaseForm.cxx +blacklist: + forms/source/inc/property.hxx: + # Needed for macro defines + - frm_strings.hxx + - com/sun/star/beans/PropertyAttribute.hpp + forms/source/component/errorbroadcaster.hxx: + # + - cppuhelper/interfacecontainer.hxx + forms/source/xforms/unohelper.hxx: + # Needed for css shortcut + - sal/types.h + forms/source/xforms/datatypes.hxx: + # Needed for macro defines + - com/sun/star/beans/PropertyAttribute.hpp + forms/source/xforms/propertysetbase.hxx: + # Needed for macro defines + - com/sun/star/beans/PropertyAttribute.hpp + forms/source/component/DatabaseForm.cxx: + # Actually used + - com/sun/star/io/XObjectInputStream.hpp + - com/sun/star/io/XObjectOutputStream.hpp + - tools/datetime.hxx + forms/source/component/imgprod.cxx: + # Actually used + - com/sun/star/io/XInputStream.hpp + forms/source/richtext/parametrizedattributedispatcher.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + forms/source/richtext/richtextunowrapper.cxx: + # Needed for UnoType template instatiation + - com/sun/star/lang/Locale.hpp + # Needed for macro defines to work + - editeng/unoprnms.hxx + forms/source/solar/component/navbarcontrol.cxx: + # Actually used + - com/sun/star/awt/XControlModel.hpp + forms/source/xforms/binding.cxx: + # Actually used + - com/sun/star/xml/dom/XNodeList.hpp + - com/sun/star/xml/dom/events/XEventListener.hpp + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/container/XNameContainer.hpp + forms/source/xforms/enumeration.cxx: + # Actually used + - com/sun/star/container/XIndexAccess.hpp + - com/sun/star/uno/Any.hxx + forms/source/xforms/pathexpression.cxx: + # Actually used + - com/sun/star/xml/dom/XNode.hpp + - com/sun/star/xml/dom/XNodeList.hpp + forms/source/xforms/propertysetbase.cxx: + # Actually used + - com/sun/star/uno/Reference.hxx + forms/source/xforms/submission.cxx: + # Actually used + - com/sun/star/xforms/XModel.hpp + - com/sun/star/xml/dom/XDocumentFragment.hpp + - com/sun/star/task/XInteractionHandler.hpp + forms/source/xforms/unohelper.cxx: + # Actually used + - com/sun/star/uno/Reference.hxx + - com/sun/star/beans/XPropertySet.hpp + forms/source/xforms/submission/serialization_urlencoded.cxx: + # Actually used + - com/sun/star/xml/dom/XNode.hpp diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx index 3acaed7c37b9..ec3b11510307 100644 --- a/forms/source/component/BaseListBox.hxx +++ b/forms/source/component/BaseListBox.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX #define INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX +#include <sal/types.h> + namespace frm { diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index ffa29b1bb6ce..0044068c13b3 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -19,8 +19,11 @@ #include "Button.hxx" +#include <property.hxx> +#include <services.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> @@ -39,7 +42,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 1966a53fab06..c91c903e0df5 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -21,13 +21,13 @@ #include <property.hxx> #include <services.hxx> #include <comphelper/basicio.hxx> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 23674e1fafe5..234431affdf4 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include "Columns.hxx" #include <property.hxx> #include <componenttools.hxx> #include "findpos.hxx" #include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -37,7 +33,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> #include <services.hxx> -#include <strings.hrc> #include <tools/debug.hxx> #include <o3tl/sorted_vector.hxx> diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index c24ca8a013de..010252615930 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -20,7 +20,6 @@ #pragma once #include <cloneable.hxx> -#include <frm_strings.hxx> #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> @@ -33,7 +32,6 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> -#include <cppuhelper/component.hxx> using namespace comphelper; diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index dc9e93b4aa30..475ca63bec01 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -26,22 +26,14 @@ #include <strings.hrc> #include "BaseListBox.hxx" -#include <com/sun/star/sdb/SQLErrorEvent.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#include <com/sun/star/sdb/XQueriesSupplier.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> -#include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> -#include <connectivity/dbconversion.hxx> -#include <cppuhelper/queryinterface.hxx> #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 408b5b64e54f..3fc0240d9483 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -26,18 +26,10 @@ #include "entrylisthelper.hxx" #include "cachedrowset.hxx" -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> #include <com/sun/star/form/ListSourceType.hpp> -#include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> #include <connectivity/formattedcolumnvalue.hxx> -#include <cppuhelper/interfacecontainer.hxx> - -#include <vcl/timer.hxx> - namespace frm { diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 57f712b72f05..e39a5e8c419d 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -18,11 +18,12 @@ */ #include "Currency.hxx" +#include <property.hxx> #include <services.hxx> #include <unotools/localedatawrapper.hxx> -#include <vcl/svapp.hxx> #include <unotools/syslocale.hxx> #include <comphelper/types.hxx> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm @@ -31,7 +32,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 5ffb57f11678..b2b8f7e3eade 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -41,15 +41,12 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/RowSetVetoException.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdb/XColumnUpdate.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XModifiable2.hpp> @@ -76,8 +73,6 @@ #include <vcl/timer.hxx> #include <osl/mutex.hxx> -#include <unordered_map> - using namespace ::dbtools; using namespace ::comphelper; using namespace ::com::sun::star::uno; diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 3f347f0527b7..383d537b2efe 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -24,9 +24,7 @@ #include <vector> #include <propertybaghelper.hxx> -#include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/sdb/XSQLErrorListener.hpp> -#include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> #include <com/sun/star/form/FormSubmitMethod.hpp> #include <com/sun/star/form/FormSubmitEncoding.hpp> @@ -45,7 +43,6 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> -#include <com/sun/star/sdb/XResultSetAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index c20011374243..495c95deb8cf 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -18,11 +18,12 @@ */ #include "Date.hxx" +#include <property.hxx> #include <services.hxx> -#include <tools/date.hxx> #include <tools/diagnose_ex.h> #include <connectivity/dbconversion.hxx> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/form/FormComponentType.hpp> using namespace dbtools; @@ -34,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index ff2d9d869e96..688f846730fb 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -19,22 +19,20 @@ #include "Edit.hxx" +#include <property.hxx> +#include <services.hxx> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/form/XSubmit.hpp> #include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <vcl/svapp.hxx> #include <vcl/keycodes.hxx> -#include <tools/wintypes.hxx> -#include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <connectivity/dbconversion.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> @@ -48,7 +46,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index a19d6b93a09a..998a44aacf55 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -25,6 +25,8 @@ #include <tools/link.hxx> #include <cppuhelper/implbase3.hxx> +#include <com/sun/star/form/XChangeBroadcaster.hpp> + namespace dbtools { class FormattedColumnValue; } struct ImplSVEvent; diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 58b769d40522..80e8d245c95d 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -19,16 +19,13 @@ #include "EditBase.hxx" #include <property.hxx> -#include <services.hxx> #include <tools/debug.hxx> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> -#include <cppuhelper/queryinterface.hxx> -#include <frm_resource.hxx> -#include <strings.hrc> #include <tools/time.hxx> #include <tools/date.hxx> +#include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/Date.hpp> @@ -39,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 2cf9377d541b..67e88a433b27 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -20,13 +20,6 @@ #pragma once #include <FormComponent.hxx> -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XKeyListener.hpp> -#include <com/sun/star/form/XChangeBroadcaster.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XComponent.hpp> // persistence flags for use with the version id #define PF_HANDLE_COMMON_PROPS 0x8000 diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index cf7b73b9c794..be9e9696734e 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/awt/XControl.hpp> #include <osl/thread.hxx> #include <osl/conditn.hxx> diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index d8ac1a80ecbf..e92f168d3de3 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -21,12 +21,15 @@ #include <com/sun/star/form/FormComponentType.hpp> +#include <property.hxx> #include <services.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> +using namespace comphelper; + namespace frm { @@ -34,7 +37,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index af002b13ed58..47095670b6cc 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -19,14 +19,14 @@ #include <sal/config.h> +#include <config_features.h> + #include <string_view> #include "Filter.hxx" -#include <FormComponent.hxx> #include <strings.hrc> #include <frm_resource.hxx> -#include <property.hxx> -#include <services.hxx> +#include <frm_strings.hxx> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/XCheckBox.hpp> @@ -35,16 +35,13 @@ #include <com/sun/star/awt/XRadioButton.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/sdb/BooleanComparisonMode.hpp> #include <com/sun/star/sdb/ErrorMessageDialog.hpp> -#include <com/sun/star/sdb/XColumn.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -55,17 +52,13 @@ #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> #include <connectivity/predicateinput.hxx> #include <o3tl/safeint.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> -#include <unotools/localedatawrapper.hxx> -#include <vcl/stdtext.hxx> -#include <vcl/svapp.hxx> -#include <tools/wintypes.hxx> +#include <tools/gen.hxx> namespace frm diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 453e9c52f7bd..ed05f01f27e4 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -20,21 +20,19 @@ #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX #define INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX -#include <config_features.h> - -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/form/XBoundComponent.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/sdb/SQLContext.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <cppuhelper/implbase5.hxx> #include <comphelper/uno3.hxx> -#include <connectivity/sqlparse.hxx> #include <svx/ParseContext.hxx> #include <unordered_map> diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 0dcf18a7629c..67fa5288ef75 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -18,8 +18,10 @@ */ #include "FixedText.hxx" +#include <frm_strings.hxx> #include <services.hxx> -#include <property.hxx> + +#include <com/sun/star/form/FormComponentType.hpp> #include <comphelper/property.hxx> @@ -29,7 +31,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; @@ -37,7 +38,7 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - +using namespace comphelper; OFixedTextModel::OFixedTextModel( const Reference<XComponentContext>& _rxFactory ) :OControlModel(_rxFactory, VCL_CONTROLMODEL_FIXEDTEXT) diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index d683be633284..669bf071a06c 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -20,11 +20,12 @@ #include <FormComponent.hxx> #include <strings.hrc> #include <frm_resource.hxx> +#include <property.hxx> #include <services.hxx> #include <com/sun/star/awt/XTextComponent.hpp> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/form/binding/IncompatibleTypesException.hpp> @@ -46,14 +47,11 @@ #include <comphelper/property.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> -#include <toolkit/helper/emptyfontdescriptor.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <functional> #include <algorithm> namespace frm diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 8788cde414b6..54aa650cb8fc 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -19,8 +19,6 @@ #include "FormattedField.hxx" #include <services.hxx> #include <property.hxx> -#include <frm_resource.hxx> -#include <strings.hrc> #include <propertybaghelper.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> @@ -31,13 +29,11 @@ #include <o3tl/any.hxx> #include <svl/zforlist.hxx> #include <svl/numuno.hxx> -#include <vcl/keycod.hxx> +#include <vcl/keycodes.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/debug.hxx> -#include <tools/wintypes.hxx> #include <i18nlangtag/languagetag.hxx> -#include <rtl/textenc.h> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Date.hpp> @@ -45,9 +41,7 @@ #include <com/sun/star/awt/MouseEvent.hpp> #include <com/sun/star/form/XSubmit.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XKeyListener.hpp> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index d0f1394f59be..78b0367d92b0 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -25,6 +25,8 @@ #include <cppuhelper/implbase1.hxx> #include "errorbroadcaster.hxx" +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> + struct ImplSVEvent; namespace frm diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index b434e1bd2e84..02aab9b1a245 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -20,7 +20,6 @@ #include "FormattedFieldWrapper.hxx" #include "Edit.hxx" #include "FormattedField.hxx" -#include "EditBase.hxx" #include <services.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> @@ -29,7 +28,9 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> +#include <com/sun/star/io/XMarkableStream.hpp> +using namespace comphelper; using namespace frm; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 77e196d5855f..1ef0d2d0f761 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -20,10 +20,13 @@ #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX #define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX -#include <FormComponent.hxx> +#include <comphelper/uno3.hxx> #include <cppuhelper/implbase3.hxx> +#include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <rtl/ref.hxx> namespace frm { diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index 2b2b52c2545d..e213b31e49d2 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -18,7 +18,6 @@ */ #include "FormsCollection.hxx" -#include <services.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 33ed91ec739e..40241149738d 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -17,22 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - #include "Columns.hxx" #include "findpos.hxx" #include "Grid.hxx" #include <property.hxx> #include <services.hxx> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/form/XForm.hpp> -#include <com/sun/star/form/XLoadable.hpp> +#include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> -#include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> @@ -43,7 +39,6 @@ namespace frm using namespace ::com::sun::star; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index ae63722286d8..1f57b32fef69 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -26,7 +26,6 @@ #include <InterfaceContainer.hxx> #include <com/sun/star/form/XGridColumnFactory.hpp> -#include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/sdb/XRowSetSupplier.hpp> #include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 8e620e3bafc7..25c353a0bceb 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -18,10 +18,11 @@ */ #include "GroupBox.hxx" -#include <property.hxx> +#include <frm_strings.hxx> #include <services.hxx> #include <comphelper/property.hxx> #include <tools/debug.hxx> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm { @@ -29,7 +30,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; @@ -37,7 +37,7 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - +using namespace comphelper; // OGroupBoxModel diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 56a16e57359d..deec1bcd572c 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -18,13 +18,11 @@ */ #include "GroupManager.hxx" -#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> -#include <tools/solar.h> #include <frm_strings.hxx> @@ -33,7 +31,6 @@ namespace frm { using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index 51d1e9e16e98..10ce1fc8f173 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX #define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX -#include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> @@ -28,7 +27,6 @@ #include <com/sun/star/container/XContainer.hpp> #include <cppuhelper/implbase.hxx> -#include <algorithm> #include <map> #include <memory> #include <vector> diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index ba73b5c120bc..ff19660cda3c 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/form/FormComponentType.hpp> namespace frm @@ -30,7 +31,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 63cf27fca416..ef3fda257123 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -23,6 +23,9 @@ #include <osl/mutex.hxx> #include <comphelper/basicio.hxx> #include <com/sun/star/awt/MouseButton.hpp> +#include <com/sun/star/form/FormComponentType.hpp> +#include <property.hxx> +#include <services.hxx> namespace frm { @@ -31,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 12d44e59e963..af19376db1cc 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -21,26 +21,22 @@ #include <strings.hrc> #include <frm_resource.hxx> +#include <property.hxx> #include <services.hxx> #include <componenttools.hxx> #include <svtools/imageresourceaccess.hxx> #include <sfx2/filedlghelper.hxx> -#include <toolkit/helper/vclunohelper.hxx> #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/form/FormComponentType.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> -#include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XDialog.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/io/NotConnectedException.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/GraphicObject.hpp> #include <tools/urlobj.hxx> @@ -49,7 +45,6 @@ #include <tools/diagnose_ex.h> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#include <vcl/window.hxx> #include <unotools/streamhelper.hxx> #include <comphelper/guarding.hxx> #include <comphelper/property.hxx> @@ -70,7 +65,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a578ac489e50..749f10e83bc5 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -25,19 +25,13 @@ #include <frm_resource.hxx> #include <strings.hrc> #include "BaseListBox.hxx" -#include <listenercontainers.hxx> #include <componenttools.hxx> -#include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdb/CommandType.hpp> #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> @@ -46,20 +40,18 @@ #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <connectivity/dbconversion.hxx> -#include <cppuhelper/queryinterface.hxx> #include <o3tl/any.hxx> #include <o3tl/safeint.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <unotools/sharedunocomponent.hxx> -#include <vcl/svapp.hxx> #include <o3tl/optional.hxx> #include <algorithm> #include <iterator> +#include <climits> namespace frm { diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index bd9d7aac6c43..c0ad179d39f5 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -25,24 +25,22 @@ #include "errorbroadcaster.hxx" #include "entrylisthelper.hxx" -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/awt/XItemListener.hpp> #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XListBox.hpp> #include <com/sun/star/form/XChangeBroadcaster.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/asyncnotification.hxx> #include <connectivity/FValue.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/implbase4.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vector> +using namespace comphelper; + /** ListBox is a bit confusing / different from other form components, so here are a few notes: diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 3aa5f14343f5..9fb87e0b4695 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -18,7 +18,10 @@ */ #include "Numeric.hxx" +#include <services.hxx> +#include <property.hxx> #include <comphelper/types.hxx> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm { @@ -26,7 +29,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 739b93b8d213..129bbd3753f7 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -18,6 +18,9 @@ */ #include "Pattern.hxx" +#include <property.hxx> +#include <services.hxx> +#include <com/sun/star/form/FormComponentType.hpp> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 0983da167967..fffd230fbed8 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -24,14 +24,13 @@ #include <comphelper/basicio.hxx> #include <comphelper/property.hxx> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 85ccbaaf425b..3a6dbfca3b32 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -18,10 +18,12 @@ */ #include "Time.hxx" -#include <tools/time.hxx> +#include <property.hxx> +#include <services.hxx> #include <connectivity/dbconversion.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/form/FormComponentType.hpp> using namespace dbtools; @@ -32,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx index 2ff4802967ce..f18246a4c177 100644 --- a/forms/source/component/cachedrowset.cxx +++ b/forms/source/component/cachedrowset.cxx @@ -19,7 +19,6 @@ #include "cachedrowset.hxx" -#include <services.hxx> #include <frm_strings.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index 9e61e57596e0..f87ee2c07df3 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <unotools/sharedunocomponent.hxx> - #include <memory> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 4fc7087cd25d..e606ea2f549e 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -22,8 +22,6 @@ #include <urltransformer.hxx> #include <componenttools.hxx> #include <com/sun/star/form/XSubmit.hpp> -#include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -41,6 +39,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <osl/mutex.hxx> +#include <property.hxx> #include <services.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/property.hxx> @@ -57,7 +56,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; 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::form; diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 55ecd7969f8c..58f2369fcbcc 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/form/binding/XListEntryListener.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <cppuhelper/implbase3.hxx> #include <comphelper/interfacecontainer2.hxx> diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index d02650d2337e..16e362865c7b 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -19,7 +19,6 @@ #include "errorbroadcaster.hxx" #include <connectivity/dbtools.hxx> -#include <com/sun/star/sdb/SQLContext.hpp> #include <sal/log.hxx> diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx index 02d63f7bce38..6b2503ac0bcc 100644 --- a/forms/source/component/findpos.cxx +++ b/forms/source/component/findpos.cxx @@ -22,7 +22,6 @@ #include "findpos.hxx" -#include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 848b2ce0629b..e95ce18fc1b9 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -18,7 +18,6 @@ */ #include "imgprod.hxx" -#include <services.hxx> #include <osl/diagnose.h> #include <tools/debug.hxx> @@ -26,10 +25,9 @@ #include <vcl/cvtgrf.hxx> #include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <vcl/graphicfilter.hxx> #include <cppuhelper/queryinterface.hxx> +#include <com/sun/star/awt/ImageStatus.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/imageresourceaccess.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 2c0fed6e2c44..6b53d58d0e71 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX #include <tools/link.hxx> -#include <com/sun/star/awt/ImageStatus.hpp> #include <com/sun/star/awt/XImageConsumer.hpp> #include <com/sun/star/awt/XImageProducer.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 36893eaf1624..3d602d2abfa0 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -18,12 +18,17 @@ */ #include "navigationbar.hxx" +#include <property.hxx> +#include <services.hxx> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> +using namespace comphelper; + namespace frm { diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index e9ebb688c402..f393a046f542 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -21,16 +21,12 @@ #define INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX #include <FormComponent.hxx> -#include <com/sun/star/io/XPersistObject.hpp> #include <comphelper/propertycontainerhelper.hxx> #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <com/sun/star/container/XSet.hpp> -#include <com/sun/star/container/XContainer.hpp> #include <formcontrolfont.hxx> -#include <set> +using namespace comphelper; namespace frm { diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 6ffe38ac0786..134cfe6e2b10 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -30,7 +30,6 @@ #include <tools/diagnose_ex.h> #include <comphelper/sequence.hxx> -#include <rtl/instance.hxx> #define NEW_HANDLE_BASE 10000 diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index a4d8cb6561b2..559d3bd86543 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -18,6 +18,7 @@ */ #include "refvaluecomponent.hxx" +#include <property.hxx> #include <comphelper/property.hxx> #include <tools/diagnose_ex.h> diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index b478a58c69e2..6520ce235f31 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -18,10 +18,13 @@ */ #include "scrollbar.hxx" +#include <property.hxx> +#include <services.hxx> #include <comphelper/property.hxx> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> #include <rtl/math.hxx> +#include <com/sun/star/form/FormComponentType.hpp> namespace frm { diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index d9504a55b616..db45651ab8a9 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -22,6 +22,9 @@ #include <comphelper/property.hxx> #include <comphelper/streamsection.hxx> #include <comphelper/basicio.hxx> +#include <com/sun/star/form/FormComponentType.hpp> +#include <property.hxx> +#include <services.hxx> namespace frm diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 66ec3aed8aff..09fdb0658c3b 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -21,19 +21,15 @@ #define INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX #include "cloneable.hxx" -#include "property.hxx" #include "propertybaghelper.hxx" #include "resettable.hxx" -#include "services.hxx" #include "windowstateguard.hxx" #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/form/binding/XBindableValue.hpp> -#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> #include <com/sun/star/form/validation/XValidityConstraintListener.hpp> #include <com/sun/star/form/XBoundComponent.hpp> @@ -41,17 +37,13 @@ #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/XLoadListener.hpp> #include <com/sun/star/form/XReset.hpp> -#include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdb/XColumnUpdate.hpp> #include <com/sun/star/sdb/XRowSetChangeListener.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XCloneable.hpp> @@ -59,7 +51,6 @@ #include <com/sun/star/form/XLoadable.hpp> #include <comphelper/propagg.hxx> -#include <comphelper/propertybag.hxx> #include <comphelper/propmultiplex.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/component.hxx> @@ -68,6 +59,7 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase7.hxx> +#include <cppuhelper/propshlp.hxx> #include <osl/mutex.hxx> #include <rtl/ustring.hxx> @@ -311,7 +303,7 @@ typedef ::cppu::ImplHelper7 < css::form::XFormComponent > OControlModel_BASE; class OControlModel :public ::cppu::OComponentHelper - ,public OPropertySetAggregationHelper + ,public comphelper::OPropertySetAggregationHelper ,public OControlModel_BASE ,public OCloneableAggregation ,public IPropertyBagHelperContext diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 4266d74bdb4c..4e3c1326ca72 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX #include <comphelper/uno3.hxx> -#include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/io/XPersistObject.hpp> @@ -32,11 +29,9 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> -#include <com/sun/star/script/ScriptEvent.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <osl/mutex.hxx> diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index 3c9bce2ac4d9..294d777dc0d4 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -20,12 +20,13 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX #define INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <memory> +#include "urltransformer.hxx" + namespace frm { diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx index 9ab1d74e858b..12fbe44ff5fd 100644 --- a/forms/source/inc/featuredispatcher.hxx +++ b/forms/source/inc/featuredispatcher.hxx @@ -21,6 +21,7 @@ #define INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX #include <rtl/ustring.hxx> +#include <com/sun/star/uno/Any.hxx> namespace frm diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index 5e4a49aae5a8..b6d9ea55d1a2 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX #define INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX -#include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <tools/color.hxx> namespace cppu { diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index c052473deb76..5a25dd89667e 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -22,9 +22,7 @@ #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <cppuhelper/implbase2.hxx> #include "featuredispatcher.hxx" #include <vector> diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 2910c01ef17b..9e20636fc2ae 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX #define INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX -#include <sal/types.h> -#include <rtl/ustring.hxx> - namespace frm { diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 430d574833f1..d4d3aecd2231 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -24,13 +24,12 @@ #include <unordered_map> -#include <com/sun/star/uno/XAggregation.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <cppuhelper/propshlp.hxx> #include <comphelper/propagg.hxx> #include <tools/debug.hxx> +#include "frm_strings.hxx" + using namespace comphelper; //= property helper classes diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index 25cc3822c2f9..8a3312b30fae 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX #define INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX -#include <rtl/ustring.hxx> -#include "frm_strings.hxx" - #define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField" #define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit" diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index 18a872ea9d93..3db4d79ca560 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index c318b936d8af..a30c40859dfc 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -20,15 +20,16 @@ #include <strings.hrc> #include <frm_resource.hxx> +#include <frm_strings.hxx> #include <InterfaceContainer.hxx> #include <componenttools.hxx> #include <services.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -42,7 +43,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 0814e5fbee2e..3ee26ec5f2a7 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -18,7 +18,6 @@ */ #include <limitedformats.hxx> -#include <services.hxx> #include <osl/diagnose.h> #include <comphelper/types.hxx> #include <comphelper/extract.hxx> diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index f60699c172e2..b0aee41fc379 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -18,12 +18,12 @@ */ #include "parametrizedattributedispatcher.hxx" +#include <editeng/editids.hrc> #include <editeng/editview.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <osl/diagnose.h> -#include <svx/svxids.hrc> #include <sfx2/sfxuno.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 810d8e50c860..4cf1f3912f89 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -18,6 +18,7 @@ */ #include "richtextcontrol.hxx" +#include <frm_strings.hxx> #include <services.hxx> #include "richtextmodel.hxx" @@ -29,6 +30,7 @@ #include <com/sun/star/awt/PosSize.hpp> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 94aa8ce54e7c..d79d4c0c74d0 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -23,14 +23,13 @@ #include <toolkit/controls/unocontrols.hxx> #include <toolkit/awt/vclxwindow.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> #include <tools/wintypes.hxx> #include "rtattributes.hxx" -#include "attributedispatcher.hxx" +#include "textattributelistener.hxx" #include <map> diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index bf64e94d48a8..437c9abee25e 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -30,7 +30,6 @@ #include <vcl/outdev.hxx> #include <vcl/settings.hxx> #include <unotools/lingucfg.hxx> -#include <svl/undo.hxx> #include <osl/diagnose.h> #include <algorithm> diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 844ba9d6e119..0634c57f9661 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -23,18 +23,14 @@ #include <sal/log.hxx> #include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> -#include <editeng/editeng.hxx> +#include <editeng/editids.hrc> #include <editeng/editview.hxx> -#include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> -#include <svx/svxids.hrc> #include <editeng/scripttypeitem.hxx> -#include <editeng/editobj.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <tools/mapunit.hxx> -#include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 866b62ae9484..cd00e8032997 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -21,7 +21,11 @@ #include "richtextengine.hxx" #include "richtextunowrapper.hxx" +#include <property.hxx> +#include <services.hxx> + #include <com/sun/star/awt/LineEndFormat.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 2da3bca4f76a..492b08134d20 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -19,21 +19,15 @@ #include "richtextvclcontrol.hxx" #include "richtextimplcontrol.hxx" -#include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <svl/languageoptions.hxx> #if OSL_DEBUG_LEVEL > 0 #include <unotools/ucbstreamhelper.hxx> #include <sfx2/filedlghelper.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #endif -#include <editeng/scripttypeitem.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/fhgtitem.hxx> #include <editeng/editids.hrc> #include <svx/svxids.hrc> #include <osl/diagnose.h> diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 322856619278..9f34f74dc7e7 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -20,8 +20,6 @@ #define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX #include <vcl/ctrl.hxx> -#include <vcl/toolbox.hxx> -#include <com/sun/star/awt/FontDescriptor.hpp> #include "rtattributes.hxx" #include "textattributelistener.hxx" #include <memory> diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index a45ccca5a502..9617cde6f048 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -19,8 +19,8 @@ #include "specialdispatchers.hxx" #include <editeng/editeng.hxx> +#include <editeng/editids.hrc> #include <editeng/editview.hxx> -#include <svx/svxids.hrc> #include <editeng/scriptspaceitem.hxx> #include <osl/diagnose.h> diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 1d89e1e2958e..90208a556463 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -23,12 +23,10 @@ #include <frm_strings.hxx> #include <frm_resource.hxx> #include <strings.hrc> -#include <services.hxx> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/form/runtime/FormFeature.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/awt/XControl.hpp> @@ -41,7 +39,6 @@ #include <com/sun/star/sdb/RowChangeAction.hpp> #include <com/sun/star/sdb/OrderDialog.hpp> #include <com/sun/star/sdb/FilterDialog.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> @@ -60,7 +57,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> -#include <sal/macros.h> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 1e948953cf32..fcac2220608d 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -22,13 +22,10 @@ #include <com/sun/star/form/runtime/XFormOperations.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index c2fc4485a446..b76460d9edbc 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -20,16 +20,15 @@ #include "navbarcontrol.hxx" #include <frm_strings.hxx> -#include <FormComponent.hxx> #include <componenttools.hxx> #include <navtoolbar.hxx> #include <commandimageprovider.hxx> #include <com/sun/star/awt/XView.hpp> #include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/form/runtime/FormFeature.hpp> #include <com/sun/star/awt/XControlModel.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <tools/debug.hxx> diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index bab88d1076a5..f7acd35ed990 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -28,7 +28,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -#include <tools/wintypes.hxx> namespace frm diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index d5d980e1b3e6..d361aa0a94c5 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -30,6 +30,7 @@ #include <vcl/event.hxx> #include <vcl/fixed.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/toolbox.hxx> #include <sal/macros.h> #include <osl/diagnose.h> diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 1018ff6e16b3..5b643b367ce1 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX #define INCLUDED_FORMS_SOURCE_SOLAR_INC_NAVTOOLBAR_HXX -#include <vcl/toolbox.hxx> #include <vcl/field.hxx> #include <memory> diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index 8a7a89e445c1..76e6449a3b84 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -27,9 +27,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Type.hxx> #include <osl/diagnose.h> diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index a87c6b47596f..5c2287edfebc 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -28,6 +28,7 @@ #include "resourcehelper.hxx" #include "xmlhelper.hxx" #include "xformsevent.hxx" +#include <strings.hrc> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> @@ -47,12 +48,10 @@ #include <com/sun/star/xml/dom/NodeType.hpp> #include <com/sun/star/xml/dom/events/XEventTarget.hpp> #include <com/sun/star/xml/dom/events/XEventListener.hpp> -#include <com/sun/star/xml/dom/events/XDocumentEvent.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <unotools/textsearch.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 3ffc1f7e3e2e..410b09e29b6e 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -23,6 +23,7 @@ #include "enumeration.hxx" #include <cppuhelper/implbase.hxx> +#include <osl/diagnose.h> #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XEnumeration.hpp> @@ -32,13 +33,10 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Type.hxx> #include <vector> -#include <algorithm> typedef cppu::WeakImplHelper< diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 11bcc82278f4..633492335be5 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -19,12 +19,9 @@ #include "computedexpression.hxx" -#include "unohelper.hxx" #include "evaluationcontext.hxx" -#include "NameContainer.hxx" #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/xml/dom/NodeType.hpp> #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include <com/sun/star/xml/xpath/XPathExtension.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index c6b2f92871e1..86dcdf63c329 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -20,9 +20,6 @@ #include "convert.hxx" -#include "unohelper.hxx" -#include <algorithm> -#include <functional> #include <sstream> #include <o3tl/functional.hxx> #include <rtl/math.hxx> @@ -30,7 +27,6 @@ #include <osl/diagnose.h> #include <tools/date.hxx> #include <com/sun/star/uno/Type.hxx> -#include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Time.hpp> diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 9ba93a3110a4..fdfbd138871a 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -27,12 +27,9 @@ #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/util/VetoException.hpp> +#include <com/sun/star/xsd/DataTypeClass.hpp> #include <comphelper/enumhelper.hxx> -#include <functional> -#include <algorithm> -#include <o3tl/functional.hxx> - namespace xforms { diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 048ed19cf84d..91175dea907c 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -22,8 +22,10 @@ #include "resourcehelper.hxx" #include <frm_strings.hxx> #include <property.hxx> +#include <strings.hrc> #include "convert.hxx" +#include <com/sun/star/xsd/DataTypeClass.hpp> #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> #include <tools/datetime.hxx> #include <rtl/math.hxx> diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 894b8dc5bd0b..18675d5f8959 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/xsd/XDataType.hpp> -#include <com/sun/star/xsd/DataTypeClass.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <comphelper/propertycontainer.hxx> diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index fb2a2b72389f..103803f69ac7 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index da5674cb3b40..a107c6c06bf9 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -27,6 +27,7 @@ #include "resourcehelper.hxx" #include "xmlhelper.hxx" #include "convert.hxx" +#include <strings.hrc> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 72c8b36e68a2..6abfb430e2b8 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -22,7 +22,9 @@ #include "collection.hxx" #include <cppuhelper/implbase.hxx> +#include <comphelper/sequence.hxx> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/container/XNamed.hpp> #include <algorithm> diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index 0a9e43491508..ea8fb8e63fd3 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -21,17 +21,13 @@ #include "pathexpression.hxx" #include "unohelper.hxx" #include "evaluationcontext.hxx" -#include "NameContainer.hxx" #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> #include <com/sun/star/xml/xpath/XXPathObject.hpp> -#include <rtl/ustrbuf.hxx> - -#include <unotools/textsearch.hxx> +#include <osl/diagnose.h> #include <algorithm> -#include <functional> using com::sun::star::uno::Reference; diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index 5dd3babfc1a0..26c8baa115b0 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -20,15 +20,8 @@ #include "propertysetbase.hxx" -#include <cppuhelper/typeprovider.hxx> - -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <tools/solar.h> - -#include <vector> using com::sun::star::uno::Any; using com::sun::star::uno::Reference; diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index d46901e0a39c..630934270a79 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -19,15 +19,11 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_PROPERTYSETBASE_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_PROPERTYSETBASE_HXX -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <comphelper/propstate.hxx> -#include <comphelper/propertysetinfo.hxx> #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> // include for inlined helper function below -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <map> diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx index 85a01cc74737..c41e6521d271 100644 --- a/forms/source/xforms/resourcehelper.hxx +++ b/forms/source/xforms/resourcehelper.hxx @@ -19,10 +19,6 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX -// include resource IDs -#include <strings.hrc> - -#include <sal/types.h> #include <rtl/ustring.hxx> namespace xforms diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index f20b72f11973..2df449991a53 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -23,13 +23,11 @@ #include "binding.hxx" #include "mip.hxx" #include "evaluationcontext.hxx" -#include "unohelper.hxx" #include "submission/submission_put.hxx" #include "submission/submission_post.hxx" #include "submission/submission_get.hxx" #include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -47,7 +45,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/propertysetinfo.hxx> #include <comphelper/interaction.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 3f3921f9aaa5..c8f833e7c516 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -22,11 +22,7 @@ #include <cppuhelper/implbase.hxx> #include "propertysetbase.hxx" -#include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/xml/dom/events/XEventListener.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> #include <com/sun/star/xml/xpath/XXPathObject.hpp> diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index aa9115ef60c7..f772fd6e46f3 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -21,15 +21,11 @@ #include "submission.hxx" #include "serialization_app_xml.hxx" -#include <osl/diagnose.h> #include <rtl/ustring.hxx> -#include <rtl/string.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/dom/DocumentBuilder.hpp> #include <com/sun/star/frame/Desktop.hpp> @@ -37,7 +33,6 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <ucbhelper/content.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::ucb; diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx index b0b6c4f1a65c..74e35b1bb0ab 100644 --- a/forms/source/xforms/submission/serialization.hxx +++ b/forms/source/xforms/submission/serialization.hxx @@ -20,14 +20,8 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_HXX -#include <map> - -#include <sal/types.h> -#include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/xml/xpath/XXPathObject.hpp> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> /** diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index afe23e63c426..61729d027673 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.cxx @@ -18,17 +18,13 @@ */ -#include "serialization.hxx" #include "serialization_app_xml.hxx" #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/xml/dom/DocumentBuilder.hpp> #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/xml/dom/XNodeList.hpp> #include <com/sun/star/xml/dom/NodeType.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/xml/xpath/XPathObjectType.hpp> #include <com/sun/star/xml/sax/XSAXSerializable.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/beans/StringPair.hpp> @@ -37,9 +33,6 @@ #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> -#include <limits> -#include <memory> - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Sequence; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 77d59b1f740e..5818a159594c 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -21,17 +21,12 @@ #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_HXX #include <tools/urlobj.hxx> -#include <rtl/ustring.h> #include <osl/conditn.hxx> #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/xml/xpath/XXPathObject.hpp> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 1147e9a1cad6..4939497ec7b9 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -19,12 +19,10 @@ #include "submission_get.hxx" -#include "serialization_app_xml.hxx" #include "serialization_urlencoded.hxx" #include <rtl/strbuf.hxx> -#include <rtl/string.hxx> -#include <osl/file.hxx> +#include <osl/diagnose.h> #include <ucbhelper/content.hxx> #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/task/InteractionHandler.hpp> diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index f9f376dbe463..fb715c602059 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_GET_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_GET_HXX -#include <com/sun/star/uno/XComponentContext.hpp> - #include "submission.hxx" class CSubmissionGet : public CSubmission diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index d055de2d6a62..ab545e7f6799 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -21,10 +21,8 @@ #include <memory> #include "submission_post.hxx" -#include "serialization_app_xml.hxx" -#include "serialization_urlencoded.hxx" -#include <osl/file.hxx> +#include <osl/diagnose.h> #include <ucbhelper/content.hxx> #include <ucbhelper/activedatasink.hxx> #include <com/sun/star/ucb/PostCommandArgument2.hpp> diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index dfafa8f949f7..030eb589caa9 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -21,11 +21,9 @@ #include <memory> #include "submission_put.hxx" -#include "serialization_app_xml.hxx" -#include "serialization_urlencoded.hxx" -#include <osl/file.hxx> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> #include <ucbhelper/content.hxx> using namespace css::uno; diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx index fc3d43d6d6a7..cb1bf89b9b05 100644 --- a/forms/source/xforms/submission/submission_put.hxx +++ b/forms/source/xforms/submission/submission_put.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SUBMISSION_PUT_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include "submission.hxx" class CSubmissionPut : public CSubmission diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index 0550273bb7e7..383afbaeb802 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "model.hxx" #include "NameContainer.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index adb0e6f27918..75f0f92bd594 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -20,7 +20,6 @@ #include "xmlhelper.hxx" -#include "unohelper.hxx" #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/dom/DocumentBuilder.hpp> diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx index 69ec629c0179..076fe1ab6648 100644 --- a/forms/source/xforms/xmlhelper.hxx +++ b/forms/source/xforms/xmlhelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_XMLHELPER_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_XMLHELPER_HXX -#include <sal/types.h> #include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 10725ae3a990..d5c26c1e63f6 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include "extension.hxx" #include "xpathlib.hxx" -#include <services.hxx> namespace com::sun::star::uno { class XComponentContext; diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index 5e83cbf64c9c..85ec1b58e013 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -20,19 +20,14 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_XPATHLIB_EXTENSION_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_XPATHLIB_EXTENSION_HXX -#include <rtl/ustring.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/xml/xpath/XXPathExtension.hpp> #include <com/sun/star/xforms/XModel.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/xml/dom/XNode.hpp> diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 6fd72e923bf0..cc4034d87d88 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -20,10 +20,8 @@ #include <string.h> #include <sal/types.h> -#include <rtl/alloc.h> #include <rtl/ustring.hxx> #include <rtl/string.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <tools/date.hxx> #include <tools/time.hxx> @@ -37,6 +35,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <boost/lexical_cast.hpp> +#include <libxml/xpathInternals.h> #include "xpathlib.hxx" #include "extension.hxx" diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx b/forms/source/xforms/xpathlib/xpathlib.hxx index 57f608b8ecde..05a5baedd235 100644 --- a/forms/source/xforms/xpathlib/xpathlib.hxx +++ b/forms/source/xforms/xpathlib/xpathlib.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_XPATHLIB_XPATHLIB_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_XPATHLIB_XPATHLIB_HXX -#include <libxml/tree.h> #include <libxml/xpath.h> -#include <libxml/xpathInternals.h> /* entry functions for libxml xpath engine |