[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/source

[Caolán McNamara]

 vcl/source/app/settings.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit bcff0081ab7f46c9edc77b23d304f51133c28eca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 2 21:18:09 2017 +0100

    Resolves: tdf#112827 gtk3 menubar not RTL under RTL locales
    
    (cherry picked from commit addd1c34502b959e329354d73808c222986d4b74)
    Signed-off-by: Lior Kaplan <kaplanlior at gmail.com>
    
    Change-Id: Iab4a2980483eb3cd31f8722bd8e5d4eb68b06716
    Reviewed-on: https://gerrit.libreoffice.org/43147
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 0a34aff66561..4887a283977b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2845,10 +2845,7 @@ namespace
 
         if( nUIMirroring == 0 )  // no config found (eg, setup) or default (nil) was set: check language
         {
-            LanguageType aLang = LANGUAGE_DONTKNOW;
-            ImplSVData* pSVData = ImplGetSVData();
-            if ( pSVData->maAppData.mpSettings )
-                aLang = pSVData->maAppData.mpSettings->GetUILanguageTag().getLanguageType();
+            LanguageType aLang = SvtSysLocaleOptions().GetRealUILanguageTag().getLanguageType();
             if (bMath)
                 bRTL = MsLangId::isRightToLeftMath( aLang );
             else