diff options
author | Tomas Chvatal <tchvatal@suse.cz> | 2011-09-29 15:14:34 +0200 |
---|---|---|
committer | Tomas Chvatal <tchvatal@suse.cz> | 2011-09-29 15:14:34 +0200 |
commit | db3a8faba14e89be39df5fb98f5535c1ca295f62 (patch) | |
tree | d94a106aa00da5f2a56b04382e37752d4e092f43 /sw | |
parent | Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *(... (diff) | |
download | core-db3a8faba14e89be39df5fb98f5535c1ca295f62.tar.gz core-db3a8faba14e89be39df5fb98f5535c1ca295f62.zip |
Solve more ambiguous issues with Locale from sun::star.. and icu::.
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/docsort.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/app/docshini.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 3 |
5 files changed, 11 insertions, 9 deletions
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index d76dcecae0df..518860f8ae18 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -59,12 +59,13 @@ #include <unochart.hxx> using namespace ::com::sun::star::lang; +using namespace ::com::sun::star; SwSortOptions* SwSortElement::pOptions = 0; SwDoc* SwSortElement::pDoc = 0; const FlatFndBox* SwSortElement::pBox = 0; CollatorWrapper* SwSortElement::pSortCollator = 0; -com::sun::star::lang::Locale* SwSortElement::pLocale = 0; +lang::Locale* SwSortElement::pLocale = 0; String* SwSortElement::pLastAlgorithm = 0; LocaleDataWrapper* SwSortElement::pLclData = 0; @@ -89,7 +90,7 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt, nLang = (LanguageType)GetAppLanguage(); break; } - pLocale = new Locale( SvxCreateLocale( nLang ) ); + pLocale = new lang::Locale( SvxCreateLocale( nLang ) ); pSortCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() ); diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 5c432068e54c..350cf749c54b 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -135,10 +135,10 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // set forbidden characters if necessary SvxAsianConfig aAsian; - Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales(); + Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); if(aLocales.getLength()) { - const com::sun::star::lang::Locale* pLocales = aLocales.getConstArray(); + const lang::Locale* pLocales = aLocales.getConstArray(); for(sal_Int32 i = 0; i < aLocales.getLength(); i++) { ForbiddenCharacters aForbidden; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 33a053b96570..e059ab1114f6 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -275,7 +275,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, if(xColSupp.is()) { SwWrtShell& rSh = pView->GetWrtShell(); - Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() )); + lang::Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() )); SvNumberFormatter* pNumFmtr = rSh.GetNumberFormatter(); SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj( pNumFmtr ); Reference< util::XNumberFormatsSupplier > xDocNumFmtsSupplier = pNumFmt; @@ -1705,7 +1705,7 @@ void SwInsertDBColAutoPilot::Commit() if( eLang != ePrevLang ) { - Locale aLocale; + lang::Locale aLocale; aLocale = SvxLanguageToLocale( aLocale, eLang ); (( sPrevLang = aLocale.Country ) += rtl::OUString( '-' )) += aLocale.Language; ePrevLang = eLang; @@ -1790,7 +1790,7 @@ void SwInsertDBColAutoPilot::Load() rtl::OUString sNumberFormatLocale; pSubProps[5] >>= sNumberFormatLocale; - Locale aLocale; + lang::Locale aLocale; aLocale.Language = sNumberFormatLocale.copy(0, 2); aLocale.Country = sNumberFormatLocale.copy(3, 2); pInsDBColumn->eUsrNumFmtLng = SvxLocaleToLanguage( aLocale ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d5c2838e18ee..9f0f60fa39d0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1516,7 +1516,7 @@ IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl, RadioButton*, EMPTYARG ) IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) { - Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) ); + lang::Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) ); Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl ); if( !pIndexRes ) diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 80276381f9bb..06c15a56b7fb 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -83,6 +83,7 @@ static sal_Unicode cDeli = '\t'; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star; using ::rtl::OUString; void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) @@ -462,7 +463,7 @@ IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck ) IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) { - Locale aLcl( SvxCreateLocale( aLangLB.GetSelectLanguage() ) ); + lang::Locale aLcl( SvxCreateLocale( aLangLB.GetSelectLanguage() ) ); Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms( aLcl )); |