From 6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 3 Oct 2017 14:16:24 +0200 Subject: 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 Reviewed-by: Noel Grandin --- i18npool/source/indexentry/indexentrysupplier.cxx | 4 ++-- i18npool/source/indexentry/indexentrysupplier_asian.cxx | 6 ++++-- i18npool/source/indexentry/indexentrysupplier_common.cxx | 4 ++-- i18npool/source/indexentry/indexentrysupplier_default.cxx | 6 ++++-- .../source/indexentry/indexentrysupplier_ja_phonetic.cxx | 14 ++++++++------ 5 files changed, 20 insertions(+), 14 deletions(-) (limited to 'i18npool/source/indexentry') diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 9b6d938c987b..d467b5b708b9 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext ) { @@ -190,6 +190,6 @@ IndexEntrySupplier::getSupportedServiceNames() return aRet; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index a6594c381b65..6f06eb44bed5 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { #ifndef DISABLE_DYNLOADING @@ -204,6 +204,8 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, } return OUString(); } -} } } } + +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index ba7aa0fccfb4..5bc149041a40 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { IndexEntrySupplier_Common::IndexEntrySupplier_Common(const Reference < uno::XComponentContext >& rxContext) { @@ -133,6 +133,6 @@ IndexEntrySupplier_Common::getSupportedServiceNames() return aRet; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index d0673a9d50ed..cc5db18053be 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -22,10 +22,12 @@ #include #include +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode( const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : @@ -280,6 +282,6 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) table_count = j; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index d9f6893ab6e0..417fa47306cd 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -23,10 +23,12 @@ #include #include -namespace com { namespace sun { namespace star { namespace i18n { +using namespace ::com::sun::star::i18n; + +namespace i18npool { OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry, - const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) + const css::lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) { sal_Unicode ch=rIndexEntry.toChar(); sal_uInt16 first = idx[ ch >> 8 ]; @@ -40,14 +42,14 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr } OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry, - const OUString& PhoneticEntry, const lang::Locale& rLocale ) + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) { return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString()); } sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( - const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1, - const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 ) + const OUString& IndexEntry1, const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1, + const OUString& IndexEntry2, const OUString& PhoneticEntry2, const css::lang::Locale& rLocale2 ) { sal_Int16 result = sal::static_int_cast( collator->compareString( IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1), @@ -88,6 +90,6 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant: return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit