diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-25 11:05:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 09:55:44 +0200 |
| commit | 468729d6490f033a2d955edbc0fd6ef932bb11a9 (patch) | |
| tree | 620323df1c16fab4eaa5e4879feae871e64316c1 | |
| parent | deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (diff) | |
drop unnecessary includes and update pch
Change-Id: Id7fa7d5b95c32fdc738a18208eb95eaec102d937
Reviewed-on: https://gerrit.libreoffice.org/79523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
37 files changed, 96 insertions, 205 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 8e17a864f1fe..335a51f1d918 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -51,6 +51,7 @@ #include <svl/visitem.hxx> #include <svl/whiter.hxx> #include <svx/svxids.hrc> +#include <vcl/dialog.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index a6519d6dac8c..a55adf8f574c 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-06-06 21:24:00 using: + Generated on 2019-09-25 11:00:52 using: ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -72,7 +72,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> -#include <rtl/uuid.h> #include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> @@ -83,7 +82,8 @@ #include <vcl/EnumContext.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/IContext.hxx> +#include <vcl/NotebookBarAddonsMerger.hxx> +#include <vcl/Scanline.hxx> #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -94,17 +94,14 @@ #include <vcl/button.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/devicecoordinate.hxx> -#include <vcl/dialog.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> #include <vcl/dockwin.hxx> #include <vcl/edit.hxx> #include <vcl/errcode.hxx> -#include <vcl/field.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -113,27 +110,22 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> -#include <vcl/jobset.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> -#include <vcl/lstbox.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/prntypes.hxx> #include <vcl/region.hxx> -#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> -#include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> #include <vcl/task.hxx> +#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> @@ -156,11 +148,8 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2irange.hxx> -#include <basegfx/range/b2irectangle.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/b2dtuple.hxx> -#include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/vector/b2dsize.hxx> @@ -171,7 +160,6 @@ #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -191,20 +179,17 @@ #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/drawing/DashStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> @@ -221,7 +206,6 @@ #include <com/sun/star/i18n/reservedWords.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -252,7 +236,6 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/view/PrintableState.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> @@ -288,6 +271,7 @@ #include <editeng/editview.hxx> #include <editeng/eedata.hxx> #include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/macros.hxx> #include <editeng/outliner.hxx> @@ -297,8 +281,6 @@ #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> -#include <i18nutil/i18nutildllapi.h> -#include <i18nutil/paper.hxx> #include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> @@ -308,8 +290,8 @@ #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> -#include <sfx2/basedlgs.hxx> #include <sfx2/dllapi.h> +#include <sfx2/shell.hxx> #include <sot/formats.hxx> #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> @@ -331,18 +313,17 @@ #include <svtools/optionsdrawinglayer.hxx> #include <svtools/svtdllapi.h> #include <svx/ActionDescriptionProvider.hxx> +#include <svx/DiagramDataInterface.hxx> #include <svx/XPropertyEntry.hxx> #include <svx/chrtitem.hxx> -#include <svx/grfcrop.hxx> #include <svx/ipolypolygoneditorcontroller.hxx> #include <svx/itextprovider.hxx> -#include <svx/pageitem.hxx> -#include <svx/sdgcpitm.hxx> #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> +#include <svx/sdr/properties/defaultproperties.hxx> +#include <svx/sdr/properties/properties.hxx> #include <svx/sdrobjectuser.hxx> -#include <svx/sdrpageuser.hxx> #include <svx/sdtaditm.hxx> #include <svx/sdtaitm.hxx> #include <svx/sdtakitm.hxx> @@ -364,7 +345,6 @@ #include <svx/svdobj.hxx> #include <svx/svdoedge.hxx> #include <svx/svdotext.hxx> -#include <svx/svdpagv.hxx> #include <svx/svdpntv.hxx> #include <svx/svdpoev.hxx> #include <svx/svdsnpv.hxx> @@ -376,20 +356,13 @@ #include <svx/svxdllapi.h> #include <svx/xdash.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflasit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnasit.hxx> #include <svx/xpoly.hxx> #include <svx/xtable.hxx> -#include <svx/xtextit0.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> -#include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 3204b35ef11b..18fc12362663 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -23,7 +23,6 @@ #include <tools/link.hxx> #include <svl/itemset.hxx> #include <svx/chrtitem.hxx> -#include <vcl/tabpage.hxx> #include "RangeSelectionListener.hxx" namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index a70e984bb3c1..aa6f7f5b0a02 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -26,8 +26,6 @@ #include <sfx2/basedlgs.hxx> #include <svtools/restartdialog.hxx> -#include <vcl/tabpage.hxx> -#include <vcl/treelistbox.hxx> class SfxModule; class SfxShell; diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index d0bd9a57e684..c80e70b11f56 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -11,6 +11,7 @@ #include <unordered_map> #include <vcl/lazydelete.hxx> #include <sfx2/lokhelper.hxx> +#include <sal/log.hxx> #include <cppuhelper/supportsservice.hxx> using namespace css; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 641a920d7ba2..5e16a43fe095 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -20,6 +20,7 @@ #include <memory> #include <sal/macros.h> +#include <vcl/builder.hxx> #include <vcl/image.hxx> #include <com/sun/star/i18n/WordType.hpp> diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index 774ed245e0b0..ee36cee27ab1 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -22,7 +22,6 @@ namespace abp { - using namespace ::svt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index e6e16d118076..b106212d6d5d 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -50,7 +50,6 @@ namespace abp #define PATH_NO_FIELDS 3 #define PATH_NO_SETTINGS_NO_FIELDS 4 - using namespace ::svt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index 1e9099dd039d..e9e397cd5fd7 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.hxx @@ -22,7 +22,6 @@ #include <vcl/window.hxx> #include <vcl/splitwin.hxx> -#include <vcl/tabpage.hxx> // additional classes to handle shortcuts // code in bibcont.cxx diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 740c821571b2..59ce90acbe7d 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -61,7 +61,6 @@ namespace dbp using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::form; using namespace ::com::sun::star::task; - using namespace ::svt; using namespace ::comphelper; using namespace ::dbtools; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index aba9a1f46506..f64897ca534c 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -47,7 +47,6 @@ namespace dbp using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; using namespace ::com::sun::star::awt; - using namespace ::svt; OGridWizard::OGridWizard(weld::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 4ea1fc2ec369..97bf0273da38 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -38,7 +38,6 @@ namespace dbp using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form; - using namespace ::svt; OGroupBoxWizard::OGroupBoxWizard(weld::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index f7be36c12af3..8192180e9c1a 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -43,7 +43,6 @@ namespace dbp using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; - using namespace ::svt; using namespace ::dbtools; OListComboWizard::OListComboWizard(weld::Window* _pParent, diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 821e7c6b9eb5..2b7f003bf54e 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -22,7 +22,6 @@ #include <helpids.h> #include <propctrlr.h> #include <vcl/event.hxx> -#include <vcl/tabpage.hxx> #include <memory> namespace pcr diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 862f76c4154e..739f83aa4a63 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -46,7 +46,6 @@ #include <comphelper/property.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> -#include <vcl/tabpage.hxx> #include <osl/mutex.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/component_context.hxx> diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index ada9db6f1261..39b416fc2c49 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> #include <vcl/tabctrl.hxx> -#include <vcl/vclptr.hxx> +#include <vcl/tabpage.hxx> #include <map> namespace pcr diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 6278b7f0a8bf..6f9777aca7cb 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -24,7 +24,6 @@ #include <sfx2/dllapi.h> #include <sfx2/shell.hxx> #include <sfx2/styfitem.hxx> -#include <vcl/tabpage.hxx> #include <sal/types.h> #include <tools/fldunit.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 3d0176fe3964..0245ff6bbd6c 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -25,7 +25,6 @@ #include <sfx2/basedlgs.hxx> #include <sal/types.h> #include <vcl/builderpage.hxx> -#include <vcl/tabpage.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 8e781d2d1611..4fb019a43132 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -31,7 +31,6 @@ #include <vcl/errcode.hxx> #include <o3tl/typed_flags_set.hxx> #include <vcl/vclptr.hxx> -#include <vcl/tabpage.hxx> #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <editeng/outliner.hxx> #include <functional> diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 298d488d0d23..1c1e2d246148 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -31,8 +31,6 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/broadcasthelper.hxx> #include <tools/link.hxx> -#include <vcl/dialog.hxx> -#include <vcl/vclptr.hxx> #include <vcl/weld.hxx> namespace com :: sun :: star :: awt { class XWindow; } diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx index 6fb6adf3390f..8b37a5d10ac2 100644 --- a/include/vcl/wizardmachine.hxx +++ b/include/vcl/wizardmachine.hxx @@ -23,7 +23,6 @@ #include <vcl/dllapi.h> #include <vcl/builderpage.hxx> #include <vcl/idle.hxx> -#include <vcl/tabpage.hxx> namespace weld { class Builder; diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 0c85969347da..e1fb7ce9b2b2 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-06-06 09:42:49 using: + Generated on 2019-09-25 10:59:58 using: ./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -97,8 +97,9 @@ #include <vcl/EnumContext.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/IContext.hxx> #include <vcl/IDialogRenderable.hxx> +#include <vcl/NotebookBarAddonsMerger.hxx> +#include <vcl/Scanline.hxx> #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -106,9 +107,9 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> +#include <vcl/builderpage.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/devicecoordinate.hxx> @@ -119,7 +120,6 @@ #include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> -#include <vcl/field.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -129,7 +129,6 @@ #include <vcl/headbar.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> -#include <vcl/jobset.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lstbox.hxx> @@ -139,17 +138,15 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/prntypes.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> -#include <vcl/spinfld.hxx> #include <vcl/status.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> #include <vcl/task.hxx> +#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> #include <vcl/transfer.hxx> #include <vcl/treelistentries.hxx> @@ -185,12 +182,10 @@ #include <basegfx/vector/b3dvector.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -204,11 +199,11 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> @@ -217,14 +212,13 @@ #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/drawing/DashStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XStatusbarController.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -235,12 +229,10 @@ #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -268,7 +260,6 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/util/XUpdatable.hpp> -#include <com/sun/star/view/PrintableState.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> @@ -313,13 +304,13 @@ #include <editeng/editstat.hxx> #include <editeng/editview.hxx> #include <editeng/eedata.hxx> +#include <editeng/flditem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/macros.hxx> #include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> -#include <editeng/unoipset.hxx> #include <formula/compiler.hxx> #include <formula/formuladllapi.h> #include <formula/opcode.hxx> @@ -328,8 +319,6 @@ #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/mslangid.hxx> -#include <i18nutil/i18nutildllapi.h> -#include <i18nutil/paper.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> @@ -371,16 +360,16 @@ #include <svtools/svtdllapi.h> #include <svtools/toolboxcontroller.hxx> #include <svtools/valueset.hxx> +#include <svx/DiagramDataInterface.hxx> #include <svx/Palette.hxx> #include <svx/XPropertyEntry.hxx> -#include <svx/grfcrop.hxx> #include <svx/ipolypolygoneditorcontroller.hxx> #include <svx/itextprovider.hxx> -#include <svx/pageitem.hxx> -#include <svx/sdgcpitm.hxx> #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> +#include <svx/sdr/properties/defaultproperties.hxx> +#include <svx/sdr/properties/properties.hxx> #include <svx/sdrobjectuser.hxx> #include <svx/sdrpageuser.hxx> #include <svx/sdtaditm.hxx> @@ -406,7 +395,6 @@ #include <svx/svdoattr.hxx> #include <svx/svdobj.hxx> #include <svx/svdoedge.hxx> -#include <svx/svdorect.hxx> #include <svx/svdotext.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpntv.hxx> @@ -422,17 +410,11 @@ #include <svx/xcolit.hxx> #include <svx/xdash.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflasit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnasit.hxx> #include <svx/xpoly.hxx> #include <svx/xtable.hxx> -#include <svx/xtextit0.hxx> #include <toolkit/dllapi.h> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -454,7 +436,6 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> -#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/weakbase.h> diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 904c733f1659..5a5adf9ab8ef 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -35,7 +35,6 @@ #include "ReportDefines.hxx" #include <svtools/colorcfg.hxx> #include <svx/svdedtv.hxx> -#include <vcl/tabpage.hxx> #include <vcl/splitwin.hxx> #include "MarkedSection.hxx" #include "ScrollHelper.hxx" diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index b964b8a8fcd5..747ed1b57eb4 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:57:13 using: + Generated on 2019-09-25 10:58:26 using: ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -65,6 +65,7 @@ #include <osl/module.hxx> #include <osl/mutex.h> #include <osl/mutex.hxx> +#include <osl/security.h> #include <osl/security.hxx> #include <osl/thread.h> #include <osl/time.h> @@ -98,8 +99,9 @@ #include <vcl/EnumContext.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/IContext.hxx> #include <vcl/IDialogRenderable.hxx> +#include <vcl/NotebookBarAddonsMerger.hxx> +#include <vcl/Scanline.hxx> #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -107,17 +109,13 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> -#include <vcl/button.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> -#include <vcl/dockwin.hxx> #include <vcl/edit.hxx> #include <vcl/errcode.hxx> -#include <vcl/field.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -133,13 +131,11 @@ #include <vcl/region.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> -#include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> #include <vcl/task.hxx> +#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> -#include <vcl/toolbox.hxx> #include <vcl/uitest/factory.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> @@ -147,7 +143,6 @@ #include <vcl/vclreferencebase.hxx> #include <vcl/vectorgraphicdata.hxx> #include <vcl/virdev.hxx> -#include <vcl/waitobj.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> #endif // PCH_LEVEL >= 2 @@ -176,7 +171,6 @@ #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -191,32 +185,23 @@ #include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> -#include <com/sun/star/datatransfer/XTransferable2.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/drawing/DashStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -300,10 +285,10 @@ #include <editeng/forbiddencharacterstable.hxx> #include <editeng/justifyitem.hxx> #include <editeng/langitem.hxx> +#include <editeng/lineitem.hxx> #include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/postitem.hxx> -#include <editeng/sizeitem.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> #include <editeng/wghtitem.hxx> @@ -334,7 +319,6 @@ #include <sfx2/request.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/viewfrm.hxx> -#include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> @@ -348,7 +332,6 @@ #include <svl/lstner.hxx> #include <svl/poolitem.hxx> #include <svl/sharedstringpool.hxx> -#include <svl/srchitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> #include <svl/stylesheetuser.hxx> @@ -364,21 +347,18 @@ #include <svtools/toolboxcontroller.hxx> #include <svx/XPropertyEntry.hxx> #include <svx/algitem.hxx> -#include <svx/grfcrop.hxx> -#include <svx/ipolypolygoneditorcontroller.hxx> #include <svx/itextprovider.hxx> -#include <svx/pageitem.hxx> -#include <svx/sdgcpitm.hxx> #include <svx/sdr/animation/scheduler.hxx> #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> +#include <svx/sdr/properties/defaultproperties.hxx> +#include <svx/sdr/properties/properties.hxx> #include <svx/sdrobjectuser.hxx> #include <svx/sdtaditm.hxx> #include <svx/sdtaitm.hxx> #include <svx/sdtakitm.hxx> #include <svx/svddef.hxx> #include <svx/svddrag.hxx> -#include <svx/svdedtv.hxx> #include <svx/svdglue.hxx> #include <svx/svdhdl.hxx> #include <svx/svdhlpln.hxx> @@ -391,7 +371,6 @@ #include <svx/svdobj.hxx> #include <svx/svdocapt.hxx> #include <svx/svdoedge.hxx> -#include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdotext.hxx> #include <svx/svdouno.hxx> @@ -408,35 +387,25 @@ #include <svx/svxdllapi.h> #include <svx/xdash.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflasit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnasit.hxx> #include <svx/xpoly.hxx> #include <svx/xtable.hxx> -#include <svx/xtextit0.hxx> #include <tools/color.hxx> -#include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> -#include <tools/debug.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> #include <tools/globname.hxx> #include <tools/helpers.hxx> -#include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> -#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> @@ -502,7 +471,6 @@ #include <formula/token.hxx> #include <formula/vectortoken.hxx> #include <formulacell.hxx> -#include <funcdesc.hxx> #include <global.hxx> #include <globalnames.hxx> #include <hints.hxx> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 19722265ce67..14c16fde8e33 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include <scitems.hxx> #include <svx/algitem.hxx> #include <editeng/brushitem.hxx> @@ -34,8 +33,10 @@ #include <svl/stritem.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> +#include <vcl/keycodes.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <unotools/charclass.hxx> #include <unotools/securityoptions.hxx> #include <osl/diagnose.h> diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 9ea577b4f622..6c9ab3ac0b59 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -25,6 +25,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/zoomitem.hxx> +#include <vcl/syswin.hxx> #include <shellids.hxx> diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx index a15250afdb62..9c896e27fa97 100644 --- a/sc/source/ui/unoobj/TablePivotCharts.cxx +++ b/sc/source/ui/unoobj/TablePivotCharts.cxx @@ -119,7 +119,7 @@ void SAL_CALL TablePivotCharts::addNewByName(OUString const & rName, sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT); MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit(xObject->getMapUnit(nAspect))); Size aSize(aInsRect.GetSize()); - aSize = vcl::Window::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aMapUnit)); + aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aMapUnit)); awt::Size aAwtSize; aAwtSize.Width = aSize.Width(); aAwtSize.Height = aSize.Height(); diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index f158fd0c7686..c3b7e4f47380 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -192,7 +192,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT); MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) )); Size aSize(aInsRect.GetSize()); - aSize = vcl::Window::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) ); + aSize = OutputDevice::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) ); awt::Size aSz; aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 8b1ff61d9710..5db0c8f19ca1 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:57:18 using: + Generated on 2019-09-25 10:58:48 using: ./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -34,6 +34,7 @@ #include <limits.h> #include <limits> #include <list> +#include <map> #include <math.h> #include <memory> #include <new> @@ -87,9 +88,9 @@ #include <vcl/EnumContext.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/IContext.hxx> #include <vcl/IDialogRenderable.hxx> -#include <vcl/NotebookbarContextControl.hxx> +#include <vcl/NotebookBarAddonsMerger.hxx> +#include <vcl/Scanline.hxx> #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -97,10 +98,8 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> -#include <vcl/button.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/devicecoordinate.hxx> @@ -110,7 +109,6 @@ #include <vcl/dockwin.hxx> #include <vcl/edit.hxx> #include <vcl/errcode.hxx> -#include <vcl/field.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -118,25 +116,26 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/imapobj.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lstbox.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> #include <vcl/region.hxx> +#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> -#include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> #include <vcl/task.hxx> +#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> -#include <vcl/toolbox.hxx> #include <vcl/uitest/factory.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> @@ -156,8 +155,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2irange.hxx> -#include <basegfx/range/b2irectangle.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> @@ -170,23 +167,32 @@ #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/datatransfer/DataFlavor.hpp> +#include <com/sun/star/datatransfer/XTransferable2.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> +#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> +#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> +#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/drawing/DashStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/style/NumberingType.hpp> @@ -235,6 +241,7 @@ #include <editeng/editstat.hxx> #include <editeng/eedata.hxx> #include <editeng/eeitem.hxx> +#include <editeng/flstitem.hxx> #include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> @@ -255,11 +262,11 @@ #include <sfx2/linksrc.hxx> #include <sfx2/objsh.hxx> #include <sfx2/shell.hxx> +#include <sot/exchange.hxx> #include <sot/formats.hxx> +#include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/aeitem.hxx> -#include <svl/cenumitm.hxx> -#include <svl/custritm.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> #include <svl/intitem.hxx> @@ -267,6 +274,7 @@ #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> #include <svl/lstner.hxx> +#include <svl/macitem.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> @@ -275,41 +283,33 @@ #include <svl/typedwhich.hxx> #include <svl/undo.hxx> #include <svtools/svtdllapi.h> +#include <svtools/unitconv.hxx> #include <svtools/valueset.hxx> -#include <svx/SvxColorValueSet.hxx> +#include <svx/DiagramDataInterface.hxx> #include <svx/XPropertyEntry.hxx> #include <svx/drawitem.hxx> #include <svx/flagsdef.hxx> #include <svx/itextprovider.hxx> +#include <svx/sdr/properties/defaultproperties.hxx> +#include <svx/sdr/properties/properties.hxx> #include <svx/sdtaditm.hxx> #include <svx/sdtaitm.hxx> #include <svx/sdtakitm.hxx> #include <svx/shapeproperty.hxx> #include <svx/svddef.hxx> -#include <svx/svdhlpln.hxx> #include <svx/svdoattr.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svdsob.hxx> #include <svx/svdtext.hxx> #include <svx/svdtrans.hxx> #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> #include <svx/xdash.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflasit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnasit.hxx> -#include <svx/xpoly.hxx> #include <svx/xtable.hxx> -#include <svx/xtextit0.hxx> #include <tools/color.hxx> -#include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/debug.hxx> @@ -317,6 +317,7 @@ #include <tools/fontenum.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> +#include <tools/globname.hxx> #include <tools/helpers.hxx> #include <tools/lineend.hxx> #include <tools/link.hxx> @@ -340,6 +341,7 @@ #include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 2a336f5a8289..f37b79771f3e 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -42,6 +42,7 @@ class SvNumberFormatter; class SfxErrorHandler; class SfxFrame; struct SfxItemPropertyMapEntry; +class VclSimpleEvent; namespace svtools { class ColorConfig; } namespace com { namespace sun { namespace star { namespace frame { diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index 5d1b13df8234..c0a14425ebc8 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -22,6 +22,7 @@ #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <vcl/weld.hxx> #include <openuriexternally.hxx> #include <comphelper/lok.hxx> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 5aa3316c4c3f..39e0bc1f9899 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -15,6 +15,7 @@ #include <vcl/lok.hxx> #include <vcl/svapp.hxx> #include <vcl/commandevent.hxx> +#include <sal/log.hxx> #include <sfx2/app.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/request.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index e4e61c2d52cd..8157fd390622 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svtools/genericunodialog.hxx> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 419835f56a2c..8ca8a1c33f7e 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -25,6 +25,7 @@ #include <svx/unoapi.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#include <sal/log.hxx> #include <svx/dialmgr.hxx> #include <svx/svdoashp.hxx> #include <svx/strings.hrc> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 7df68dcae221..d370a419866c 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-06-11 16:11:59 using: + Generated on 2019-09-25 10:57:48 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -41,7 +41,6 @@ #include <string.h> #include <type_traits> #include <unordered_map> -#include <unordered_set> #include <utility> #include <vector> #include <boost/circular_buffer.hpp> @@ -51,7 +50,6 @@ #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> -#include <osl/diagnose.hxx> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> #include <osl/file.hxx> @@ -68,7 +66,6 @@ #include <rtl/ref.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.h> -#include <rtl/string.hxx> #include <rtl/stringutils.hxx> #include <rtl/tencinfo.h> #include <rtl/textcvt.h> @@ -85,11 +82,11 @@ #include <sal/types.h> #include <sal/typesizes.h> #include <vcl/EnumContext.hxx> +#include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/button.hxx> -#include <vcl/checksum.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> @@ -110,18 +107,13 @@ #include <vcl/imap.hxx> #include <vcl/imapobj.hxx> #include <vcl/keycod.hxx> -#include <vcl/keycodes.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> -#include <vcl/region.hxx> -#include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> +#include <vcl/textfilter.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> @@ -152,8 +144,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/awt/Key.hpp> -#include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -197,8 +187,6 @@ #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/xml/sax/XFastContextHandler.hpp> #include <comphelper/classids.hxx> @@ -247,6 +235,7 @@ #include <editeng/emphasismarkitem.hxx> #include <editeng/escapementitem.hxx> #include <editeng/fhgtitem.hxx> +#include <editeng/flditem.hxx> #include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/formatbreakitem.hxx> @@ -273,6 +262,7 @@ #include <editeng/sizeitem.hxx> #include <editeng/spltitem.hxx> #include <editeng/svxacorr.hxx> +#include <editeng/svxenum.hxx> #include <editeng/tstpitem.hxx> #include <editeng/twolinesitem.hxx> #include <editeng/udlnitem.hxx> @@ -290,7 +280,6 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/safeint.hxx> -#include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -395,14 +384,12 @@ #include <svx/unomid.hxx> #include <svx/xbtmpit.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xoutbmp.hxx> #include <svx/xtable.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> -#include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/datetimeutils.hxx> #include <tools/diagnose_ex.h> @@ -416,7 +403,6 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/stream.hxx> -#include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> #include <typelib/typedescription.h> @@ -527,6 +513,7 @@ #include <fmtruby.hxx> #include <fmtsrnd.hxx> #include <fmturl.hxx> +#include <fmtwrapinfluenceonobjpos.hxx> #include <frmatr.hxx> #include <frmfmt.hxx> #include <ftnidx.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index e33be09fd4d2..464997c48a58 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:57:52 using: + Generated on 2019-09-25 10:57:13 using: ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -45,7 +45,6 @@ #include <stack> #include <stddef.h> #include <string.h> -#include <string_view> #include <type_traits> #include <typeinfo> #include <utility> @@ -77,6 +76,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> +#include <rtl/uuid.h> #include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> @@ -90,9 +90,9 @@ #include <vcl/GestureEvent.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/IContext.hxx> #include <vcl/IDialogRenderable.hxx> -#include <vcl/NotebookbarContextControl.hxx> +#include <vcl/NotebookBarAddonsMerger.hxx> +#include <vcl/Scanline.hxx> #include <vcl/abstdlg.hxx> #include <vcl/accel.hxx> #include <vcl/accessibletableprovider.hxx> @@ -102,12 +102,10 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> -#include <vcl/builderfactory.hxx> #include <vcl/button.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/combobox.hxx> -#include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/devicecoordinate.hxx> @@ -117,7 +115,6 @@ #include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> -#include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> @@ -131,7 +128,6 @@ #include <vcl/image.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> -#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> @@ -152,19 +148,17 @@ #include <vcl/spinfld.hxx> #include <vcl/status.hxx> #include <vcl/svapp.hxx> -#include <vcl/svtabbx.hxx> #include <vcl/syswin.hxx> -#include <vcl/tabpage.hxx> #include <vcl/task.hxx> +#include <vcl/textfilter.hxx> #include <vcl/timer.hxx> -#include <vcl/toolbox.hxx> #include <vcl/transfer.hxx> #include <vcl/treelist.hxx> #include <vcl/treelistbox.hxx> #include <vcl/treelistentries.hxx> -#include <vcl/treelistentry.hxx> #include <vcl/uitest/factory.hxx> #include <vcl/vclenum.hxx> +#include <vcl/vclevent.hxx> #include <vcl/vclmedit.hxx> #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> @@ -202,6 +196,7 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.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/container/XEnumeration.hpp> @@ -209,6 +204,7 @@ #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> @@ -226,12 +222,14 @@ #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> +#include <com/sun/star/document/XShapeEventBroadcaster.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XVisualObject.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/XModule.hpp> @@ -261,7 +259,6 @@ #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/PositionLayoutDir.hpp> @@ -300,6 +297,7 @@ #include <com/sun/star/view/XPrintable.hpp> #include <comphelper/comphelperdllapi.h> #include <comphelper/processfactory.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> @@ -320,15 +318,12 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <editeng/borderline.hxx> +#include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> -#include <editeng/colritem.hxx> -#include <editeng/contouritem.hxx> -#include <editeng/crossedoutitem.hxx> #include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> #include <editeng/editstat.hxx> #include <editeng/eedata.hxx> -#include <editeng/fhgtitem.hxx> #include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/frmdiritem.hxx> @@ -338,16 +333,12 @@ #include <editeng/numitem.hxx> #include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> -#include <editeng/postitem.hxx> #include <editeng/scripttypeitem.hxx> -#include <editeng/shdditem.hxx> #include <editeng/sizeitem.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> -#include <editeng/udlnitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/unolingu.hxx> -#include <editeng/wghtitem.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> @@ -373,6 +364,7 @@ #include <sfx2/linksrc.hxx> #include <sfx2/lnkbase.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/printer.hxx> #include <sfx2/request.hxx> #include <sfx2/shell.hxx> #include <sfx2/tabdlg.hxx> @@ -393,7 +385,6 @@ #include <svl/languageoptions.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> -#include <svl/memberid.h> #include <svl/nfkeytab.hxx> #include <svl/ondemand.hxx> #include <svl/poolitem.hxx> @@ -423,7 +414,6 @@ #include <svx/svxdllapi.h> #include <svx/unomod.hxx> #include <svx/xdef.hxx> -#include <svx/xenum.hxx> #include <svx/xtable.hxx> #include <tools/color.hxx> #include <tools/contnr.hxx> @@ -444,7 +434,6 @@ #include <tools/solar.h> #include <tools/time.hxx> #include <tools/toolsdllapi.h> -#include <tools/weakbase.h> #include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> @@ -454,7 +443,6 @@ #include <uno/sequence2.h> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> -#include <unotools/collatorwrapper.hxx> #include <unotools/configitem.hxx> #include <unotools/configmgr.hxx> #include <unotools/fontcvt.hxx> @@ -503,6 +491,7 @@ #include <index.hxx> #include <modcfg.hxx> #include <ndarr.hxx> +#include <ndhints.hxx> #include <ndindex.hxx> #include <ndtxt.hxx> #include <ndtyp.hxx> diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index d07ca12500d7..fc979912b866 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -24,6 +24,7 @@ #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/roadmapwizard.hxx> +#include <vcl/tabpage.hxx> struct ImplWizPageData { |