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 | |
| parent | For wiki-ext check also java and ext support. (diff) | |
| download | core-cddea419b645c11819b9314acb95d8ea8df4fc98.tar.gz core-cddea419b645c11819b9314acb95d8ea8df4fc98.zip | |
Avoid ambiguous Locale type by specifying full path to sun::star... ; the other definition is from ICU.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docsort.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/docshini.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 6a65b327db8b..d76dcecae0df 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0; SwDoc* SwSortElement::pDoc = 0; const FlatFndBox* SwSortElement::pBox = 0; CollatorWrapper* SwSortElement::pSortCollator = 0; -Locale* SwSortElement::pLocale = 0; +com::sun::star::lang::Locale* SwSortElement::pLocale = 0; String* SwSortElement::pLastAlgorithm = 0; LocaleDataWrapper* SwSortElement::pLclData = 0; 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; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 5ee9fca2f9c0..2bdd83ce6f4f 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource, uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats(); uno::Reference< XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY); - Locale aLocale( MsLangId::convertLanguageToLocale( (LanguageType)nLanguage )); + com::sun::star::lang::Locale aLocale( MsLangId::convertLanguageToLocale( (LanguageType)nLanguage )); //get the number formatter of the data source uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY); |