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 /cppcanvas/source/inc | |
| 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 'cppcanvas/source/inc')
| -rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/inc/outdevstate.hxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 4b432f898260..93b68f9410ad 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -63,7 +63,7 @@ namespace cppcanvas::internal public: OutDevState& getState(); const OutDevState& getState() const; - void pushState(PushFlags nFlags); + void pushState(vcl::PushFlags nFlags); void popState(); void clearStateStack(); private: diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx index 16cc3c4ff25a..275b7b4314de 100644 --- a/cppcanvas/source/inc/outdevstate.hxx +++ b/cppcanvas/source/inc/outdevstate.hxx @@ -30,8 +30,7 @@ #include <tools/fontenum.hxx> #include <tools/gen.hxx> #include <vcl/fntstyle.hxx> -#include <vcl/outdevstate.hxx> - +#include <vcl/rendercontext/State.hxx> namespace cppcanvas::internal { @@ -55,7 +54,7 @@ namespace cppcanvas::internal fontRotation(0.0), textEmphasisMark(FontEmphasisMark::NONE), - pushFlags(PushFlags::ALL), + pushFlags(vcl::PushFlags::ALL), textDirection(css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT), textAlignment(0), // TODO(Q2): Synchronize with implrenderer // and possibly new rendering::TextAlignment @@ -99,7 +98,7 @@ namespace cppcanvas::internal double fontRotation; FontEmphasisMark textEmphasisMark; - PushFlags pushFlags; + vcl::PushFlags pushFlags; sal_Int8 textDirection; sal_Int8 textAlignment; FontRelief textReliefStyle; |