diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2011-09-24 18:08:24 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2011-09-24 18:09:58 +0200 |
| commit | cddea419b645c11819b9314acb95d8ea8df4fc98 (patch) | |
| tree | 670977c0fc467df6cf15dc16b34d0f98cceb32af /sw/source/ui/app | |
| parent | 3a8c8537d1c8e03f3587a6823b2f6749b3115c46 (diff) | |
Avoid ambiguous Locale type by specifying full path to sun::star... ; the other definition is from ICU.
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/docshini.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 6ab953e62193..689e8759498e 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) else { SvtLinguConfig aLinguCfg; - Locale aLocale; + com::sun::star::lang::Locale aLocale; LanguageType nLang; using namespace ::com::sun::star::i18n::ScriptType; diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index f2663d3dfdf7..5c432068e54c 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales(); if(aLocales.getLength()) { - const Locale* pLocales = aLocales.getConstArray(); + const com::sun::star::lang::Locale* pLocales = aLocales.getConstArray(); for(sal_Int32 i = 0; i < aLocales.getLength(); i++) { ForbiddenCharacters aForbidden; |