From 611694b707eb43e4c0f20b781f6869016a3ba099 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@libreoffice.org>
Date: Thu, 17 Aug 2023 17:39:29 +0300
Subject: [PATCH] =?UTF-8?q?vcl:=20Allow=20pushing/popping=20OutputDevice?=
 =?UTF-8?q?=E2=80=99s=20RTLEnabled=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Icafdc307c5c9df768f00c3ac0d128936607bf3e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155794
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
---
 include/vcl/rendercontext/State.hxx | 4 +++-
 vcl/source/gdi/mtfxmldump.cxx       | 2 ++
 vcl/source/outdev/stack.cxx         | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/vcl/rendercontext/State.hxx b/include/vcl/rendercontext/State.hxx
index a433dbd8fb05..042eb2deca7a 100644
--- a/include/vcl/rendercontext/State.hxx
+++ b/include/vcl/rendercontext/State.hxx
@@ -53,6 +53,7 @@ enum class PushFlags
     TEXTLAYOUTMODE = 0x0800,
     TEXTLANGUAGE = 0x1000,
     OVERLINECOLOR = 0x2000,
+    RTLENABLED = 0x4000,
     ALL = 0xFFFF
 };
 }
@@ -66,7 +67,7 @@ template <> struct typed_flags<vcl::PushFlags> : is_typed_flags<vcl::PushFlags,
 #define PUSH_ALLFONT                                                                               \
     (vcl::PushFlags::TEXTCOLOR | vcl::PushFlags::TEXTFILLCOLOR | vcl::PushFlags::TEXTLINECOLOR     \
      | vcl::PushFlags::OVERLINECOLOR | vcl::PushFlags::TEXTALIGN | vcl::PushFlags::TEXTLAYOUTMODE  \
-     | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::FONT)
+     | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::RTLENABLED | vcl::PushFlags::FONT)
 
 namespace vcl::text
 {
@@ -114,6 +115,7 @@ struct State
     LanguageType meTextLanguage = LANGUAGE_SYSTEM;
     PushFlags mnFlags = PushFlags::NONE;
     bool mbMapActive = false;
+    bool mbRTLEnabled = false;
 };
 }
 
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index c26a44310774..f507fddb284e 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -63,6 +63,8 @@ OUString collectPushFlags(vcl::PushFlags nFlags)
         aStrings.emplace_back("PushTextLanguage");
     if (nFlags & vcl::PushFlags::OVERLINECOLOR)
         aStrings.emplace_back("PushOverlineColor");
+    if (nFlags & vcl::PushFlags::RTLENABLED)
+        aStrings.emplace_back("PushRTLEnabled");
 
     OUString aString;
 
diff --git a/vcl/source/outdev/stack.cxx b/vcl/source/outdev/stack.cxx
index 72ef63af551d..129348051e3d 100644
--- a/vcl/source/outdev/stack.cxx
+++ b/vcl/source/outdev/stack.cxx
@@ -84,6 +84,9 @@ void OutputDevice::Push(vcl::PushFlags nFlags)
     if (nFlags & vcl::PushFlags::REFPOINT && mbRefPoint)
         rState.mpRefPoint = maRefPoint;
 
+    if (nFlags & vcl::PushFlags::RTLENABLED)
+        rState.mbRTLEnabled = IsRTLEnabled();
+
     if (mpAlphaVDev)
         mpAlphaVDev->Push();
 }
@@ -184,6 +187,9 @@ void OutputDevice::Pop()
             SetRefPoint();
     }
 
+    if ( rState.mnFlags & vcl::PushFlags::RTLENABLED )
+        EnableRTL( rState.mbRTLEnabled );
+
     maOutDevStateStack.pop_back();
 
     mpMetaFile = pOldMetaFile;