Kaydet (Commit) cddea419 authored tarafından Tomas Chvatal's avatar Tomas Chvatal

Avoid ambiguous Locale type by specifying full path to sun::star... ; the other…

Avoid ambiguous Locale type by specifying full path to sun::star... ; the other definition is from ICU.
üst 3a8c8537
...@@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0; ...@@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0;
SwDoc* SwSortElement::pDoc = 0; SwDoc* SwSortElement::pDoc = 0;
const FlatFndBox* SwSortElement::pBox = 0; const FlatFndBox* SwSortElement::pBox = 0;
CollatorWrapper* SwSortElement::pSortCollator = 0; CollatorWrapper* SwSortElement::pSortCollator = 0;
Locale* SwSortElement::pLocale = 0; com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
String* SwSortElement::pLastAlgorithm = 0; String* SwSortElement::pLastAlgorithm = 0;
LocaleDataWrapper* SwSortElement::pLclData = 0; LocaleDataWrapper* SwSortElement::pLclData = 0;
......
...@@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) ...@@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
else else
{ {
SvtLinguConfig aLinguCfg; SvtLinguConfig aLinguCfg;
Locale aLocale; com::sun::star::lang::Locale aLocale;
LanguageType nLang; LanguageType nLang;
using namespace ::com::sun::star::i18n::ScriptType; using namespace ::com::sun::star::i18n::ScriptType;
......
...@@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) ...@@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales(); Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales();
if(aLocales.getLength()) 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++) for(sal_Int32 i = 0; i < aLocales.getLength(); i++)
{ {
ForbiddenCharacters aForbidden; ForbiddenCharacters aForbidden;
......
...@@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource, ...@@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats(); uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats();
uno::Reference< XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY); 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 //get the number formatter of the data source
uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY); uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment