include/vcl/rendercontext/State.hxx | 2 -- vcl/source/gdi/mtfxmldump.cxx | 2 -- vcl/source/outdev/stack.cxx | 6 ------ 3 files changed, 10 deletions(-)
New commits: commit 1c7886d5d80389a876330a1d4a3a350a57126480 Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Mon Feb 26 17:47:59 2024 +0200 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Mon Feb 26 19:27:40 2024 +0100 tdf#159251: Revert "vcl: Allow pushing/popping OutputDevice’s RTLEnabled ...state" This reverts commit 611694b707eb43e4c0f20b781f6869016a3ba099. Change-Id: I044e6a1fb08f482c6b494e87f9c23e2303b97fd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163951 Tested-by: Jenkins Reviewed-by: خالد حسني <kha...@libreoffice.org> diff --git a/include/vcl/rendercontext/State.hxx b/include/vcl/rendercontext/State.hxx index 33970dcccb7f..0a3d4327af8f 100644 --- a/include/vcl/rendercontext/State.hxx +++ b/include/vcl/rendercontext/State.hxx @@ -53,7 +53,6 @@ enum class PushFlags TEXTLAYOUTMODE = 0x0800, TEXTLANGUAGE = 0x1000, OVERLINECOLOR = 0x2000, - RTLENABLED = 0x4000, ALL = 0xFFFF }; } @@ -115,7 +114,6 @@ 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 e6b1adc80eac..2792297feeca 100644 --- a/vcl/source/gdi/mtfxmldump.cxx +++ b/vcl/source/gdi/mtfxmldump.cxx @@ -63,8 +63,6 @@ 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 129348051e3d..72ef63af551d 100644 --- a/vcl/source/outdev/stack.cxx +++ b/vcl/source/outdev/stack.cxx @@ -84,9 +84,6 @@ 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(); } @@ -187,9 +184,6 @@ void OutputDevice::Pop() SetRefPoint(); } - if ( rState.mnFlags & vcl::PushFlags::RTLENABLED ) - EnableRTL( rState.mbRTLEnabled ); - maOutDevStateStack.pop_back(); mpMetaFile = pOldMetaFile;