diff options
65 files changed, 71 insertions, 369 deletions
diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index d789a1a73dcb..82d538994ae3 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -17,3 +17,58 @@ blacklist: svx/source/dialog/srchdlg.cxx: # Actually used - comphelper/scopeguard.hxx + svx/source/fmcomp/dbaobjectex.cxx: + # Actually used + - com/sun/star/ucb/XContent.hpp + svx/source/fmcomp/dbaexchange.cxx: + # Actually used + - com/sun/star/sdbc/XConnection.hpp + - com/sun/star/beans/XPropertySet.hpp + svx/source/gallery2/galtheme.cxx: + # Don't propose hxx -> h change in URE libs + - osl/thread.hxx + svx/source/items/galleryitem.cxx: + # Actually used + - com/sun/star/graphic/XGraphic.hpp + - com/sun/star/lang/XComponent.hpp + svx/source/form/dataaccessdescriptor.cxx: + # Actually used + - com/sun/star/beans/XPropertySet.hpp + svx/source/form/fmcontrolbordermanager.cxx: + # Actually used + - com/sun/star/form/validation/XValidatableFormComponent.hpp + svx/source/form/databaselocationinput.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + svx/source/form/tabwin.cxx: + # Needed for UnoType instatiation + - com/sun/star/sdbc/XConnection.hpp + svx/source/form/typemap.cxx: + # Needed for svxslots.hxx + - config_options.h + - sfx2/objitem.hxx + - sfx2/msg.hxx + - svl/memberid.h + - editeng/wghtitem.hxx + - editeng/udlnitem.hxx + - editeng/crossedoutitem.hxx + - editeng/contouritem.hxx + - editeng/shdditem.hxx + - editeng/postitem.hxx + - svx/clipfmtitem.hxx + - editeng/fhgtitem.hxx + - editeng/fontitem.hxx + - editeng/charreliefitem.hxx + - editeng/escapementitem.hxx + - editeng/colritem.hxx + - editeng/wrlmitem.hxx + - editeng/charscaleitem.hxx + - editeng/autokernitem.hxx + - editeng/ulspitem.hxx + - editeng/lrspitem.hxx + - editeng/lspcitem.hxx + - editeng/langitem.hxx + - editeng/kernitem.hxx + - editeng/adjustitem.hxx + - editeng/emphasismarkitem.hxx + - editeng/memberids.h diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 8316e7eea6f3..b11e9770b040 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -19,10 +19,10 @@ #include <svx/dbaexchange.hxx> #include <osl/diagnose.h> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <fmprop.hxx> #include <comphelper/extract.hxx> #include <sot/formats.hxx> diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 40d9f8be95e0..b60b026e66c8 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/ucb/XContent.hpp> -#include <fmprop.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 39daa6993d62..68b4b3c53259 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -32,7 +32,6 @@ #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <bitmaps.hlst> -#include <sdbdatacolumn.hxx> #include <com/sun/star/form/XConfirmDeleteListener.hpp> #include <com/sun/star/form/XFormComponent.hpp> @@ -48,7 +47,6 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/URLTransformer.hpp> @@ -64,9 +62,7 @@ #include <svl/eitem.hxx> #include <vcl/builder.hxx> #include <vcl/commandevent.hxx> -#include <vcl/fmtfield.hxx> #include <vcl/svapp.hxx> -#include <svl/numuno.hxx> #include <tools/debug.hxx> #include <tools/multisel.hxx> #include <tools/diagnose_ex.h> @@ -76,7 +72,6 @@ #include <vcl/settings.hxx> #include <sal/log.hxx> #include <i18nlangtag/languagetag.hxx> -#include <math.h> #include <memory> using namespace ::com::sun::star::uno; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index a4d89a8abc12..400e28e8b460 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -27,7 +27,6 @@ #include <gridcell.hxx> #include <sdbdatacolumn.hxx> #include <svx/fmgridcl.hxx> -#include <svx/svxids.hrc> #include <tools/urlobj.hxx> #include <com/sun/star/awt/PosSize.hpp> @@ -52,7 +51,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 1ad5422a01c8..347ea58b1031 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -19,7 +19,6 @@ #include <memory> -#include <sal/macros.h> #include <sal/log.hxx> #include <fmprop.hxx> #include <svx/strings.hrc> @@ -33,19 +32,15 @@ #include <com/sun/star/awt/VisualEffect.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/form/XBoundComponent.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XStatement.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/Time.hpp> @@ -57,7 +52,6 @@ #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <cppuhelper/typeprovider.hxx> #include <i18nlangtag/lang.h> #include <rtl/math.hxx> @@ -77,8 +71,6 @@ #include <connectivity/dbconversion.hxx> #include <connectivity/sqlnode.hxx> -#include <math.h> - using namespace ::connectivity; using namespace ::svxform; using namespace ::comphelper; diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 2aa53b8259e1..91a91e6cae89 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -20,7 +20,8 @@ #include <gridcols.hxx> #include <tools/debug.hxx> #include <fmservs.hxx> -#include <svx/fmtools.hxx> +#include <com/sun/star/uno/Sequence.hxx> + using namespace ::com::sun::star::uno; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index e02056663d19..55a1b10f2c24 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/macros.h> #include <sal/log.hxx> #include <helpids.h> #include <svx/gridctrl.hxx> @@ -36,10 +35,8 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -56,9 +53,7 @@ #include <svx/strings.hrc> -#include <svx/svxids.hrc> #include <svx/dialmgr.hxx> -#include <fmservs.hxx> #include <sdbdatacolumn.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index cbfea8c0e593..78538fbebb16 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -19,9 +19,7 @@ #include <svx/dataaccessdescriptor.hxx> #include <osl/diagnose.h> -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/ucb/XContent.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/urlobj.hxx> @@ -30,7 +28,6 @@ namespace svx { using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ucb; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 92cfa4e26707..59ae4d1f26bf 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -21,7 +21,6 @@ #include <memory> -#include <sal/macros.h> #include <sal/log.hxx> #include <datanavi.hxx> #include <fmservs.hxx> @@ -32,14 +31,11 @@ #include <tools/diagnose_ex.h> #include <unotools/resmgr.hxx> #include <svx/xmlexchg.hxx> -#include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <vcl/treelistentry.hxx> -#include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/objitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> @@ -50,14 +46,10 @@ #include <vcl/layout.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XSet.hpp> -#include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/xml/dom/DOMException.hpp> -#include <com/sun/star/form/binding/XValueBinding.hpp> #include <comphelper/string.hxx> using namespace ::com::sun::star::beans; diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index 64b4acec01e7..a20ffa7c1348 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -19,7 +19,6 @@ #include <dbcharsethelper.hxx> -#include <connectivity/dbtools.hxx> #include <connectivity/dbcharset.hxx> using namespace ::dbtools; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index bf8f215f6404..820315e0330d 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -24,12 +24,9 @@ #include <fmprop.hxx> #include <svx/strings.hrc> -#include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/form/runtime/XFormController.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/NumberFormatter.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/sdb/SQLContext.hpp> #include <comphelper/processfactory.hxx> @@ -38,12 +35,9 @@ #include <connectivity/sqlnode.hxx> #include <cppuhelper/implbase.hxx> #include <i18nlangtag/languagetag.hxx> -#include <fmservs.hxx> #include <fmshimp.hxx> #include <o3tl/safeint.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/objitem.hxx> -#include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 33df59f4373f..f77b79f400f6 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -36,10 +36,7 @@ #include <svx/svxids.hrc> #include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/inspection/DefaultFormComponentInspectorModel.hpp> @@ -58,12 +55,8 @@ #include <o3tl/deleter.hxx> #include <sfx2/bindings.hxx> #include <sfx2/childwin.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/viewfrm.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <unotools/confignode.hxx> #include <vcl/stdtext.hxx> @@ -71,8 +64,6 @@ #include <vcl/weld.hxx> #include <vcl/weldutils.hxx> -#include <algorithm> - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 894dea39cb21..f7c71024d6da 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -25,7 +25,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <svx/fmglob.hxx> using namespace ::svxform; diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index b079a26f54bf..16bde8e94857 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/frame/XModule.hpp> #include <tools/diagnose_ex.h> @@ -71,7 +70,6 @@ namespace svxform using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xforms; using namespace ::com::sun::star::container; - using namespace ::com::sun::star::sdbc; namespace diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index d39a3ba8371d..510abf37d457 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -19,12 +19,10 @@ #include <svx/fmpage.hxx> #include <fmobj.hxx> -#include <svx/fmglob.hxx> #include <svx/fmdpage.hxx> #include <svx/unoshape.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/typeprovider.hxx> using ::com::sun::star::uno::Any; using ::com::sun::star::uno::RuntimeException; diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index ce1087a26eab..c5957cef451d 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -19,9 +19,6 @@ #include <fmexch.hxx> -#include <sot/storage.hxx> -#include <svl/itempool.hxx> - #include <sot/formats.hxx> #include <vcl/treelistbox.hxx> #include <vcl/treelistentry.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index de2495382db2..6f585dbecea5 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -23,43 +23,23 @@ #include <helpids.h> #include <svx/fmglob.hxx> -#include <fmservs.hxx> -#include <svx/fmmodel.hxx> +#include <svx/fmtools.hxx> #include <fmexch.hxx> -#include <fmundo.hxx> -#include <fmpgeimp.hxx> #include <svx/svxids.hrc> #include <fmprop.hxx> #include <bitmaps.hlst> #include <svx/dialmgr.hxx> -#include <svx/svditer.hxx> -#include <svx/svdouno.hxx> -#include <svx/svdobj.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/viewsh.hxx> -#include <sfx2/viewfrm.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/awt/XTabControllerModel.hpp> -#include <vcl/menu.hxx> #include <sfx2/objitem.hxx> -#include <sfx2/request.hxx> #include <svx/fmshell.hxx> -#include <fmshimp.hxx> -#include <svx/fmpage.hxx> -#include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/types.hxx> using namespace ::svxform; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::form; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 908fdd193cb0..d616287ec80f 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -24,7 +24,6 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> -#include <svx/svdobj.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index fc7c9aac731d..abb18c7f2f98 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -22,25 +22,19 @@ #include <fmvwimp.hxx> #include <fmpgeimp.hxx> #include <svx/fmview.hxx> -#include <svx/fmglob.hxx> #include <svx/fmpage.hxx> -#include <editeng/editeng.hxx> #include <svx/svdovirt.hxx> #include <svx/fmmodel.hxx> #include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/form/Forms.hpp> -#include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> -#include <com/sun/star/util/XCloneable.hpp> #include <svx/fmtools.hxx> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 0fb1af632f87..5694776e09cd 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -29,7 +29,6 @@ #include <svx/fmglob.hxx> #include <fmobj.hxx> -#include <fmshimp.hxx> #include <svx/fmshell.hxx> diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 5fc8df9195c8..a77d7fef1f8e 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/macros.h> - #include <svx/fmpage.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -28,17 +26,13 @@ #include <fmpgeimp.hxx> -#include <sfx2/objsh.hxx> -#include <svx/svditer.hxx> #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> -#include <svx/fmglob.hxx> #include <fmprop.hxx> #include <fmundo.hxx> -#include <svx/fmtools.hxx> using namespace ::svxform; #include <comphelper/property.hxx> #include <comphelper/types.hxx> diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 1cc539c58144..449cc724f04f 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -18,7 +18,6 @@ */ -#include <svx/svxerr.hxx> #include <fmpgeimp.hxx> #include <fmundo.hxx> #include <svx/fmtools.hxx> @@ -35,19 +34,17 @@ #include <com/sun/star/container/EnumerableMap.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/form/Forms.hpp> +#include <com/sun/star/form/FormComponentType.hpp> #include <sal/log.hxx> #include <sfx2/objsh.hxx> -#include <svx/fmglob.hxx> #include <svx/fmpage.hxx> #include <svx/fmmodel.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <vcl/stdtext.hxx> #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> -#include <unotools/streamwrap.hxx> #include <connectivity/dbtools.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 91760b358ebf..1febf7077aa5 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -47,7 +47,6 @@ #include <basic/basmgr.hxx> #include <memory> -#include <set> #include <utility> using std::pair; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 1be63bbfaaf4..31170e1ec6d6 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -20,19 +20,9 @@ #include <fmvwimp.hxx> #include <svx/fmshell.hxx> #include <svx/fmtools.hxx> -#include <fmservs.hxx> #include <fmprop.hxx> -#include <fmpgeimp.hxx> #include <fmundo.hxx> -#include <com/sun/star/form/XLoadable.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> #include <sfx2/viewfrm.hxx> #include <vcl/svapp.hxx> @@ -46,15 +36,12 @@ #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> #include <svx/svditer.hxx> -#include <fmobj.hxx> #include <svx/svxids.hrc> -#include <fmexch.hxx> #include <svx/fmglob.hxx> #include <svl/eitem.hxx> #include <tools/diagnose_ex.h> @@ -66,8 +53,6 @@ #include <sfx2/viewsh.hxx> #include <fmexpl.hxx> #include <formcontrolling.hxx> -#include <svl/numuno.hxx> -#include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> #include <fmdocumentclassification.hxx> #include <formtoolbars.hxx> @@ -79,9 +64,6 @@ #define ShellClass_FmFormShell #include <svxslots.hxx> -#include <tbxform.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> - #include <memory> // is used for Invalidate -> maintain it as well diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 8a8cf4a97484..ec321d6b11a0 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -32,7 +32,6 @@ #include <fmundo.hxx> #include <fmurl.hxx> #include <fmvwimp.hxx> -#include <formtoolbars.hxx> #include <gridcols.hxx> #include <svx/svditer.hxx> #include <svx/dialmgr.hxx> @@ -54,18 +53,13 @@ #include <com/sun/star/awt/XListBox.hpp> #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/beans/theIntrospection.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/form/TabOrderDialog.hpp> -#include <com/sun/star/form/XBoundComponent.hpp> -#include <com/sun/star/form/XBoundControl.hpp> #include <com/sun/star/form/XGrid.hpp> #include <com/sun/star/form/XGridPeer.hpp> #include <com/sun/star/form/XLoadable.hpp> @@ -77,10 +71,8 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/util/XModeSelector.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/evtmethodhelper.hxx> @@ -92,7 +84,6 @@ #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/frame.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> @@ -106,7 +97,6 @@ #include <vcl/svapp.hxx> #include <algorithm> -#include <functional> #include <map> #include <memory> #include <vector> diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index e2a0492363c2..f7827df23e3d 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -19,7 +19,6 @@ #include <svx/fmsrccfg.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <i18nutil/transliteration.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 5031cf2a2fba..82a6313a9ae1 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <o3tl/safeint.hxx> -#include <rtl/strbuf.hxx> -#include <sal/log.hxx> #include <svx/fmtools.hxx> #include <svx/fmsrccfg.hxx> #include <tools/debug.hxx> @@ -32,27 +30,20 @@ #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XListBox.hpp> #include <com/sun/star/awt/XCheckBox.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> -#include <com/sun/star/util/SearchResult.hpp> #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> #include <com/sun/star/sdb/XColumn.hpp> -#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/util/NumberFormatter.hpp> -#include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/util/XNumberFormats.hpp> #include <fmprop.hxx> -#include <fmservs.hxx> #include <svx/fmsrcimp.hxx> -#include <svx/fmsearch.hxx> #include <comphelper/types.hxx> #include <unotools/syslocale.hxx> diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c6d3b0d3e5a1..0c7c2a7de59c 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -21,8 +21,6 @@ #include <svx/dialogs.hrc> #include <svx/svxids.hrc> -#include <editeng/eeitem.hxx> - #include <svx/flagsdef.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 6e609ad84a9f..51501bc5c807 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -24,16 +24,12 @@ #include <fmtextcontrolshell.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/editeng.hxx> -#include <editeng/eeitem.hxx> -#include <svx/fmglob.hxx> #include <editeng/scriptspaceitem.hxx> #include <svx/svxids.hrc> #include <editeng/udlnitem.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> @@ -52,15 +48,14 @@ #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> -#include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/languageoptions.hxx> #include <svtools/stringtransfer.hxx> #include <svl/whiter.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 0e3dd230e5f9..ec7304918b19 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -24,63 +24,28 @@ #include <svx/fmglob.hxx> #include <com/sun/star/awt/LineEndFormat.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XIntrospection.hpp> -#include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/form/XForm.hpp> -#include <com/sun/star/form/XFormComponent.hpp> -#include <com/sun/star/form/XGridColumnFactory.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/io/XPersistObject.hpp> -#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/ErrorCondition.hpp> #include <com/sun/star/sdb/ErrorMessageDialog.hpp> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdb/SQLErrorEvent.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> -#include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> -#include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/sdbcx/Privilege.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/Language.hpp> -#include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/util/XNumberFormats.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> - -#include <basic/sbxvar.hxx> -#include <svl/eitem.hxx> -#include <svl/stritem.hxx> + #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> -#include <connectivity/dbexception.hxx> -#include <connectivity/dbtools.hxx> -#include <cppuhelper/typeprovider.hxx> #include <osl/diagnose.h> -#include <rtl/math.hxx> -#include <sfx2/bindings.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> -#include <algorithm> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index de10047759c1..7b8fa027941f 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -28,7 +28,6 @@ #include <fmobj.hxx> #include <fmprop.hxx> #include <svx/strings.hrc> -#include <svx/fmglob.hxx> #include <svx/dialmgr.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> @@ -40,17 +39,13 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> -#include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <svx/fmtools.hxx> -#include <svl/macitem.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <sfx2/objsh.hxx> -#include <sfx2/docfile.hxx> -#include <sfx2/app.hxx> #include <sfx2/event.hxx> #include <osl/mutex.hxx> #include <comphelper/property.hxx> @@ -66,7 +61,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::form; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::reflection; using namespace ::com::sun::star::form::binding; using namespace ::com::sun::star::sdbc; using namespace ::svxform; diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 8808bd01dd52..1ed008e59633 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -21,48 +21,28 @@ #ifdef REFERENCE #undef REFERENCE #endif -#include <svtools/ehdl.hxx> -#include <unotools/moduleoptions.hxx> #include <com/sun/star/sdb/SQLContext.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/form/XLoadable.hpp> -#include <com/sun/star/form/XReset.hpp> #include <fmvwimp.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> -#include <basic/sbuno.hxx> -#include <basic/sbx.hxx> #include <fmobj.hxx> #include <svx/svditer.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdogrp.hxx> #include <svx/fmview.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/fmshell.hxx> -#include <fmpgeimp.hxx> -#include <svx/fmtools.hxx> #include <fmshimp.hxx> #include <fmservs.hxx> -#include <fmprop.hxx> #include <fmundo.hxx> #include <svx/dataaccessdescriptor.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <vcl/svapp.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> -#include <vcl/stdtext.hxx> -#include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 540816d79459..5f78a4a71204 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -27,7 +27,6 @@ #include <fmservs.hxx> #include <fmshimp.hxx> #include <svx/fmtools.hxx> -#include <fmundo.hxx> #include <fmvwimp.hxx> #include <formcontrolfactory.hxx> #include <svx/sdrpaintwindow.hxx> @@ -48,16 +47,12 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/form/XLoadable.hpp> -#include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/form/FormButtonType.hpp> -#include <com/sun/star/form/XReset.hpp> #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XValueBinding.hpp> #include <com/sun/star/form/runtime/FormController.hpp> @@ -67,9 +62,7 @@ #include <com/sun/star/awt/XTabController.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/SQLException.hpp> -#include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/container/XContainer.hpp> diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 891df87d305f..6bc3c9e144e6 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -55,9 +55,7 @@ #include <com/sun/star/sdb/SQLFilterOperator.hpp> #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> -#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/form/runtime/FormOperations.hpp> #include <com/sun/star/form/runtime/FormFeature.hpp> #include <com/sun/star/container/XContainer.hpp> @@ -73,9 +71,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/flagguard.hxx> #include <comphelper/types.hxx> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> #include <connectivity/IParseContext.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlparse.hxx> @@ -94,8 +90,6 @@ #include <algorithm> #include <iterator> -#include <o3tl/functional.hxx> - using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::connectivity; diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 12995e5c7167..2f62c697eda4 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -50,7 +50,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <svx/sdrpaintwindow.hxx> -#include <svx/svxdlg.hxx> #include <svx/strings.hrc> #include <tools/diagnose_ex.h> #include <svx/svxids.hrc> diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 12589592697e..a0f6baa661a8 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -21,10 +21,8 @@ #include <svx/fmshell.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> -#include <svx/fmglob.hxx> #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> -#include <svx/svdpagv.hxx> #include <fmprop.hxx> diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index e350dc1f1c3a..232f0418ddf6 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -18,9 +18,7 @@ */ #include <sqlparserclient.hxx> -#include <svx/ParseContext.hxx> -#include <connectivity/dbtools.hxx> #include <connectivity/sqlparse.hxx> using namespace ::dbtools; diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 4bf6015c0913..063f00a9ac3c 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -19,38 +19,27 @@ #include <tabwin.hxx> -#include <svx/fmtools.hxx> #include <fmservs.hxx> #include <svx/strings.hrc> #include <svx/svxids.hrc> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/sdb/XQueriesSupplier.hpp> -#include <com/sun/star/sdbc/XPreparedStatement.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/util/XLocalizedAliases.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> #include <helpids.h> #include <svx/fmshell.hxx> #include <fmshimp.hxx> -#include <svx/fmpage.hxx> - -#include <fmpgeimp.hxx> #include <fmprop.hxx> #include <svx/dialmgr.hxx> -#include <svx/svdpagv.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/objitem.hxx> -#include <sfx2/dispatch.hxx> -#include <comphelper/property.hxx> #include <sfx2/frame.hxx> #include <svx/dataaccessdescriptor.hxx> #include <tools/diagnose_ex.h> -#include <vcl/svapp.hxx> #include <tabwin.hrc> const long STD_WIN_SIZE_X = 120; diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 3d45d19519a1..292030cb4793 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -17,24 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string> #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <sfx2/dispatch.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> -#include <formtoolbars.hxx> #include <labelitemwindow.hxx> #include <svx/dialmgr.hxx> #include <svx/svxids.hrc> #include <svx/strings.hrc> -#include <svx/tbxctl.hxx> #include <tbxform.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/viewsh.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 9db75349d3e1..b169b745c641 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -21,8 +21,6 @@ #include <sfx2/objitem.hxx> #include <sfx2/msg.hxx> -#include <svl/stritem.hxx> -#include <svl/intitem.hxx> #include <svl/memberid.h> #include <editeng/wghtitem.hxx> #include <editeng/udlnitem.hxx> @@ -44,7 +42,6 @@ #include <editeng/lspcitem.hxx> #include <editeng/langitem.hxx> #include <editeng/kernitem.hxx> -#include <editeng/tstpitem.hxx> #include <editeng/adjustitem.hxx> #include <editeng/emphasismarkitem.hxx> diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index d2210073da8d..6c8d6ef35ab5 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <datanavi.hxx> #include <fmservs.hxx> diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index 89ae895a967d..e934cc0d9974 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -19,13 +19,9 @@ #include <GalleryControl.hxx> -#include <svx/galmisc.hxx> #include <svx/gallery1.hxx> #include "galbrws1.hxx" #include <galbrws2.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <sfx2/sidebar/Theme.hxx> namespace svx::sidebar { diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 7b7daeee6024..f4c3da3b41a8 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -24,7 +24,6 @@ #include <unotools/datetime.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <ucbhelper/content.hxx> diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 2d3f2fab793b..325d8e540dff 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -19,22 +19,14 @@ #include <sot/formats.hxx> -#include <svl/urlbmk.hxx> -#include <svl/stritem.hxx> -#include <svl/intitem.hxx> -#include <svl/eitem.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/transfer.hxx> #include <vcl/virdev.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/sfxsids.hrc> #include <vcl/graphicfilter.hxx> -#include <editeng/brushitem.hxx> #include <helpids.h> -#include <svx/gallery.hxx> #include <svx/svxids.hrc> #include <galobj.hxx> #include <svx/gallery1.hxx> @@ -43,20 +35,15 @@ #include <svx/galmisc.hxx> #include <galbrws2.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <vcl/weld.hxx> -#include <svx/fmmodel.hxx> -#include <svx/dialmgr.hxx> #include <svx/svxdlg.hxx> -#include <svx/strings.hrc> -#include <GalleryControl.hxx> -#include <bitmaps.hlst> #include <svx/galleryitem.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/gallery/GalleryItemType.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/style/GraphicLocation.hpp> #include <map> #include <memory> diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index cc9e6fab86e4..c216d611d7d8 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -19,26 +19,20 @@ #include <config_features.h> -#include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sfxsids.hrc> #include <avmedia/mediaplayer.hxx> #include <helpids.h> #include <galbrws2.hxx> -#include <svx/dialmgr.hxx> #include <svx/galtheme.hxx> #include <svx/galmisc.hxx> #include <svx/galctrl.hxx> -#include <editeng/AccessibleStringWrap.hxx> -#include <editeng/svxfont.hxx> #include <galobj.hxx> #include <avmedia/mediawindow.hxx> -#include <svx/strings.hrc> #include <vcl/event.hxx> #include <vcl/commandevent.hxx> #include <vcl/graphicfilter.hxx> -#include <vcl/settings.hxx> #include <bitmaps.hlst> GalleryPreview::GalleryPreview(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow) diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 1f5122fd97b5..b2d34749b7df 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -18,9 +18,7 @@ */ -#include <unotools/pathoptions.hxx> #include <rtl/instance.hxx> -#include <sfx2/viewfrm.hxx> #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include <svx/gallery.hxx> diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx index 1775aeb20142..55c19161bca2 100644 --- a/svx/source/gallery2/galini.cxx +++ b/svx/source/gallery2/galini.cxx @@ -16,12 +16,9 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <unotools/tempfile.hxx> #include <svx/gallery1.hxx> #include <i18nlangtag/languagetag.hxx> -#include <unotools/syslocale.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <memory> diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 1ee0d7edbf0f..8e0873ffd653 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -29,14 +29,11 @@ #include <sal/config.h> #include <comphelper/processfactory.hxx> -#include <osl/thread.h> -#include <tools/vcompat.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <unotools/configmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> -#include <sfx2/docfile.hxx> #include <svx/dialmgr.hxx> #include <svx/gallery.hxx> #include <svx/strings.hrc> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index facb4989d5d9..b51cdb1af2b2 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -25,30 +25,22 @@ #include <comphelper/string.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> -#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <svl/solar.hrc> -#include <svl/urihelper.hxx> #include <vcl/graphicfilter.hxx> #include <svl/itempool.hxx> #include <sfx2/docfile.hxx> -#include <avmedia/mediawindow.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> +#include <vcl/window.hxx> #include <svx/svdpage.hxx> #include <svx/dialmgr.hxx> #include <svx/svdograf.hxx> #include <svx/fmmodel.hxx> -#include <svx/fmview.hxx> #include <svx/unomodel.hxx> #include "codec.hxx" #include <svx/strings.hrc> -#include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include <svx/galmisc.hxx> #include <com/sun/star/awt/XProgressMonitor.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <memory> diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index c8354334a041..b22b3763655f 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -20,25 +20,17 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <sfx2/objsh.hxx> -#include <sfx2/docfac.hxx> #include <comphelper/fileformat.h> -#include <comphelper/classids.hxx> -#include <unotools/pathoptions.hxx> -#include <unotools/resmgr.hxx> #include <tools/vcompat.hxx> #include <tools/helpers.hxx> #include <vcl/virdev.hxx> -#include <svl/itempool.hxx> #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include <svx/fmpage.hxx> #include <svx/galmisc.hxx> #include <galobj.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <vcl/dibtools.hxx> #include "gallerydrawmodel.hxx" -#include <memory> #include <bitmaps.hlst> using namespace ::com::sun::star; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 12f3dbe04e48..f75e88a15fdd 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -41,21 +41,17 @@ #include <sot/filelist.hxx> #include <vcl/virdev.hxx> #include <vcl/cvtgrf.hxx> -#include <svl/itempool.hxx> -#include <sfx2/docfile.hxx> #include <avmedia/mediawindow.hxx> -#include <svx/svxids.hrc> #include <svx/svdograf.hxx> -#include <svx/fmpage.hxx> #include "codec.hxx" #include <svx/unomodel.hxx> #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include <svx/galmisc.hxx> #include <svx/galtheme.hxx> +#include <svx/svdpage.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <galobj.hxx> #include <svx/gallery1.hxx> #include "gallerydrawmodel.hxx" diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index c023e5bb8205..572b9e081723 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -11,19 +11,12 @@ #include <sal/log.hxx> #include <stdio.h> -#ifndef _WIN32 -#include <unistd.h> -#endif #include <vector> -#include <unotools/streamwrap.hxx> - #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <tools/urlobj.hxx> @@ -31,7 +24,6 @@ #include <osl/file.hxx> #include <osl/process.h> -#include <rtl/bootstrap.hxx> #include <sfx2/app.hxx> #include <sal/types.h> #include <tools/diagnose_ex.h> diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 59e8a320a645..c6274e43b1e7 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -17,27 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svxitems.hrc> #include <svx/strings.hrc> #include <osl/diagnose.h> -#include <tools/stream.hxx> #include <tools/mapunit.hxx> -#include <com/sun/star/table/BorderLine.hpp> -#include <com/sun/star/table/ShadowLocation.hpp> -#include <com/sun/star/table/TableBorder.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/table/CellRangeAddress.hpp> -#include <com/sun/star/table/CellContentType.hpp> -#include <com/sun/star/table/TableOrientation.hpp> -#include <com/sun/star/util/SortField.hpp> -#include <com/sun/star/util/SortFieldType.hpp> #include <com/sun/star/table/CellOrientation.hpp> -#include <com/sun/star/table/CellAddress.hpp> #include <svx/algitem.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> -#include <editeng/editrids.hrc> #include <editeng/eerdll.hxx> #include <svx/unomid.hxx> diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 7fe7ebbdaaf4..c8f502e38e3e 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -17,17 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/fileformat.h> -#include <tools/stream.hxx> -#include <basic/sbxvar.hxx> #include <rtl/math.hxx> #include <unotools/intlwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> -#include <float.h> -#include <climits> - #include <svx/chrtitem.hxx> using namespace ::com::sun::star; diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 002f219b2152..da37496955b8 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/svxids.hrc> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index c78a0047c2c6..6ce7e4f313c4 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -18,15 +18,11 @@ */ #include <com/sun/star/drawing/Direction3D.hpp> -#include <comphelper/fileformat.h> -#include <tools/stream.hxx> #include <rtl/math.hxx> #include <libxml/xmlwriter.h> #include <svx/e3ditem.hxx> -#include <climits> - using namespace ::com::sun::star; diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 31f4a3a96f4f..1d758046e954 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/stream.hxx> #include <svx/grfcrop.hxx> #include <editeng/itemtype.hxx> #include <com/sun/star/text/GraphicCrop.hpp> diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index c10b692976d3..7a092b36fc5a 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -18,9 +18,6 @@ */ #include <svx/svxids.hrc> -#include <tools/stream.hxx> -#include <svl/memberid.h> -#include <basic/sbxvar.hxx> #include <sfx2/event.hxx> #include <svx/hlnkitem.hxx> diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 2a6ffffd975d..a715543e8dae 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -23,7 +23,6 @@ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> -#include <tools/stream.hxx> #include <tools/resary.hxx> #include <svx/pageitem.hxx> #include <svx/strarray.hxx> @@ -33,10 +32,8 @@ #include <com/sun/star/text/XNumberingTypeInfo.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/style/BreakType.hpp> #include <svl/itemset.hxx> #include <svx/strings.hrc> -#include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> using namespace ::com::sun::star; diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 699b26155a90..aabeae28d775 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -18,9 +18,7 @@ */ #include <svx/postattr.hxx> -#include <editeng/itemtype.hxx> #include <svx/strings.hrc> -#include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 5584fb68b5ea..a02bc658e447 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -17,19 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/stream.hxx> -#include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> -#include <com/sun/star/table/ShadowLocation.hpp> -#include <com/sun/star/table/TableBorder.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/table/CellRangeAddress.hpp> -#include <com/sun/star/table/CellContentType.hpp> -#include <com/sun/star/table/TableOrientation.hpp> -#include <com/sun/star/util/SortField.hpp> -#include <com/sun/star/util/SortFieldType.hpp> -#include <com/sun/star/table/CellOrientation.hpp> -#include <com/sun/star/table/CellAddress.hpp> #include <svx/dialmgr.hxx> #include <svx/rotmodit.hxx> diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 7b3c6890f16a..94846236cd13 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/stream.hxx> - #include <svx/viewlayoutitem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index c8b27769fd18..5c1a088c4ef5 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/stream.hxx> - #include <osl/diagnose.h> #include <svx/zoomslideritem.hxx> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 693b465208e8..bfa024bd93bd 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -17,13 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/app.hxx> #include <sfx2/tbxctrl.hxx> -#include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> -#include <sot/exchange.hxx> -#include <svl/eitem.hxx> #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> #include <svx/clipboardctl.hxx> |