[Libreoffice-commits] core.git: editeng/source sw/source

[Caolán McNamara]

 editeng/source/editeng/impedit3.cxx |    4 ++++
 sw/source/core/text/txtfrm.cxx      |   20 ++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 248e6c2f22a780cbdb35d5be4dc3d32d71b878ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 20 08:55:32 2015 +0100

    more no-config shortcuts
    
    Change-Id: Ieb3ae2d0e99e77b23e6826efdf51de56f3543865

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index f774aa8..9bacfcc 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -55,6 +55,7 @@
 
 #include <editeng/forbiddencharacterstable.hxx>
 
+#include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <editeng/unolingu.hxx>
@@ -4264,6 +4265,9 @@ const SvxLRSpaceItem& ImpEditEngine::GetLRSpaceItem( ContentNode* pNode )
 // text numeral setting:
 LanguageType ImpEditEngine::ImplCalcDigitLang(LanguageType eCurLang) const
 {
+    if (utl::ConfigManager::IsAvoidConfig())
+        return LANGUAGE_ENGLISH_US;
+
     // #114278# Also setting up digit language from Svt options
     // (cannot reliably inherit the outdev's setting)
     if( !pCTLOptions )
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 397996b..5171fe6 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -28,6 +28,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/pgrditem.hxx>
+#include <unotools/configmgr.hxx>
 #include <swmodule.hxx>
 #include <SwSmartTagMgr.hxx>
 #include <doc.hxx>
@@ -314,14 +315,17 @@ SwDigitModeModifier::SwDigitModeModifier( const OutputDevice& rOutp, LanguageTyp
         rOut( rOutp ), nOldLanguageType( rOutp.GetDigitLanguage() )
 {
     LanguageType eLang = eCurLang;
-    const SvtCTLOptions::TextNumerals nTextNumerals = SW_MOD()->GetCTLOptions().GetCTLTextNumerals();
-
-    if ( SvtCTLOptions::NUMERALS_HINDI == nTextNumerals )
-        eLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
-    else if ( SvtCTLOptions::NUMERALS_ARABIC == nTextNumerals )
-        eLang = LANGUAGE_ENGLISH;
-    else if ( SvtCTLOptions::NUMERALS_SYSTEM == nTextNumerals )
-        eLang = ::GetAppLanguage();
+    if (!utl::ConfigManager::IsAvoidConfig())
+    {
+        const SvtCTLOptions::TextNumerals nTextNumerals = SW_MOD()->GetCTLOptions().GetCTLTextNumerals();
+
+        if ( SvtCTLOptions::NUMERALS_HINDI == nTextNumerals )
+            eLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
+        else if ( SvtCTLOptions::NUMERALS_ARABIC == nTextNumerals )
+            eLang = LANGUAGE_ENGLISH;
+        else if ( SvtCTLOptions::NUMERALS_SYSTEM == nTextNumerals )
+            eLang = ::GetAppLanguage();
+    }
 
     const_cast<OutputDevice&>(rOut).SetDigitLanguage( eLang );
 }