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/source/tools | |
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/source/tools')
-rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index a7beae35ed83..f7c01f3330c1 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -114,9 +114,9 @@ namespace wmfemfhelper : maMapUnit(MapUnit::Map100thMM), maTextColor(sal_uInt32(COL_BLACK)), maRasterOp(RasterOp::OverPaint), - mnLayoutMode(ComplexTextLayoutFlags::Default), + mnLayoutMode(vcl::text::ComplexTextLayoutFlags::Default), maLanguageType(0), - mnPushFlags(PushFlags::NONE), + mnPushFlags(vcl::PushFlags::NONE), mbLineColor(false), mbFillColor(false), mbTextColor(true), @@ -150,7 +150,7 @@ namespace wmfemfhelper maPropertyHolders.push_back(pNew); } - void PropertyHolders::Push(PushFlags nPushFlags) + void PropertyHolders::Push(vcl::PushFlags nPushFlags) { if (bool(nPushFlags)) { @@ -173,56 +173,56 @@ namespace wmfemfhelper return; const PropertyHolder* pTip = maPropertyHolders.back(); - const PushFlags nPushFlags(pTip->getPushFlags()); + const vcl::PushFlags nPushFlags(pTip->getPushFlags()); - if (nPushFlags != PushFlags::NONE) + if (nPushFlags != vcl::PushFlags::NONE) { if (nSize > 1) { // copy back content for all non-set flags PropertyHolder* pLast = maPropertyHolders[nSize - 2]; - if (PushFlags::ALL != nPushFlags) + if (vcl::PushFlags::ALL != nPushFlags) { - if (!(nPushFlags & PushFlags::LINECOLOR)) + if (!(nPushFlags & vcl::PushFlags::LINECOLOR)) { pLast->setLineColor(pTip->getLineColor()); pLast->setLineColorActive(pTip->getLineColorActive()); } - if (!(nPushFlags & PushFlags::FILLCOLOR)) + if (!(nPushFlags & vcl::PushFlags::FILLCOLOR)) { pLast->setFillColor(pTip->getFillColor()); pLast->setFillColorActive(pTip->getFillColorActive()); } - if (!(nPushFlags & PushFlags::FONT)) + if (!(nPushFlags & vcl::PushFlags::FONT)) { pLast->setFont(pTip->getFont()); } - if (!(nPushFlags & PushFlags::TEXTCOLOR)) + if (!(nPushFlags & vcl::PushFlags::TEXTCOLOR)) { pLast->setTextColor(pTip->getTextColor()); pLast->setTextColorActive(pTip->getTextColorActive()); } - if (!(nPushFlags & PushFlags::MAPMODE)) + if (!(nPushFlags & vcl::PushFlags::MAPMODE)) { pLast->setTransformation(pTip->getTransformation()); pLast->setMapUnit(pTip->getMapUnit()); } - if (!(nPushFlags & PushFlags::CLIPREGION)) + if (!(nPushFlags & vcl::PushFlags::CLIPREGION)) { pLast->setClipPolyPolygon(pTip->getClipPolyPolygon()); pLast->setClipPolyPolygonActive(pTip->getClipPolyPolygonActive()); } - if (!(nPushFlags & PushFlags::RASTEROP)) + if (!(nPushFlags & vcl::PushFlags::RASTEROP)) { pLast->setRasterOp(pTip->getRasterOp()); } - if (!(nPushFlags & PushFlags::TEXTFILLCOLOR)) + if (!(nPushFlags & vcl::PushFlags::TEXTFILLCOLOR)) { pLast->setTextFillColor(pTip->getTextFillColor()); pLast->setTextFillColorActive(pTip->getTextFillColorActive()); } - if (!(nPushFlags & PushFlags::TEXTALIGN)) + if (!(nPushFlags & vcl::PushFlags::TEXTALIGN)) { if (pLast->getFont().GetAlignment() != pTip->getFont().GetAlignment()) { @@ -231,24 +231,24 @@ namespace wmfemfhelper pLast->setFont(aFont); } } - if (!(nPushFlags & PushFlags::REFPOINT)) + if (!(nPushFlags & vcl::PushFlags::REFPOINT)) { // not supported } - if (!(nPushFlags & PushFlags::TEXTLINECOLOR)) + if (!(nPushFlags & vcl::PushFlags::TEXTLINECOLOR)) { pLast->setTextLineColor(pTip->getTextLineColor()); pLast->setTextLineColorActive(pTip->getTextLineColorActive()); } - if (!(nPushFlags & PushFlags::TEXTLAYOUTMODE)) + if (!(nPushFlags & vcl::PushFlags::TEXTLAYOUTMODE)) { pLast->setLayoutMode(pTip->getLayoutMode()); } - if (!(nPushFlags & PushFlags::TEXTLANGUAGE)) + if (!(nPushFlags & vcl::PushFlags::TEXTLANGUAGE)) { pLast->setLanguageType(pTip->getLanguageType()); } - if (!(nPushFlags & PushFlags::OVERLINECOLOR)) + if (!(nPushFlags & vcl::PushFlags::OVERLINECOLOR)) { pLast->setOverlineColor(pTip->getOverlineColor()); pLast->setOverlineColorActive(pTip->getOverlineColorActive()); @@ -1061,8 +1061,8 @@ namespace wmfemfhelper rFontAttribute = drawinglayer::primitive2d::getFontAttributeFromVclFont( aFontScaling, rFont, - bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiRtl), - bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiStrong)); + bool(rProperty.getLayoutMode() & vcl::text::ComplexTextLayoutFlags::BiDiRtl), + bool(rProperty.getLayoutMode() & vcl::text::ComplexTextLayoutFlags::BiDiStrong)); // add FontScaling rTextTransform.scale(aFontScaling.getX(), aFontScaling.getY()); @@ -2600,8 +2600,8 @@ namespace wmfemfhelper case MetaActionType::POP : { /** CHECKED, WORKS WELL */ - const bool bRegionMayChange(rPropertyHolders.Current().getPushFlags() & PushFlags::CLIPREGION); - const bool bRasterOpMayChange(rPropertyHolders.Current().getPushFlags() & PushFlags::RASTEROP); + const bool bRegionMayChange(rPropertyHolders.Current().getPushFlags() & vcl::PushFlags::CLIPREGION); + const bool bRasterOpMayChange(rPropertyHolders.Current().getPushFlags() & vcl::PushFlags::RASTEROP); if(bRegionMayChange && rPropertyHolders.Current().getClipPolyPolygonActive()) { |