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 /filter | |
parent | tdf#143819 sw: fix undo not restoring adjusted anchor (diff) | |
download | core-4dd6af856d574ad66ebb4b822a36ba70af9945e2.tar.gz core-4dd6af856d574ad66ebb4b822a36ba70af9945e2.zip |
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 'filter')
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 22 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 34b4f1a255a5..9d4e885ef269 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -88,10 +88,10 @@ const char aXMLAttrStrokeLinejoin[] = "stroke-linejoin"; const char aXMLAttrStrokeLinecap[] = "stroke-linecap"; -PushFlags SVGContextHandler::getPushFlags() const +vcl::PushFlags SVGContextHandler::getPushFlags() const { if (maStateStack.empty()) - return PushFlags::NONE; + return vcl::PushFlags::NONE; const PartialState& rPartialState = maStateStack.top(); return rPartialState.meFlags; @@ -102,17 +102,17 @@ SVGState& SVGContextHandler::getCurrentState() return maCurrentState; } -void SVGContextHandler::pushState( PushFlags eFlags ) +void SVGContextHandler::pushState( vcl::PushFlags eFlags ) { PartialState aPartialState; aPartialState.meFlags = eFlags; - if (eFlags & PushFlags::FONT) + if (eFlags & vcl::PushFlags::FONT) { aPartialState.setFont( maCurrentState.aFont ); } - if (eFlags & PushFlags::CLIPREGION) + if (eFlags & vcl::PushFlags::CLIPREGION) { aPartialState.mnRegionClipPathId = maCurrentState.nRegionClipPathId; } @@ -126,14 +126,14 @@ void SVGContextHandler::popState() return; const PartialState& rPartialState = maStateStack.top(); - PushFlags eFlags = rPartialState.meFlags; + vcl::PushFlags eFlags = rPartialState.meFlags; - if (eFlags & PushFlags::FONT) + if (eFlags & vcl::PushFlags::FONT) { maCurrentState.aFont = rPartialState.getFont( vcl::Font() ); } - if (eFlags & PushFlags::CLIPREGION) + if (eFlags & vcl::PushFlags::CLIPREGION) { maCurrentState.nRegionClipPathId = rPartialState.mnRegionClipPathId; } @@ -3858,7 +3858,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, case MetaActionType::PUSH: { const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); - PushFlags mnFlags = pA->GetFlags(); + vcl::PushFlags mnFlags = pA->GetFlags(); const_cast<MetaAction*>(pAction)->Execute( mpVDev ); @@ -3870,11 +3870,11 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { const_cast<MetaAction*>(pAction)->Execute( mpVDev ); - PushFlags mnFlags = maContextHandler.getPushFlags(); + vcl::PushFlags mnFlags = maContextHandler.getPushFlags(); maContextHandler.popState(); - if( mnFlags & PushFlags::CLIPREGION ) + if( mnFlags & vcl::PushFlags::CLIPREGION ) { ImplEndClipRegion(); ImplStartClipRegion( mrCurrentState.nRegionClipPathId ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 7f0526d62fb9..e3fd2558498b 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -77,7 +77,7 @@ struct SVGState struct PartialState { - PushFlags meFlags; + vcl::PushFlags meFlags; ::std::optional<vcl::Font> mupFont; sal_Int32 mnRegionClipPathId; @@ -88,7 +88,7 @@ struct PartialState { mupFont = rFont; } PartialState() - : meFlags( PushFlags::NONE ) + : meFlags( vcl::PushFlags::NONE ) , mupFont() , mnRegionClipPathId( 0 ) {} @@ -98,7 +98,7 @@ struct PartialState , mupFont( std::move( aPartialState.mupFont ) ) , mnRegionClipPathId( aPartialState.mnRegionClipPathId ) { - aPartialState.meFlags = PushFlags::NONE; + aPartialState.meFlags = vcl::PushFlags::NONE; aPartialState.mnRegionClipPathId = 0; } }; @@ -113,9 +113,9 @@ private: SVGState maCurrentState; public: - PushFlags getPushFlags() const; + vcl::PushFlags getPushFlags() const; SVGState& getCurrentState(); - void pushState( PushFlags eFlags ); + void pushState( vcl::PushFlags eFlags ); void popState(); }; |