diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-20 08:55:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-20 11:01:13 +0100 |
| commit | 248e6c2f22a780cbdb35d5be4dc3d32d71b878ef (patch) | |
| tree | 3c026ab06d99d087220b64c3aaa336a5e31869b8 | |
| parent | 721f5b054e013cc2867051bef75d6488fdb583a8 (diff) | |
more no-config shortcuts
Change-Id: Ieb3ae2d0e99e77b23e6826efdf51de56f3543865
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index f774aa87a33a..9bacfcc9dfa7 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 397996b031ed..5171fe6718ff 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 ); } |