diff options
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; |