diff options
author | Noel Grandin <noel@peralex.com> | 2012-11-20 12:57:26 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:46 +0100 |
commit | f96db7d0ddeb737cf0e14eea6120daab860c54b7 (patch) | |
tree | 6107a9464ff9fa889740a743255f543390791f22 /svx | |
parent | there is nothing to localize in 'scripting' module (diff) | |
download | core-f96db7d0ddeb737cf0e14eea6120daab860c54b7.tar.gz core-f96db7d0ddeb737cf0e14eea6120daab860c54b7.zip |
fdo#46808, use service constructor for i18n::Collator
Change-Id: I15a360723e335345aad09e73fcb0f6815ed9e0d4
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/fmsrcimp.hxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/simptabl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmsrcimp.cxx | 12 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2 |
6 files changed, 11 insertions, 12 deletions
diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 9809d5404ff7..7d033a456062 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -294,13 +294,13 @@ public: every record as well as at the end of the search. */ FmSearchEngine( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat, FMSEARCH_MODE eMode); FmSearchEngine( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const InterfaceArray& arrFields, diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 14517fc8e1ca..6c84f71ed081 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -449,7 +449,7 @@ StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) { - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(), diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 0343e8ab4233..bb45f03d63b0 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -671,14 +671,14 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O DBG_NAME(FmSearchEngine); //------------------------------------------------------------------------ -FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, +FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) ,m_xFormatSupplier(xFormatSupplier) - ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLanguageTag() ) - ,m_aStringCompare( _rxORB ) + ,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() ) + ,m_aStringCompare( _rxContext ) ,m_nCurrentFieldIndex(-2) // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig' ,m_bUsingTextComponents(sal_False) ,m_eSearchForType(SEARCHFOR_STRING) @@ -710,12 +710,12 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, } //------------------------------------------------------------------------ -FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB, +FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) - ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLanguageTag() ) - ,m_aStringCompare( _rxORB ) + ,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() ) + ,m_aStringCompare( _rxContext ) ,m_nCurrentFieldIndex(-2) // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig' ,m_bUsingTextComponents(sal_True) ,m_xOriginalIterator(xCursor) diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 7e72d3356767..d1c7b617c5ab 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1583,7 +1583,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, ++nStart; } - CollatorWrapper aCollator( ::comphelper::getProcessServiceFactory()); + CollatorWrapper aCollator( ::comphelper::getProcessComponentContext()); aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0); const String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( " ")); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index f9eecbff6290..63e553a5ee1e 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -868,7 +868,6 @@ SfxItemPresentation SdrAngleItem::GetPresentation( const IntlWrapper* pMyIntlWrapper = NULL; if(!pIntlWrapper) pIntlWrapper = pMyIntlWrapper = new IntlWrapper( - ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() ); if(pIntlWrapper->getLocaleData()->isNumLeadingZero()) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 0aa09b3944f8..98eaa94bd329 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -387,7 +387,7 @@ StringCompare DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListE if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) { - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(), |