summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2021-09-03 02:19:33 +1000
committerTomaž Vajngerl <quikee@gmail.com>2021-09-28 08:20:32 +0200
commit4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch)
treec67ddea9c5551e069cb75fe0901cdcfa3f00b054 /canvas
parent1734e97222324c137ecd084ad2464abdff2698d1 (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 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx12
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx10
-rw-r--r--canvas/source/vcl/canvashelper.cxx12
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx8
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx2
-rw-r--r--canvas/source/vcl/spritehelper.cxx2
-rw-r--r--canvas/source/vcl/textlayout.cxx10
7 files changed, 28 insertions, 28 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 2763800d5283..c5f387e27c60 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -226,21 +226,21 @@ namespace cairocanvas
return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary
// change text direction and layout mode
- ComplexTextLayoutFlags nLayoutMode(ComplexTextLayoutFlags::Default);
+ vcl::text::ComplexTextLayoutFlags nLayoutMode(vcl::text::ComplexTextLayoutFlags::Default);
switch( textDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiStrong;
- nLayoutMode |= ComplexTextLayoutFlags::TextOriginLeft;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::TextOriginLeft;
break;
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiRtl;
[[fallthrough]];
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong;
- nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::TextOriginRight;
break;
}
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 6a1bfc27eece..9952d33d343c 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -46,19 +46,19 @@ namespace cairocanvas
sal_Int8 nTextDirection )
{
// TODO(P3): avoid if already correctly set
- ComplexTextLayoutFlags nLayoutMode = ComplexTextLayoutFlags::Default;
+ vcl::text::ComplexTextLayoutFlags nLayoutMode = vcl::text::ComplexTextLayoutFlags::Default;
switch( nTextDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
break;
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiStrong;
break;
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiRtl;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl;
break;
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::BiDiStrong;
break;
default:
break;
@@ -66,7 +66,7 @@ namespace cairocanvas
// set calculated layout mode. Origin is always the left edge,
// as required at the API spec
- rOutDev.SetLayoutMode( nLayoutMode | ComplexTextLayoutFlags::TextOriginLeft );
+ rOutDev.SetLayoutMode( nLayoutMode | vcl::text::ComplexTextLayoutFlags::TextOriginLeft );
}
}
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 04fd39b95e70..69ef1922de5a 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -565,21 +565,21 @@ namespace vclcanvas
return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary
// change text direction and layout mode
- ComplexTextLayoutFlags nLayoutMode(ComplexTextLayoutFlags::Default);
+ vcl::text::ComplexTextLayoutFlags nLayoutMode(vcl::text::ComplexTextLayoutFlags::Default);
switch( textDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiStrong;
- nLayoutMode |= ComplexTextLayoutFlags::TextOriginLeft;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::TextOriginLeft;
break;
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiRtl;
[[fallthrough]];
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
- nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong;
- nLayoutMode |= ComplexTextLayoutFlags::TextOriginRight;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode |= vcl::text::ComplexTextLayoutFlags::TextOriginRight;
break;
}
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index b397ffcb7d2e..f181fe30669b 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -526,7 +526,7 @@ namespace vclcanvas
// poly-polygons, and don't have to output the gradient
// twice for XOR
- rOutDev.Push( PushFlags::CLIPREGION );
+ rOutDev.Push( vcl::PushFlags::CLIPREGION );
rOutDev.IntersectClipRegion( aPolygonDeviceRectOrig );
doGradientFill( rOutDev,
rValues,
@@ -550,7 +550,7 @@ namespace vclcanvas
{
const vcl::Region aPolyClipRegion( rPoly );
- rOutDev.Push( PushFlags::CLIPREGION );
+ rOutDev.Push( vcl::PushFlags::CLIPREGION );
rOutDev.IntersectClipRegion( aPolyClipRegion );
doGradientFill( rOutDev,
@@ -1030,7 +1030,7 @@ namespace vclcanvas
{
const vcl::Region aPolyClipRegion( aPolyPoly );
- rOutDev.Push( PushFlags::CLIPREGION );
+ rOutDev.Push( vcl::PushFlags::CLIPREGION );
rOutDev.IntersectClipRegion( aPolyClipRegion );
textureFill( rOutDev,
@@ -1047,7 +1047,7 @@ namespace vclcanvas
if( mp2ndOutDevProvider )
{
OutputDevice& r2ndOutDev( mp2ndOutDevProvider->getOutDev() );
- r2ndOutDev.Push( PushFlags::CLIPREGION );
+ r2ndOutDev.Push( vcl::PushFlags::CLIPREGION );
r2ndOutDev.IntersectClipRegion( aPolyClipRegion );
textureFill( r2ndOutDev,
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 37a425e7a486..2eb622431e63 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -406,7 +406,7 @@ namespace vclcanvas
// repaint uncovered areas from sprite. Need to actually
// clip here, since we're only repainting _parts_ of the
// sprite
- rOutDev.Push( PushFlags::CLIPREGION );
+ rOutDev.Push( vcl::PushFlags::CLIPREGION );
for( const auto& rArea : aUnscrollableAreas )
opaqueUpdateSpriteArea( aFirst->second.getSprite(),
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 89cc33d7a2d4..01ed44b9be98 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -149,7 +149,7 @@ namespace vclcanvas
::basegfx::B2DHomMatrix aTransform( getTransformation() );
- rTargetSurface.Push( PushFlags::CLIPREGION );
+ rTargetSurface.Push( vcl::PushFlags::CLIPREGION );
// apply clip (if any)
if( getClip().is() )
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index eee17aefe460..cb5fb09d2d83 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -50,19 +50,19 @@ namespace vclcanvas
sal_Int8 nTextDirection )
{
// TODO(P3): avoid if already correctly set
- ComplexTextLayoutFlags nLayoutMode = ComplexTextLayoutFlags::Default;
+ vcl::text::ComplexTextLayoutFlags nLayoutMode = vcl::text::ComplexTextLayoutFlags::Default;
switch( nTextDirection )
{
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
break;
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiStrong;
break;
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiRtl;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl;
break;
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
- nLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong;
+ nLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::BiDiStrong;
break;
default:
break;
@@ -70,7 +70,7 @@ namespace vclcanvas
// set calculated layout mode. Origin is always the left edge,
// as required at the API spec
- rOutDev.SetLayoutMode( nLayoutMode | ComplexTextLayoutFlags::TextOriginLeft );
+ rOutDev.SetLayoutMode( nLayoutMode | vcl::text::ComplexTextLayoutFlags::TextOriginLeft );
}
}