diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 14:16:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 08:39:11 +0200 |
| commit | 6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 (patch) | |
| tree | abdd40004f9a98c3be7f37e8e0027639456cd688 /i18npool/source/collator | |
| parent | use the new gbuild way to update config.* (diff) | |
| download | core-6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85.tar.gz core-6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85.zip | |
move stuff in i18npool/i18nutil in own namespace
instead of trying to share the css::i18n namespace, which is just very
confusing and should be left to actual UNO artifacts
Change-Id: I2f5c36bf1af9a2a98c4f997dd450d015e75ed3f6
Reviewed-on: https://gerrit.libreoffice.org/43079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/source/collator')
| -rw-r--r-- | i18npool/source/collator/chaptercollator.cxx | 3 | ||||
| -rw-r--r-- | i18npool/source/collator/collatorImpl.cxx | 7 | ||||
| -rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index ccb4d9a3370f..1f48d61c7824 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -27,6 +27,8 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; +namespace i18npool { + ChapterCollator::ChapterCollator( const Reference < XComponentContext >& rxContext ) : CollatorImpl(rxContext) { cclass = CharacterClassification::create( rxContext ); @@ -91,4 +93,5 @@ ChapterCollator::getSupportedServiceNames() return aRet; } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 022071a9b904..258ee9f6ec66 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -26,10 +26,11 @@ #include <cppuhelper/supportsservice.hxx> using namespace com::sun::star; +using namespace com::sun::star::i18n; using namespace com::sun::star::lang; using namespace com::sun::star::uno; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { CollatorImpl::CollatorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext) { @@ -225,14 +226,14 @@ CollatorImpl::getSupportedServiceNames() return aRet; } -} } } } +} extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_i18n_Collator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new css::i18n::CollatorImpl(context)); + return cppu::acquire(new i18npool::CollatorImpl(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 21c7deee2860..fae276818b3c 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -30,10 +30,11 @@ #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { Collator_Unicode::Collator_Unicode() { @@ -406,6 +407,6 @@ Collator_Unicode::getSupportedServiceNames() return aRet; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |