diff options
Diffstat (limited to 'i18npool/source/breakiterator')
6 files changed, 28 insertions, 20 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index fba56fcec7ae..24ca264e708b 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -24,10 +24,12 @@ #include <i18nutil/unicode.hxx> #include <rtl/ustrbuf.hxx> +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 { BreakIteratorImpl::BreakIteratorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext ) { @@ -630,14 +632,14 @@ BreakIteratorImpl::getSupportedServiceNames() return aRet; } -} } } } +} extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_i18n_BreakIterator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new css::i18n::BreakIteratorImpl(context)); + return cppu::acquire(new i18npool::BreakIteratorImpl(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx index 5921a8774738..98115e6c1d32 100644 --- a/i18npool/source/breakiterator/breakiterator_cjk.cxx +++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx @@ -24,9 +24,10 @@ #include <o3tl/make_unique.hxx> 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 { // ---------------------------------------------------- // class BreakIterator_CJK @@ -39,7 +40,7 @@ BreakIterator_CJK::BreakIterator_CJK() Boundary SAL_CALL BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos, - const lang::Locale& nLocale, sal_Int16 wordType) + const css::lang::Locale& nLocale, sal_Int16 wordType) { if (m_xDict) { result = m_xDict->previousWord(text, anyPos, wordType); @@ -56,7 +57,7 @@ BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos, Boundary SAL_CALL BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos, - const lang::Locale& nLocale, sal_Int16 wordType) + const css::lang::Locale& nLocale, sal_Int16 wordType) { if (m_xDict) { result = m_xDict->nextWord(text, anyPos, wordType); @@ -73,7 +74,7 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos, Boundary SAL_CALL BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos, - const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection ) + const css::lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection ) { if (m_xDict) { result = m_xDict->getWordBoundary(text, anyPos, wordType, bDirection); @@ -87,7 +88,7 @@ BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos, LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak( const OUString& Text, sal_Int32 nStartPos, - const lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/, + const css::lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/, const LineBreakHyphenationOptions& /*hOptions*/, const LineBreakUserOptions& bOptions ) { @@ -109,7 +110,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak( return lbr; } -#define LOCALE(language, country) lang::Locale(language, country, OUString()) +#define LOCALE(language, country) css::lang::Locale(language, country, OUString()) // ---------------------------------------------------- // class BreakIterator_zh // ----------------------------------------------------; @@ -150,6 +151,6 @@ BreakIterator_ko::BreakIterator_ko() cBreakIterator = "com.sun.star.i18n.BreakIterator_ko"; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx index f641bc927ca1..e39966e66175 100644 --- a/i18npool/source/breakiterator/breakiterator_ctl.cxx +++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx @@ -21,10 +21,12 @@ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <breakiterator_ctl.hxx> +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 { /** * Constructor. @@ -125,6 +127,6 @@ LineBreakResults SAL_CALL BreakIterator_CTL::getLineBreak( return lbr; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index b658dbdde0e1..66e2827f3ac2 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.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 { // class Breakiterator_th @@ -146,6 +146,6 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const } } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 3e31c3606005..bd9d09a34afc 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -35,9 +35,10 @@ extern const char OpenOffice_dat[]; U_CDECL_END using namespace ::com::sun::star; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { // Cache map of breakiterators, stores state information so has to be // thread_local. @@ -585,14 +586,14 @@ BreakIterator_Unicode::getSupportedServiceNames() return aRet; } -} } } } +} extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_i18n_BreakIterator_Unicode_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new css::i18n::BreakIterator_Unicode()); + return cppu::acquire(new i18npool::BreakIterator_Unicode()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 90e866426d57..5653021fc13a 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -29,7 +29,9 @@ #include <string.h> #include <breakiteratorImpl.hxx> -namespace com { namespace sun { namespace star { namespace i18n { +using namespace com::sun::star::i18n; + +namespace i18npool { #ifdef DICT_JA_ZH_IN_DATAFILE @@ -198,7 +200,7 @@ bool xdictionary::exists(const sal_uInt32 c) // 0x1FFF is the hardcoded limit in gendict for data.existMarks bool exist = data.existMark && (c>>3) < 0x1FFF && (data.existMark[c>>3] & (1<<(c&0x07))) != 0; if (!exist && japaneseWordBreak) - return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN; + return BreakIteratorImpl::getScriptClass(c) == css::i18n::ScriptType::ASIAN; else return exist; } @@ -474,6 +476,6 @@ Boundary const & xdictionary::getWordBoundary(const OUString& rText, sal_Int32 a return boundary; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |