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>

4 files changed, 15 insertions, 15 deletions

diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index b0945f7806ef..527eae4a5a57 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -26,7 +26,7 @@
 #include <vcl/font.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/outdevstate.hxx>
+#include <vcl/rendercontext/State.hxx>
 #include <rtl/ref.hxx>
 
 #include "emfiodllapi.h"
@@ -439,7 +439,7 @@ namespace emfio
     {
         BkMode              nBkMode;
         sal_uInt32          nMapMode, nGfxMode;
-        ComplexTextLayoutFlags nTextLayoutMode;
+        vcl::text::ComplexTextLayoutFlags nTextLayoutMode;
         sal_Int32           nWinOrgX, nWinOrgY, nWinExtX, nWinExtY;
         sal_Int32           nDevOrgX, nDevOrgY, nDevWidth, nDevHeight;
 
@@ -525,8 +525,8 @@ namespace emfio
         Color               maTextColor;
         Color               maLatestBkColor;
         Color               maBkColor;
-        ComplexTextLayoutFlags  mnLatestTextLayoutMode;
-        ComplexTextLayoutFlags  mnTextLayoutMode;
+        vcl::text::ComplexTextLayoutFlags  mnLatestTextLayoutMode;
+        vcl::text::ComplexTextLayoutFlags  mnTextLayoutMode;
         BkMode              mnLatestBkMode;
         BkMode              mnBkMode;
         RasterOp            meLatestRasterOp;
@@ -634,7 +634,7 @@ namespace emfio
         void                SelectObject(sal_uInt32 nIndex);
         rtl_TextEncoding    GetCharSet() const { return maFont.GetCharSet(); };
         const vcl::Font&    GetFont() const { return maFont; }
-        void                SetTextLayoutMode(ComplexTextLayoutFlags nLayoutMode);
+        void                SetTextLayoutMode(vcl::text::ComplexTextLayoutFlags nLayoutMode);
 
         void                ClearPath() { maPathObj.Init(); };
         void                ClosePath() { maPathObj.ClosePath(); };
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index ab4f905990d5..b75d16c5759f 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1909,9 +1909,9 @@ namespace emfio
                             else if ( nOptions & ETO_OPAQUE )
                                 DrawRectWithBGColor( aRect );
 
-                            ComplexTextLayoutFlags nTextLayoutMode = ComplexTextLayoutFlags::Default;
+                            vcl::text::ComplexTextLayoutFlags nTextLayoutMode = vcl::text::ComplexTextLayoutFlags::Default;
                             if ( nOptions & ETO_RTLREADING )
-                                nTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft;
+                                nTextLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft;
                             SetTextLayoutMode( nTextLayoutMode );
                             SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "emfio", "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
 
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 07143b8168af..f78fee7bd5d9 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -894,7 +894,7 @@ namespace emfio
         }
     }
 
-    void MtfTools::SetTextLayoutMode( ComplexTextLayoutFlags nTextLayoutMode )
+    void MtfTools::SetTextLayoutMode( vcl::text::ComplexTextLayoutFlags nTextLayoutMode )
     {
         mnTextLayoutMode = nTextLayoutMode;
     }
@@ -1098,8 +1098,8 @@ namespace emfio
         mnTextAlign(TA_LEFT | TA_TOP | TA_NOUPDATECP),
         maLatestBkColor(ColorTransparency, 0x12345678),
         maBkColor(COL_WHITE),
-        mnLatestTextLayoutMode(ComplexTextLayoutFlags::Default),
-        mnTextLayoutMode(ComplexTextLayoutFlags::Default),
+        mnLatestTextLayoutMode(vcl::text::ComplexTextLayoutFlags::Default),
+        mnTextLayoutMode(vcl::text::ComplexTextLayoutFlags::Default),
         mnLatestBkMode(BkMode::NONE),
         mnBkMode(BkMode::OPAQUE),
         meLatestRasterOp(RasterOp::Invert),
@@ -1140,7 +1140,7 @@ namespace emfio
         mnStartPos = mpInputStream->Tell();
         SetDevOrg(Point());
 
-        mpGDIMetaFile->AddAction( new MetaPushAction( PushFlags::CLIPREGION ) ); // The original clipregion has to be on top
+        mpGDIMetaFile->AddAction( new MetaPushAction( vcl::PushFlags::CLIPREGION ) ); // The original clipregion has to be on top
                                                                                  // of the stack so it can always be restored
                                                                                  // this is necessary to be able to support
                                                                                  // SetClipRgn( NULL ) and similar ClipRgn actions (SJ)
@@ -1176,7 +1176,7 @@ namespace emfio
         mbComplexClip = false;
 
         mpGDIMetaFile->AddAction( new MetaPopAction() );                    // taking the original clipregion
-        mpGDIMetaFile->AddAction( new MetaPushAction( PushFlags::CLIPREGION ) );
+        mpGDIMetaFile->AddAction( new MetaPushAction( vcl::PushFlags::CLIPREGION ) );
 
         // skip for 'no clipping at all' case
         if( maClipPath.isEmpty() )
@@ -1294,7 +1294,7 @@ namespace emfio
         {
             if ( !bStroke )
             {
-                mpGDIMetaFile->AddAction( new MetaPushAction( PushFlags::LINECOLOR ) );
+                mpGDIMetaFile->AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) );
                 mpGDIMetaFile->AddAction( new MetaLineColorAction( Color(), false ) );
             }
             if ( maPathObj.Count() == 1 )
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 2567ca4939cf..bcee84cd386d 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -688,9 +688,9 @@ namespace emfio
                     SAL_INFO( "emfio", "\t\t\t Rectangle : " << aTopLeft.getX() << ":" << aTopLeft.getY() << ", " << aBottomRight.getX() << ":" << aBottomRight.getY() );
                 }
 
-                ComplexTextLayoutFlags nTextLayoutMode = ComplexTextLayoutFlags::Default;
+                vcl::text::ComplexTextLayoutFlags nTextLayoutMode = vcl::text::ComplexTextLayoutFlags::Default;
                 if ( nOptions & ETO_RTLREADING )
-                    nTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft;
+                    nTextLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft;
                 SetTextLayoutMode( nTextLayoutMode );
                 SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "emfio", "SJ: ETO_PDY || ETO_GLYPH_INDEX in WMF" );