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 /drawinglayer/inc/wmfemfhelper.hxx | |
| 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 'drawinglayer/inc/wmfemfhelper.hxx')
| -rw-r--r-- | drawinglayer/inc/wmfemfhelper.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx index d24ab2fd02c7..4a6bbe81228c 100644 --- a/drawinglayer/inc/wmfemfhelper.hxx +++ b/drawinglayer/inc/wmfemfhelper.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/font.hxx> #include <rtl/ref.hxx> -#include <vcl/outdevstate.hxx> +#include <vcl/rendercontext/State.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <memory> @@ -100,9 +100,9 @@ namespace wmfemfhelper /// font, etc. vcl::Font maFont; RasterOp maRasterOp; - ComplexTextLayoutFlags mnLayoutMode; + vcl::text::ComplexTextLayoutFlags mnLayoutMode; LanguageType maLanguageType; - PushFlags mnPushFlags; + vcl::PushFlags mnPushFlags; /// contains all active markers bool mbLineColor : 1; @@ -167,14 +167,14 @@ namespace wmfemfhelper bool isRasterOpForceBlack() const { return RasterOp::N0 == maRasterOp; } bool isRasterOpActive() const { return isRasterOpInvert() || isRasterOpForceBlack(); } - ComplexTextLayoutFlags getLayoutMode() const { return mnLayoutMode; } - void setLayoutMode(ComplexTextLayoutFlags nNew) { if (nNew != mnLayoutMode) mnLayoutMode = nNew; } + vcl::text::ComplexTextLayoutFlags getLayoutMode() const { return mnLayoutMode; } + void setLayoutMode(vcl::text::ComplexTextLayoutFlags nNew) { if (nNew != mnLayoutMode) mnLayoutMode = nNew; } LanguageType getLanguageType() const { return maLanguageType; } void setLanguageType(LanguageType aNew) { if (aNew != maLanguageType) maLanguageType = aNew; } - PushFlags getPushFlags() const { return mnPushFlags; } - void setPushFlags(PushFlags nNew) { if (nNew != mnPushFlags) mnPushFlags = nNew; } + vcl::PushFlags getPushFlags() const { return mnPushFlags; } + void setPushFlags(vcl::PushFlags nNew) { if (nNew != mnPushFlags) mnPushFlags = nNew; } bool getLineOrFillActive() const { return (mbLineColor || mbFillColor); } }; @@ -196,7 +196,7 @@ namespace wmfemfhelper public: PropertyHolders(); void PushDefault(); - void Push(PushFlags nPushFlags); + void Push(vcl::PushFlags nPushFlags); void Pop(); PropertyHolder& Current(); ~PropertyHolders(); |