ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Avoid ambiguous Locale type by specifying full path to sun::star... ; the other definition is from ICU.

Browse Source
This commit is contained in:
Tomas Chvatal
2011-09-24 18:09:58 +02:00
parent 3a8c8537d1
commit cddea419b6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/core/doc/docsort.cxx
+1 -1
View File
@@ -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;
sw/source/ui/app/appopt.cxx
+1 -1
View File
@@ -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;
sw/source/ui/app/docshini.cxx
+1 -1
View File
@@ -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;
sw/source/ui/dbui/dbmgr.cxx
+1 -1
View File
@@ -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);