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>

8 files changed, 35 insertions, 27 deletions

diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 7d48509dd112..2c8ce3f5b588 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-05-14 22:16:51 using:
+ Generated on 2021-09-12 11:52:19 using:
  ./bin/update_pch starmath sm --cutoff=5 --exclude:system --exclude:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -30,7 +30,6 @@
 #include <functional>
 #include <limits.h>
 #include <limits>
-#include <map>
 #include <memory>
 #include <new>
 #include <optional>
@@ -48,7 +47,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/alloc.h>
 #include <rtl/character.hxx>
-#include <rtl/instance.hxx>
 #include <rtl/locale.h>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
@@ -60,7 +58,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
 #include <sal/log.hxx>
 #include <sal/types.h>
 #include <vcl/bitmap.hxx>
@@ -74,7 +71,6 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/outdevstate.hxx>
 #include <vcl/region.hxx>
 #include <vcl/rendercontext/AddFontSubstituteFlags.hxx>
 #include <vcl/rendercontext/AntialiasingFlags.hxx>
@@ -85,7 +81,10 @@
 #include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/rendercontext/ImplMapRes.hxx>
 #include <vcl/rendercontext/InvertFlags.hxx>
+#include <vcl/rendercontext/RasterOp.hxx>
 #include <vcl/rendercontext/SalLayoutFlags.hxx>
+#include <vcl/rendercontext/State.hxx>
+#include <vcl/rendercontext/SystemTextColorFlags.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -101,21 +100,28 @@
 #include <basegfx/vector/b2enums.hxx>
 #include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <comphelper/fileformat.h>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/propertysetinfo.hxx>
+#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editengdllapi.h>
+#include <editeng/editobj.hxx>
 #include <editeng/editstat.hxx>
+#include <editeng/eedata.hxx>
+#include <editeng/macros.hxx>
 #include <i18nlangtag/lang.h>
 #include <o3tl/cow_wrapper.hxx>
-#include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/unit_conversion.hxx>
@@ -130,6 +136,7 @@
 #include <svl/languageoptions.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
+#include <svl/style.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
 #include <svx/svxdllapi.h>
@@ -145,9 +152,9 @@
 #include <tools/ref.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
-#include <unotools/configitem.hxx>
 #include <unotools/fontdefs.hxx>
 #include <unotools/options.hxx>
+#include <unotools/streamwrap.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <xmloff/dllapi.h>
 #endif // PCH_LEVEL >= 3
@@ -164,6 +171,7 @@
 #include <utility.hxx>
 #include <view.hxx>
 #include <visitors.hxx>
+#include <xparsmlbase.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index c627980440e5..23888cf95311 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -361,7 +361,7 @@ void SmElementsControl::LayoutOrPaintContents(vcl::RenderContext& rContext, bool
 
     rContext.SetMapMode( MapMode(MapUnit::Map100thMM) );
     rContext.SetDrawMode( DrawModeFlags::Default );
-    rContext.SetLayoutMode( ComplexTextLayoutFlags::Default );
+    rContext.SetLayoutMode( vcl::text::ComplexTextLayoutFlags::Default );
     rContext.SetDigitLanguage( LANGUAGE_ENGLISH );
     if (bDraw)
     {
@@ -456,7 +456,7 @@ void SmElementsControl::LayoutOrPaintContents(vcl::RenderContext& rContext, bool
             {
                 if (pCurrentElement == element)
                 {
-                    rContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+                    rContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
                     const StyleSettings& rStyleSettings = rContext.GetSettings().GetStyleSettings();
                     rContext.SetLineColor(rStyleSettings.GetHighlightColor());
                     rContext.SetFillColor(COL_TRANSPARENT);
@@ -854,7 +854,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
     auto pNode = maParser->ParseExpression(aElementVisual);
 
     OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
-    rDevice.Push(PushFlags::MAPMODE);
+    rDevice.Push(vcl::PushFlags::MAPMODE);
     rDevice.SetMapMode( MapMode(MapUnit::Map100thMM) );
 
     pNode->Prepare(maFormat, *mpDocShell, 0);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index a67273dc32ef..06c1ab66f3a3 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -974,7 +974,7 @@ void SmShowSymbolSet::Paint(vcl::RenderContext& rRenderContext, const tools::Rec
     rRenderContext.SetBackground(Wallpaper(aBackgroundColor));
     rRenderContext.SetTextColor(aTextColor);
 
-    rRenderContext.Push(PushFlags::MAPMODE);
+    rRenderContext.Push(vcl::PushFlags::MAPMODE);
 
     // set MapUnit for which 'nLen' has been calculated
     rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index bc392a4d13c6..62c402a0ba09 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -277,8 +277,8 @@ void SmDocShell::ArrangeFormula()
 
     // format/draw formulas always from left to right,
     // and numbers should not be converted
-    ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode();
-    pOutDev->SetLayoutMode( ComplexTextLayoutFlags::Default );
+    vcl::text::ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode();
+    pOutDev->SetLayoutMode( vcl::text::ComplexTextLayoutFlags::Default );
     LanguageType nDigitLang = pOutDev->GetDigitLanguage();
     pOutDev->SetDigitLanguage( LANGUAGE_ENGLISH );
 
@@ -353,8 +353,8 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel
 
     // format/draw formulas always from left to right
     // and numbers should not be converted
-    ComplexTextLayoutFlags nLayoutMode = rDev.GetLayoutMode();
-    rDev.SetLayoutMode( ComplexTextLayoutFlags::Default );
+    vcl::text::ComplexTextLayoutFlags nLayoutMode = rDev.GetLayoutMode();
+    rDev.SetLayoutMode( vcl::text::ComplexTextLayoutFlags::Default );
     LanguageType nDigitLang = rDev.GetDigitLanguage();
     rDev.SetDigitLanguage( LANGUAGE_ENGLISH );
 
@@ -419,7 +419,7 @@ SmPrinterAccess::SmPrinterAccess( SmDocShell &rDocShell )
     pPrinter = rDocShell.GetPrt();
     if ( pPrinter )
     {
-        pPrinter->Push( PushFlags::MAPMODE );
+        pPrinter->Push( vcl::PushFlags::MAPMODE );
         if ( SfxObjectCreateMode::EMBEDDED == rDocShell.GetCreateMode() )
         {
             // if it is an embedded object (without its own printer)
@@ -446,7 +446,7 @@ SmPrinterAccess::SmPrinterAccess( SmDocShell &rDocShell )
     if ( !pRefDev || pPrinter.get() == pRefDev.get() )
         return;
 
-    pRefDev->Push( PushFlags::MAPMODE );
+    pRefDev->Push( vcl::PushFlags::MAPMODE );
     if ( SfxObjectCreateMode::EMBEDDED != rDocShell.GetCreateMode() )
         return;
 
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 43d5ca7429e7..5306908cefbe 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2090,7 +2090,7 @@ void SmMathSymbolNode::AdaptToY(OutputDevice &rDev, sal_uLong nHeight)
     // to determine the font width in order to keep it
     if (aFntSize.Width() == 0)
     {
-        rDev.Push(PushFlags::FONT | PushFlags::MAPMODE);
+        rDev.Push(vcl::PushFlags::FONT | vcl::PushFlags::MAPMODE);
         rDev.SetFont(GetFont());
         aFntSize.setWidth( rDev.GetFontMetric().GetFontSize().Width() );
         rDev.Pop();
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 8d7ea52d9717..e7b761a46729 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -56,7 +56,7 @@ bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev,
 
     const FontMetric  aDevFM (rDev.GetFontMetric());
 
-    pGlyphDev->Push(PushFlags::FONT | PushFlags::MAPMODE);
+    pGlyphDev->Push(vcl::PushFlags::FONT | vcl::PushFlags::MAPMODE);
     vcl::Font aFnt(rDev.GetFont());
     aFnt.SetAlignment(ALIGN_TOP);
 
@@ -203,7 +203,7 @@ SmRect::SmRect(const OutputDevice &rDev, const SmFormat *pFormat,
     {
         OutputDevice    *pWindow = Application::GetDefaultDevice();
 
-        pWindow->Push(PushFlags::MAPMODE | PushFlags::FONT);
+        pWindow->Push(vcl::PushFlags::MAPMODE | vcl::PushFlags::FONT);
 
         pWindow->SetMapMode(rDev.GetMapMode());
         pWindow->SetFont(rDev.GetFontMetric());
diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx
index 8135640cc60c..5eee10d9670f 100644
--- a/starmath/source/tmpdevice.cxx
+++ b/starmath/source/tmpdevice.cxx
@@ -34,8 +34,8 @@
 SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
     rOutDev(rTheDev)
 {
-    rOutDev.Push(PushFlags::FONT | PushFlags::MAPMODE |
-                 PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::TEXTCOLOR);
+    rOutDev.Push(vcl::PushFlags::FONT | vcl::PushFlags::MAPMODE |
+                 vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR | vcl::PushFlags::TEXTCOLOR);
     if (bUseMap100th_mm  &&  MapUnit::Map100thMM != rOutDev.GetMapMode().GetMapUnit())
     {
         SAL_WARN("starmath", "incorrect MapMode?");
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 7e02d4739c62..e84619f2a4e9 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -170,7 +170,7 @@ SmCaretDrawingVisitor::SmCaretDrawingVisitor( OutputDevice& rDevice,
         return;
 
     //Save device state
-    mrDev.Push( PushFlags::FONT | PushFlags::MAPMODE | PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::TEXTCOLOR );
+    mrDev.Push( vcl::PushFlags::FONT | vcl::PushFlags::MAPMODE | vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR | vcl::PushFlags::TEXTCOLOR );
 
     maPos.pSelectedNode->Accept( this );
     //Restore device state
@@ -242,7 +242,7 @@ void SmCaretDrawingVisitor::DefaultVisit( SmNode* pNode )
 void SmCaretPos2LineVisitor::Visit( SmTextNode* pNode )
 {
     //Save device state
-    mpDev->Push( PushFlags::FONT | PushFlags::TEXTCOLOR );
+    mpDev->Push( vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR );
 
     tools::Long i = maPos.nIndex;
 
@@ -1879,7 +1879,7 @@ SmSelectionDrawingVisitor::SmSelectionDrawingVisitor( OutputDevice& rDevice, SmN
     maSelectionArea.Move( rOffset.X( ), rOffset.Y( ) );
 
     //Save device state
-    mrDev.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR );
+    mrDev.Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR );
     //Change colors
     mrDev.SetLineColor( );
     mrDev.SetFillColor( COL_LIGHTGRAY );
@@ -1924,7 +1924,7 @@ void SmSelectionDrawingVisitor::Visit( SmTextNode* pNode )
     if( !pNode->IsSelected())
         return;
 
-    mrDev.Push( PushFlags::TEXTCOLOR | PushFlags::FONT );
+    mrDev.Push( vcl::PushFlags::TEXTCOLOR | vcl::PushFlags::FONT );
 
     mrDev.SetFont( pNode->GetFont( ) );
     Point Position = pNode->GetTopLeft( );