diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-03 02:19:33 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-09-28 08:20:32 +0200 |
commit | 4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch) | |
tree | c67ddea9c5551e069cb75fe0901cdcfa3f00b054 /reportdesign | |
parent | 1734e97222324c137ecd084ad2464abdff2698d1 (diff) |
vcl: rename OutDevState to Stack
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/inc/pch/precompiled_rpt.hxx | 25 | ||||
-rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 22 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ColorChanger.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 4 |
4 files changed, 40 insertions, 13 deletions
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 09123d849900..57b8af3d1663 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.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 2021-05-14 22:16:08 using: + Generated on 2021-09-12 11:51:50 using: ./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,6 +25,7 @@ #include <algorithm> #include <array> #include <cassert> +#include <chrono> #include <cmath> #include <cstddef> #include <cstdlib> @@ -44,6 +45,7 @@ #include <optional> #include <ostream> #include <stddef.h> +#include <stdexcept> #include <string.h> #include <string> #include <string_view> @@ -64,6 +66,7 @@ #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/thread.h> +#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> #include <rtl/locale.h> @@ -76,6 +79,7 @@ #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> +#include <rtl/unload.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -108,7 +112,6 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -119,7 +122,10 @@ #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/rendercontext/ImplMapRes.hxx> #include <vcl/rendercontext/InvertFlags.hxx> +#include <vcl/rendercontext/RasterOp.hxx> #include <vcl/rendercontext/SalLayoutFlags.hxx> +#include <vcl/rendercontext/State.hxx> +#include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/task.hxx> @@ -140,6 +146,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Tuple2D.hxx> +#include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> @@ -149,11 +157,15 @@ #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -201,6 +213,7 @@ #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -210,15 +223,15 @@ #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> #include <editeng/editengdllapi.h> +#include <editeng/outlobj.hxx> +#include <editeng/paragraphdata.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.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> #include <o3tl/unit_conversion.hxx> -#include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> #include <svl/SfxBroadcaster.hxx> #include <svl/cenumitm.hxx> @@ -231,6 +244,7 @@ #include <svl/stylesheetuser.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> +#include <svl/whichranges.hxx> #include <svx/DiagramDataInterface.hxx> #include <svx/itextprovider.hxx> #include <svx/sdr/properties/defaultproperties.hxx> @@ -275,9 +289,10 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> +#include <unotools/resmgr.hxx> +#include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 03ed63383743..e3bf1419e116 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 2021-05-14 22:16:21 using: + Generated on 2021-09-12 11:51: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: @@ -42,12 +42,14 @@ #include <map> #include <math.h> #include <memory> +#include <mutex> #include <new> #include <numeric> #include <optional> #include <ostream> #include <sstream> #include <stddef.h> +#include <stdexcept> #include <string.h> #include <string> #include <string_view> @@ -130,7 +132,6 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -141,7 +142,10 @@ #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/rendercontext/ImplMapRes.hxx> #include <vcl/rendercontext/InvertFlags.hxx> +#include <vcl/rendercontext/RasterOp.hxx> #include <vcl/rendercontext/SalLayoutFlags.hxx> +#include <vcl/rendercontext/State.hxx> +#include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> @@ -173,6 +177,8 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Tuple2D.hxx> +#include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> @@ -191,6 +197,7 @@ #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/XVclWindowPeer.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -233,6 +240,7 @@ #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/report/XReportComponent.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -261,6 +269,7 @@ #include <com/sun/star/util/Time.hpp> #include <comphelper/comphelperdllapi.h> #include <comphelper/interfacecontainer2.hxx> +#include <comphelper/multicontainer2.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/sequence.hxx> @@ -279,7 +288,6 @@ #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -299,6 +307,8 @@ #include <editeng/forbiddencharacterstable.hxx> #include <editeng/macros.hxx> #include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/overflowingtxt.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> @@ -341,6 +351,7 @@ #include <svl/languageoptions.hxx> #include <svl/lstner.hxx> #include <svl/poolitem.hxx> +#include <svl/setitem.hxx> #include <svl/sharedstring.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> @@ -348,10 +359,10 @@ #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svl/undo.hxx> +#include <svl/whichranges.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> -#include <svtools/optionsdrawinglayer.hxx> #include <svtools/statusbarcontroller.hxx> #include <svtools/svtdllapi.h> #include <svx/DiagramDataInterface.hxx> @@ -438,16 +449,17 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> +#include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <AddField.hxx> #include <DesignView.hxx> +#include <IReportControllerObserver.hxx> #include <ReportController.hxx> #include <ReportSection.hxx> #include <ReportWindow.hxx> diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index bbed0a0c1273..34a336b01a41 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -34,7 +34,7 @@ namespace rptui ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) :m_pDev( _pDev ) { - m_pDev->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + m_pDev->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); m_pDev->SetLineColor( _rNewLineColor ); m_pDev->SetFillColor( _rNewFillColor ); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 69bb14bf756c..150f7aff5156 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -97,7 +97,7 @@ sal_Int32 OStartMarker::getMinHeight() const void OStartMarker::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { - rRenderContext.Push(PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::TEXTCOLOR); Size aSize(GetOutputSizePixel()); const tools::Long nCornerWidth = tools::Long(CORNER_SPACE * double(GetMapMode().GetScaleX())); @@ -135,7 +135,7 @@ void OStartMarker::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan rRenderContext.DrawGradient(PixelToLogic(aPoly) ,aGradient); } - rRenderContext.Push(PushFlags::MAPMODE); + rRenderContext.Push(vcl::PushFlags::MAPMODE); rRenderContext.SetMapMode(); rRenderContext.DrawImage(m_aImageRect.TopLeft(), m_aImageRect.GetSize(), m_aImage); |