summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2022-01-14 11:59:43 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2022-01-17 10:06:47 +0100
commit11d580a7af71639630190c5250669ef752a524e3 (patch)
tree546efa9ca41d414764a0288223dd5cd211b8fdac
parentRTL: lok: mirror cursor position when needed (diff)
downloadcore-11d580a7af71639630190c5250669ef752a524e3.tar.gz
core-11d580a7af71639630190c5250669ef752a524e3.zip
RTL: lok: draw mirrored native widgets from file definition
Change-Id: I66318e4cb605a1882f557e53c03185cc767683b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128394 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
-rw-r--r--vcl/source/gdi/salgdilayout.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 452b5b61dd8e..79dc77995e3b 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -36,6 +36,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <FileDefinitionWidgetDraw.hxx>
+#include <comphelper/lok.hxx>
// The only common SalFrame method
@@ -788,7 +789,10 @@ bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const
if (aControlRegion.IsEmpty() || aControlRegion.GetWidth() <= 0 || aControlRegion.GetHeight() <= 0)
return bRet;
- if( (m_nLayout & SalLayoutFlags::BiDiRtl) || (pOutDev && pOutDev->IsRTLEnabled()) )
+ bool bLayoutRTL = true && (m_nLayout & SalLayoutFlags::BiDiRtl);
+ bool bDevRTL = pOutDev && pOutDev->IsRTLEnabled();
+ bool bIsLOK = comphelper::LibreOfficeKit::isActive();
+ if( (bLayoutRTL || bDevRTL) && !bIsLOK )
{
mirror(aControlRegion, pOutDev);
std::unique_ptr< ImplControlValue > mirrorValue( aValue.clone());