summaryrefslogtreecommitdiffstats
path: root/editeng/source/items/numitem.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-10 11:04:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-19 01:04:00 +0000
commit6b7354ae66db40246a09e00aa876443057655a43 (patch)
treee7eb5d71ecd2a6ec8110945a946549500dae7a8a /editeng/source/items/numitem.cxx
parentAdded Test for tdf#74524 ODF import of range annotation (diff)
downloadcore-6b7354ae66db40246a09e00aa876443057655a43.tar.gz
core-6b7354ae66db40246a09e00aa876443057655a43.zip
for testing allow disabling configmgr for time critical paths
Change-Id: I08021f18d53e1748927f8847649994f95252bbc2 Reviewed-on: https://gerrit.libreoffice.org/17844 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng/source/items/numitem.cxx')
-rw-r--r--editeng/source/items/numitem.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 99ad41eea108..b44355f0b4c9 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/processfactory.hxx>
#include <tools/mapunit.hxx>
+#include <unotools/configmgr.hxx>
#include <editeng/unonrule.hxx>
@@ -99,8 +100,10 @@ SvxNumberType::~SvxNumberType()
OUString SvxNumberType::GetNumStr( sal_uLong nNo ) const
{
- const LanguageTag& rLang = Application::GetSettings().GetLanguageTag();
- return GetNumStr( nNo, rLang.getLocale() );
+ LanguageTag aLang = utl::ConfigManager::IsAvoidConfig() ?
+ LanguageTag("en-US") :
+ Application::GetSettings().GetLanguageTag();
+ return GetNumStr( nNo, aLang.getLocale() );
}
OUString SvxNumberType::GetNumStr( sal_uLong nNo, const css::lang::Locale& rLocale ) const