diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /i18npool | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'i18npool')
81 files changed, 643 insertions, 676 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index 7a6ef2ac439e..192400756382 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -50,63 +50,63 @@ public: BreakIteratorImpl(); ~BreakIteratorImpl(); - virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, + virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos, + virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar); @@ -125,11 +125,11 @@ private : com::sun::star::uno::Reference < XBreakIterator > xBI; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const rtl::OUString& aLocaleName ) + sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName ) throw( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale ) throw( com::sun::star::uno::RuntimeException ); - const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& Text, + const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const OUString& Text, sal_Int32 nStartPos, sal_Bool forward, sal_Bool skipWhiteSpace) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index d4189922bac5..1f1632618844 100644 --- a/i18npool/inc/breakiterator_cjk.hxx +++ b/i18npool/inc/breakiterator_cjk.hxx @@ -31,23 +31,23 @@ class BreakIterator_CJK : public BreakIterator_Unicode public: BreakIterator_CJK(); - Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, + Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, + Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, + Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); protected: xdictionary *dict; - rtl::OUString hangingCharacters; + OUString hangingCharacters; }; #define BREAKITERATOR_CJK( lang ) \ diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx index f4466b530af5..270f64b395e4 100644 --- a/i18npool/inc/breakiterator_ctl.hxx +++ b/i18npool/inc/breakiterator_ctl.hxx @@ -32,23 +32,23 @@ class BreakIterator_CTL : public BreakIterator_Unicode public: BreakIterator_CTL(); ~BreakIterator_CTL(); - virtual sal_Int32 SAL_CALL previousCharacters(const rtl::OUString& text, sal_Int32 start, + virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start, const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count, sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextCharacters(const rtl::OUString& text, sal_Int32 start, + virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count, sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); protected: - rtl::OUString cachedText; // for cell index + OUString cachedText; // for cell index sal_Int32* nextCellIndex; sal_Int32* previousCellIndex; sal_Int32 cellIndexSize; - virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx index fed7ad6e7151..19dbeae87e30 100644 --- a/i18npool/inc/breakiterator_th.hxx +++ b/i18npool/inc/breakiterator_th.hxx @@ -32,7 +32,7 @@ public: ~BreakIterator_th(); protected: - void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index fe226d4c5b41..2b45fb091f02 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -39,36 +39,36 @@ public: BreakIterator_Unicode(); ~BreakIterator_Unicode(); - virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); - virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos, + virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); - virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos, + virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: @@ -77,7 +77,7 @@ protected: struct BI_Data { - rtl::OUString aICUText; + OUString aICUText; UText *ut; icu::BreakIterator *aBreakIterator; com::sun::star::lang::Locale maLocale; @@ -98,7 +98,7 @@ protected: sal_Int16 aBreakType; void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, - sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException); + sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index baf0b600c71f..cc7cafcc3068 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -54,10 +54,10 @@ public: // Methods virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException); virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException); @@ -72,10 +72,10 @@ public: virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); // Methods in XExtendedCalendar - virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); // XCalendar3 virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException); @@ -85,15 +85,15 @@ public: virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); private: struct lookupTableItem { - lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) : + lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) : uniqueID(_uniqueID), xCalendar(_xCalendar) {} - rtl::OUString uniqueID; + OUString uniqueID; com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 > xCalendar; }; std::vector<lookupTableItem*> lookupTable; diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 929f759b2a6b..691af7f9fca9 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -56,7 +56,7 @@ public: ~Calendar_gregorian(); // Methods in XCalendar - virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException); virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException); @@ -64,7 +64,7 @@ public: virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException); virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException); @@ -73,10 +73,10 @@ public: virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); // Methods in XExtendedCalendar - virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); // XCalendar3 virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException); @@ -86,9 +86,9 @@ public: virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); protected: Era *eraArray; @@ -104,7 +104,7 @@ protected: virtual void mapFromGregorian() throw(com::sun::star::uno::RuntimeException); void getValue() throw(com::sun::star::uno::RuntimeException); - rtl::OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException); + OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException); private: Calendar2 aCalendar; @@ -136,8 +136,8 @@ class Calendar_hanja : public Calendar_gregorian public: // Constructors Calendar_hanja(); - virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); }; // ---------------------------------------------------- @@ -170,7 +170,7 @@ public: Calendar_buddhist(); // Methods in XExtendedCalendar - virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx index f31003e93430..e76bdec4254a 100644 --- a/i18npool/inc/calendar_jewish.hxx +++ b/i18npool/inc/calendar_jewish.hxx @@ -34,7 +34,7 @@ public: Calendar_jewish(); // Methods in XExtendedCalendar - virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); protected: void mapToGregorian() throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index d515cfd2b3d3..bace88f5592e 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -38,32 +38,32 @@ public: cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); ~cclass_Unicode(); - virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount, + virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, + virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount, + virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, - sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text, + virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos, + const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, + sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); + virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, - const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); + const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, + const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: const sal_Char *cClass; @@ -123,8 +123,8 @@ private: com::sun::star::lang::Locale aParserLocale; com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup; - rtl::OUString aStartChars; - rtl::OUString aContChars; + OUString aStartChars; + OUString aContChars; UPT_FLAG_TYPE* pTable; UPT_FLAG_TYPE* pStart; UPT_FLAG_TYPE* pCont; @@ -151,26 +151,26 @@ private: /// Setup parser table. Calls initParserTable() only if needed. void setupParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, - const rtl::OUString& userDefinedCharactersCont ); + const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, + const OUString& userDefinedCharactersCont ); /// Init parser table. void initParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, - const rtl::OUString& userDefinedCharactersCont ); + const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, + const OUString& userDefinedCharactersCont ); /// Destroy parser table. void destroyParserTable(); /// Parse a text. - void parseText( ParseResult& r, const rtl::OUString& rText, sal_Int32 nPos, + void parseText( ParseResult& r, const OUString& rText, sal_Int32 nPos, sal_Int32 nTokenType = 0xffffffff ); /// Setup International class, new'ed only if different from existing. sal_Bool setupInternational( const com::sun::star::lang::Locale& rLocale ); /// Implementation of getCharacterType() for one single character - sal_Int32 SAL_CALL getCharType( const rtl::OUString& Text, sal_Int32 *nPos, sal_Int32 increment); + sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment); }; diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx index 83518d64a812..c9723563c3dd 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.hxx @@ -35,14 +35,14 @@ public: // Destructor ~ChapterCollator(); - sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private : // CharacterClassification Implementation diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 2c7d34bbeb47..141fcac04e93 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -39,53 +39,53 @@ public: CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); virtual ~CharacterClassificationImpl(); - virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, + virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, + virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, + virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) + virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos, + virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, + virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos, + virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, - const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, - const rtl::OUString& userDefinedCharactersCont ) + const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, + const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, - const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, - sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart, - sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) + const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, + sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, + sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( com::sun::star::uno::RuntimeException ); private: struct lookupTableItem { - lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName, + lookupTableItem(const com::sun::star::lang::Locale& rLocale, const OUString& rName, com::sun::star::uno::Reference < XCharacterClassification >& rxCI) : aLocale(rLocale), aName(rName), xCI(rxCI) {}; com::sun::star::lang::Locale aLocale; - rtl::OUString aName; + OUString aName; com::sun::star::uno::Reference < XCharacterClassification > xCI; sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) { return aLocale.Language == rLocale.Language && @@ -102,7 +102,7 @@ private: com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL - createLocaleSpecificCharacterClassification(const rtl::OUString& serviceName, const com::sun::star::lang::Locale& rLocale); + createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale); }; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 52409c59796f..b6ba6398f5df 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -47,43 +47,43 @@ public: // Destructor ~CollatorImpl(); - virtual sal_Int32 SAL_CALL compareSubstring(const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1, + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, - const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL compareString( const OUString& s1, + const OUString& s2) throw(com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale, + virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString& impl, const lang::Locale& rLocale, + virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale, const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& collatorAlgorithmName ) + virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: lang::Locale nLocale; private : struct lookupTableItem { lang::Locale aLocale; - rtl::OUString algorithm; - rtl::OUString service; + OUString algorithm; + OUString service; com::sun::star::uno::Reference < XCollator > xC; - lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service, + lookupTableItem(const lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service, com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {} - sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const rtl::OUString& _algorithm) { + sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant && @@ -98,9 +98,9 @@ private : // lang::Locale Data com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; - sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName, - const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm) + sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName, + const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index c3a5491d45fa..daf99068e156 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -40,30 +40,30 @@ public: // Destructor ~Collator_Unicode(); - sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) + sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale, + sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); // following 4 methods are implemented in collatorImpl. sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&, + void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&, const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) + com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& ) + com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: const sal_Char *implementationName; diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 53f56e5158dd..94a18f8beb5c 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -39,9 +39,9 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper4 com::sun::star::lang::XServiceInfo > { - void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const; - void GetCharStr( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const; - void GetRomanString( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const; + void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const; + void GetCharStr( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const; + void GetRomanString( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const; void impl_loadTranslit(); public: DefaultNumberingProvider( @@ -60,7 +60,7 @@ public: throw(com::sun::star::uno::RuntimeException); //XNumberingFormatter - virtual rtl::OUString SAL_CALL makeNumberingString( + virtual OUString SAL_CALL makeNumberingString( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aProperties, const com::sun::star::lang::Locale& aLocale ) @@ -70,27 +70,27 @@ public: //XNumberingTypeInfo virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getNumberingType( const rtl::OUString& NumberingIdentifier ) + virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasNumberingType( const rtl::OUString& NumberingIdentifier ) + virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) + virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( com::sun::star::uno::RuntimeException ); private: com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess; TransliterationImpl* translit; - rtl::OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) + OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) throw(com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isScriptFlagEnabled(const rtl::OUString& aName ) + sal_Bool SAL_CALL isScriptFlagEnabled(const OUString& aName ) throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 698e93df19ea..bda8f3f831da 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -42,60 +42,60 @@ public: virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usePhoneticEntry( const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry, + virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, + const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, - const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, + const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm ) + virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry, + const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, + virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private: - rtl::OUString aServiceName; + OUString aServiceName; com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const rtl::OUString& name) throw( com::sun::star::uno::RuntimeException ); + sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier( - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException); protected: com::sun::star::lang::Locale aLocale; - rtl::OUString aSortAlgorithm; + OUString aSortAlgorithm; }; } } } } diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx index d15ae9703655..687698e45af3 100644 --- a/i18npool/inc/indexentrysupplier_asian.hxx +++ b/i18npool/inc/indexentrysupplier_asian.hxx @@ -34,19 +34,19 @@ public: IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); ~IndexEntrySupplier_asian(); - rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm ) + OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, + const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm ) throw (com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry, - const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) + OUString SAL_CALL getIndexKey( const OUString& rIndexEntry, + const OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) throw (com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL compareIndexEntry( - const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1, + const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2, + const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& rIndexEntry, + OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); #ifndef DISABLE_DYNLOADING diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index 65277c2b5220..c006ad64dc7d 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -44,7 +44,7 @@ public: virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList( + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); @@ -52,50 +52,50 @@ public: const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry, + virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, + const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, - const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, + const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm ) + virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, + const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, + virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: const sal_Char *implementationName; sal_Bool usePhonetic; CollatorImpl *collator; - const rtl::OUString& SAL_CALL getEntry( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + const OUString& SAL_CALL getEntry( const OUString& IndexEntry, + const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); com::sun::star::lang::Locale aLocale; - rtl::OUString aAlgorithm; + OUString aAlgorithm; }; } } } } diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index 757a849af46a..37fffddc3831 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.hxx @@ -35,21 +35,21 @@ public: virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) + const OUString& SortAlgorithm, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) + virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, + const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1, - const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2, + virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, + const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm ) + virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, + const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) throw (com::sun::star::uno::RuntimeException); private: @@ -58,8 +58,8 @@ private: struct IndexKey { sal_Unicode key; - rtl::OUString mkey; - rtl::OUString desc; + OUString mkey; + OUString desc; }; class IndexTable @@ -84,11 +84,11 @@ public: Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext); ~Index(); - void init(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm) throw (com::sun::star::uno::RuntimeException); + void init(const com::sun::star::lang::Locale& rLocale, const OUString& algorithm) throw (com::sun::star::uno::RuntimeException); - void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const rtl::OUString &algorithm) throw (com::sun::star::uno::RuntimeException); - sal_Int16 getIndexWeight(const rtl::OUString& rIndexEntry); - rtl::OUString getIndexDescription(const rtl::OUString& rIndexEntry); + void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const OUString &algorithm) throw (com::sun::star::uno::RuntimeException); + sal_Int16 getIndexWeight(const OUString& rIndexEntry); + OUString getIndexDescription(const OUString& rIndexEntry); IndexTable tables[MAX_TABLES]; sal_Int16 table_count; @@ -96,7 +96,7 @@ public: sal_Int16 key_count; sal_Int16 mkeys[MAX_KEYS]; sal_Int16 mkey_count; - rtl::OUString skipping_chars; + OUString skipping_chars; CollatorImpl *collator; sal_Int16 compare(sal_Unicode c1, sal_Unicode c2); }; diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index 33c8f7378390..85204c805f8f 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx @@ -33,15 +33,15 @@ public: IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic"; }; - virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,\ - const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm ) \ + virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\ + const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \ throw (com::sun::star::uno::RuntimeException);\ - virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, \ - const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\ + virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \ + const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\ throw (com::sun::star::uno::RuntimeException);\ - virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,\ - const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\ - const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,\ + virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\ + const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\ + const OUString& IndexEntry2, const OUString& PhoneticEntry2,\ const com::sun::star::lang::Locale& rLocale2 )\ throw (com::sun::star::uno::RuntimeException);\ }; @@ -54,7 +54,7 @@ public:\ };\ virtual sal_Bool SAL_CALL loadAlgorithm(\ const com::sun::star::lang::Locale& rLocale,\ - const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) \ + const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \ throw (com::sun::star::uno::RuntimeException);\ }; diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index 780ffe8d402f..925b7d1daabd 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -43,17 +43,17 @@ public: InputSequenceCheckerImpl(); ~InputSequenceCheckerImpl(); - virtual sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx index 6ede14da2cad..c91a3f4750ee 100644 --- a/i18npool/inc/inputsequencechecker_hi.hxx +++ b/i18npool/inc/inputsequencechecker_hi.hxx @@ -35,10 +35,10 @@ public: InputSequenceChecker_hi(); ~InputSequenceChecker_hi(); - sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos, + sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos, + sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx index 679dd4fae269..a9e72b12c76d 100644 --- a/i18npool/inc/inputsequencechecker_th.hxx +++ b/i18npool/inc/inputsequencechecker_th.hxx @@ -32,10 +32,10 @@ public: InputSequenceChecker_th(); ~InputSequenceChecker_th(); - sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos, + sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos, + sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 350646ad8d83..dbab5ca6d32e 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -83,36 +83,36 @@ public: virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; virtual com::sun::star::uno::Sequence< com::sun::star::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); // XLocaleData4 - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); // following methods are used by indexentry service - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private : friend sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); @@ -120,13 +120,13 @@ private : ::std::auto_ptr< LocaleDataLookupTableItem > cachedItem; oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException ); - oslGenericFunction SAL_CALL getFunctionSymbolByName( const rtl::OUString& localeName, const sal_Char* pFunction ); + oslGenericFunction SAL_CALL getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction ); sal_Unicode ** SAL_CALL getIndexArray(const com::sun::star::lang::Locale& rLocale, sal_Int16& indexCount); - sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm); + sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm); com::sun::star::i18n::Calendar2 ref_cal; - rtl::OUString ref_name; + OUString ref_name; com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > & - getCalendarItemByName(const rtl::OUString& name, + getCalendarItemByName(const OUString& name, const com::sun::star::lang::Locale& rLocale, const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar2 >& calendarsSeq, sal_Int16 item) throw( com::sun::star::uno::RuntimeException ); diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 510b10395f5a..58c7ec4ed85a 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -40,7 +40,7 @@ public: NativeNumberSupplier(sal_Bool _useOffset = sal_False) : useOffset(_useOffset) {} // Methods - virtual ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString, + virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) throw (::com::sun::star::uno::RuntimeException); @@ -57,15 +57,15 @@ public: throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // following methods are not for XNativeNumberSupplier, they are for calling from transliterations - ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString, + OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw (::com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index f89cbfeecbcd..5d6011f896c3 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -46,11 +46,11 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); private: @@ -62,10 +62,10 @@ private: void setupLocale( const ::com::sun::star::lang::Locale& rLocale ); void getFormats( const ::com::sun::star::lang::Locale& rLocale ); - ::rtl::OUString mapElementTypeShortToString(sal_Int16 formatType); - sal_Int16 mapElementTypeStringToShort(const ::rtl::OUString& formatType); - ::rtl::OUString mapElementUsageShortToString(sal_Int16 formatUsage); - sal_Int16 mapElementUsageStringToShort(const ::rtl::OUString& formatUsage); + OUString mapElementTypeShortToString(sal_Int16 formatType); + sal_Int16 mapElementTypeStringToShort(const OUString& formatType); + OUString mapElementUsageShortToString(sal_Int16 formatUsage); + sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage); void createLocaleDataObject(); }; diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index fb746be4bd6f..17d4bc566aee 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.hxx @@ -36,12 +36,12 @@ class OrdinalSuffix : public cppu::WeakImplHelper2 virtual ~OrdinalSuffix(); // XOrdinalSuffix - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index e31c97dd7ec0..a6a3cf275a1b 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -41,17 +41,17 @@ public: #endif ~TextToPronounce_zh(); - rtl::OUString SAL_CALL - folding(const rtl::OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset) + OUString SAL_CALL + folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset) throw (com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL - equals( const rtl::OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const rtl::OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) + equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) throw (com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL + OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 7e8535d6392c..c4c789729c48 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -44,21 +44,21 @@ public: ~TextConversion(); // Methods virtual com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; - virtual rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + virtual OUString SAL_CALL + getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ) = 0; - virtual rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + virtual OUString SAL_CALL + getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, @@ -72,13 +72,13 @@ public: com::sun::star::lang::NoSupportException ) = 0; //XServiceInfo - rtl::OUString SAL_CALL + OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); sal_Bool SAL_CALL - supportsService(const rtl::OUString& ServiceName) + supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected : @@ -106,21 +106,21 @@ public: // Methods com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, @@ -141,8 +141,8 @@ private : com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; sal_Int32 maxLeftLength; sal_Int32 maxRightLength; - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - getCharConversions(const rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja); + com::sun::star::uno::Sequence< OUString > SAL_CALL + getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja); }; // ---------------------------------------------------- @@ -162,21 +162,21 @@ public: // Methods com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, @@ -192,7 +192,7 @@ public: private : // user defined dictionary list com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; - rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText, + OUString SAL_CALL getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset); rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions); com::sun::star::lang::Locale aLocale; diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index a7fd9233c880..4d83cf23228b 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -41,21 +41,21 @@ public: // Methods com::sun::star::i18n::TextConversionResult SAL_CALL - getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException ); - rtl::OUString SAL_CALL - getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, + OUString SAL_CALL + getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, @@ -69,13 +69,13 @@ public: com::sun::star::lang::NoSupportException ); //XServiceInfo - rtl::OUString SAL_CALL + OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); sal_Bool SAL_CALL - supportsService(const rtl::OUString& ServiceName) + supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); private : diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index fd12616507d1..1e41c5066a67 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -49,54 +49,54 @@ public: ~TransliterationImpl(); // Methods - virtual rtl::OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException) ; virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName, + virtual void SAL_CALL loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, + virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules( + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException) ; - virtual rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, + virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); // Methods in XExtendedTransliteration - virtual rtl::OUString SAL_CALL transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) + virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(com::sun::star::uno::RuntimeException) ; - virtual rtl::OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) + virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) throw(com::sun::star::uno::RuntimeException) ; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) throw(com::sun::star::i18n::MultipleCharsOutputException, com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, - sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, + sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, - const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) + virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( com::sun::star::uno::RuntimeException ); private: @@ -108,18 +108,18 @@ private: com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata; com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore; - virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName, + virtual sal_Bool SAL_CALL loadModuleByName( const OUString& implName, com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); void clear(); - void loadBody( ::rtl::OUString &implName, + void loadBody( OUString &implName, ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body ) throw (::com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getRange( - const com::sun::star::uno::Sequence< rtl::OUString > &inStrs, + com::sun::star::uno::Sequence< OUString > SAL_CALL getRange( + const com::sun::star::uno::Sequence< OUString > &inStrs, sal_Int32 length, const sal_Int16 _nCascade) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index f76ac928c79f..26f92523c8d5 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -36,27 +36,27 @@ namespace com { namespace sun { namespace star { namespace i18n { class transliteration_Ignore : public transliteration_commonclass { public: - virtual rtl::OUString SAL_CALL - folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) + virtual OUString SAL_CALL + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); // This method is shared. sal_Bool SAL_CALL - equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used. - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) + com::sun::star::uno::Sequence< OUString > SAL_CALL + transliterateRange( const OUString& str1, const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); // Methods which are shared. sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL @@ -64,8 +64,8 @@ public: throw(com::sun::star::uno::RuntimeException, com::sun::star::i18n::MultipleCharsOutputException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 ) + com::sun::star::uno::Sequence< OUString > SAL_CALL + transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 ) throw(com::sun::star::uno::RuntimeException); protected: @@ -125,7 +125,7 @@ public:\ transliterationName = "ignore"#name;\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ - rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ + OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \ }; @@ -153,11 +153,11 @@ public:\ transliterationName = "ignore"#name;\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ - rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ + OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \ using transliteration_Ignore::transliterateRange;\ - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, \ - const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \ + com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \ + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ throw(com::sun::star::uno::RuntimeException,\ diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 2658d0a05dec..585e6014c4b7 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -25,8 +25,8 @@ namespace com { namespace sun { namespace star { namespace i18n { class transliteration_Numeric : public transliteration_commonclass { public: - virtual ::rtl::OUString SAL_CALL - transliterate( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) + virtual OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL @@ -37,16 +37,16 @@ public: // Methods which are shared. virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL - folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) + virtual OUString SAL_CALL + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + transliterateRange( const OUString& str1, const OUString& str2 ) throw(::com::sun::star::uno::RuntimeException); protected: sal_Int16 nNativeNumberMode; @@ -54,8 +54,8 @@ protected: sal_Unicode* table; sal_Bool recycleSymbol; private: - rtl::OUString SAL_CALL - transliterateBullet( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, + OUString SAL_CALL + transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 838fe92219f3..36504c37f699 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -29,8 +29,8 @@ typedef sal_Unicode (*TransFunc)(const sal_Unicode); class transliteration_OneToOne : public transliteration_commonclass { public: - rtl::OUString SAL_CALL - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); sal_Unicode SAL_CALL @@ -41,17 +41,17 @@ public: // Methods which are shared. sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL - folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) + OUString SAL_CALL + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL - equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) + com::sun::star::uno::Sequence< OUString > SAL_CALL + transliterateRange( const OUString& str1, const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); protected: @@ -64,8 +64,8 @@ class name : public transliteration_OneToOne \ { \ public: \ name (); \ - rtl::OUString SAL_CALL \ - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \ + OUString SAL_CALL \ + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \ throw(com::sun::star::uno::RuntimeException); \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index cddc9ed2acb7..9fb480038aab 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -32,10 +32,10 @@ public: // Methods which are shared. sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL transliterate(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, + OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); - rtl::OUString SAL_CALL + OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException); @@ -44,16 +44,16 @@ public: throw(com::sun::star::uno::RuntimeException, com::sun::star::i18n::MultipleCharsOutputException); - rtl::OUString SAL_CALL folding(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, + OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL equals( - const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, - const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); + com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); protected: sal_uInt8 nMappingType; @@ -95,7 +95,7 @@ class Transliteration_titlecase : public Transliteration_body public: Transliteration_titlecase(); - virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); }; class Transliteration_sentencecase : public Transliteration_body @@ -103,7 +103,7 @@ class Transliteration_sentencecase : public Transliteration_body public: Transliteration_sentencecase(); - virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); }; #endif diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx index 56b243648ed8..bac9c614bf1e 100644 --- a/i18npool/inc/transliteration_caseignore.hxx +++ b/i18npool/inc/transliteration_caseignore.hxx @@ -35,31 +35,31 @@ public: void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( - const rtl::OUString& str1, const rtl::OUString& str2 ) + com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( + const OUString& str1, const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL equals( - const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) + const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) throw(com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL compareSubstring( - const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) + const OUString& s1, sal_Int32 off1, sal_Int32 len1, + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL compareString( - const rtl::OUString& s1, - const rtl::OUString& s2) + const OUString& s1, + const OUString& s2) throw(com::sun::star::uno::RuntimeException); protected: TransliterationModules moduleLoaded; private: sal_Int32 SAL_CALL compare( - const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) + const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 058973aa07f7..6e909eaad4f5 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -42,35 +42,35 @@ public: throw(com::sun::star::uno::RuntimeException); void SAL_CALL - loadModuleByImplName( const rtl::OUString& implName, const com::sun::star::lang::Locale& rLocale ) + loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); void SAL_CALL - loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) + loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) throw(com::sun::star::uno::RuntimeException); // Methods which should be implemented in each transliteration module. - virtual rtl::OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) = 0; - virtual rtl::OUString SAL_CALL - transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) + virtual OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException) = 0; - virtual rtl::OUString SAL_CALL - folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) + virtual OUString SAL_CALL + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException) = 0; // Methods in XExtendedTransliteration - virtual rtl::OUString SAL_CALL - transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) + virtual OUString SAL_CALL + transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL @@ -79,27 +79,27 @@ public: com::sun::star::uno::RuntimeException) = 0; virtual sal_Bool SAL_CALL - equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(com::sun::star::uno::RuntimeException) = 0; - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + transliterateRange( const OUString& str1, const OUString& str2 ) throw(com::sun::star::uno::RuntimeException) = 0; virtual sal_Int32 SAL_CALL - compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) + compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL - compareString( const rtl::OUString& s1, const rtl::OUString& s2) + compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); protected: com::sun::star::lang::Locale aLocale; diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx index 8823a5ed3799..60fe370b8fde 100644 --- a/i18npool/inc/unoscripttypedetector.hxx +++ b/i18npool/inc/unoscripttypedetector.hxx @@ -35,20 +35,20 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper2 { public: // Methods - virtual sal_Int32 SAL_CALL beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index 12cc9088a957..847cb097a3f1 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -57,15 +57,15 @@ private: public: xdictionary(const sal_Char *lang); ~xdictionary(); - Boundary nextWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType); - Boundary previousWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType); - Boundary getWordBoundary( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection ); + Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); + Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); + Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection ); void setJapaneseWordBreak(); private: WordBreakCache cache[CACHE_MAX]; - sal_Bool seekSegment(const rtl::OUString& rText, sal_Int32 pos, Boundary& boundary); + sal_Bool seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary); WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary); sal_Bool exists(const sal_uInt32 u); sal_Int32 getLongestMatch(const sal_Unicode *text, sal_Int32 len); diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 1e47e9854521..190982b60495 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -91,10 +91,10 @@ void TestBreakIterator::testLineBreaking() //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 { - rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); + OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { //Here we want the line break to leave text here) on the next line @@ -112,11 +112,11 @@ void TestBreakIterator::testLineBreaking() //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 { const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; - rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); - rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); + OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); + OUString aTest(OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); - aLocale.Language = rtl::OUString("he"); - aLocale.Country = rtl::OUString("IL"); + aLocale.Language = OUString("he"); + aLocale.Country = OUString("IL"); { //Here we want the line break to happen at the whitespace @@ -127,10 +127,10 @@ void TestBreakIterator::testLineBreaking() //See https://issues.apache.org/ooo/show_bug.cgi?id=17155 { - rtl::OUString aTest("foo /bar/baz"); + OUString aTest("foo /bar/baz"); - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { //Here we want the line break to leave /bar/ba clumped together on the next line @@ -142,10 +142,10 @@ void TestBreakIterator::testLineBreaking() //See https://issues.apache.org/ooo/show_bug.cgi?id=19716 { - rtl::OUString aTest("aaa]aaa"); + OUString aTest("aaa]aaa"); - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { //Here we want the line break to move the whole lot to the next line @@ -160,14 +160,14 @@ void TestBreakIterator::testLineBreaking() void TestBreakIterator::testWordBoundaries() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); i18n::Boundary aBounds; //See https://issues.apache.org/ooo/show_bug.cgi?id=11993 { - rtl::OUString aTest("abcd ef ghi??? KLM"); + OUString aTest("abcd ef ghi??? KLM"); CPPUNIT_ASSERT(!m_xBreak->isBeginWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD)); CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD)); @@ -198,7 +198,7 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=21907 { - rtl::OUString aTest("b a?"); + OUString aTest("b a?"); CPPUNIT_ASSERT(m_xBreak->isBeginWord(aTest, 1, aLocale, i18n::WordType::ANY_WORD)); CPPUNIT_ASSERT(m_xBreak->isBeginWord(aTest, 2, aLocale, i18n::WordType::ANY_WORD)); @@ -226,7 +226,7 @@ void TestBreakIterator::testWordBoundaries() 't', ' ', 'e', 'v', 'e', 'n', ' ' , 0x00BF, 'r', 'e', 'a', 'l', '?', ' ', 'S', 'p', 'a', 'n', 'i', 's', 'h' }; - rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); + OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD, false); CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7); @@ -257,8 +257,8 @@ void TestBreakIterator::testWordBoundaries() //make sure that in all cases isBeginWord and isEndWord matches getWordBoundary for (size_t i = 0; i < SAL_N_ELEMENTS(aBreakTests); ++i) { - rtl::OUString aTest("Word"); - aTest += rtl::OUString(aBreakTests[i]) + rtl::OUString("Word"); + OUString aTest("Word"); + aTest += OUString(aBreakTests[i]) + OUString("Word"); aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true); switch (mode) { @@ -287,8 +287,8 @@ void TestBreakIterator::testWordBoundaries() //make sure that in all cases isBeginWord and isEndWord matches getWordBoundary for (size_t i = 0; i < SAL_N_ELEMENTS(aJoinTests); ++i) { - rtl::OUString aTest("Word"); - aTest += rtl::OUString(aJoinTests[i]) + rtl::OUString("Word"); + OUString aTest("Word"); + aTest += OUString(aJoinTests[i]) + OUString("Word"); aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true); switch (mode) { @@ -313,7 +313,7 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=13494 { - const rtl::OUString aBase("xxAAxxBBxxCCxx"); + const OUString aBase("xxAAxxBBxxCCxx"); const sal_Unicode aTests[] = { '\'', ';', ',', '.', '!', '@', '#', '%', '&', '*', @@ -324,7 +324,7 @@ void TestBreakIterator::testWordBoundaries() const sal_Int32 aDoublePositions[] = {0, 2, 4, 6, 8, 10, 12, 14}; for (size_t j = 0; j < SAL_N_ELEMENTS(aTests); ++j) { - rtl::OUString aTest = aBase.replace('x', aTests[j]); + OUString aTest = aBase.replace('x', aTests[j]); sal_Int32 nPos = -1; size_t i = 0; do @@ -347,7 +347,7 @@ void TestBreakIterator::testWordBoundaries() const sal_Int32 aSinglePositions[] = {0, 1, 3, 4, 6, 7, 9, 10}; for (size_t j = 1; j < SAL_N_ELEMENTS(aTests); ++j) { - rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), rtl::OUString(aTests[j])); + OUString aTest = aBase.replaceAll(OUString("xx"), OUString(aTests[j])); sal_Int32 nPos = -1; size_t i = 0; do @@ -370,7 +370,7 @@ void TestBreakIterator::testWordBoundaries() const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10}; CPPUNIT_ASSERT(aTests[0] == '\''); { - rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), rtl::OUString(aTests[0])); + OUString aTest = aBase.replaceAll(OUString("xx"), OUString(aTests[0])); sal_Int32 nPos = -1; size_t i = 0; do @@ -393,10 +393,10 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=13451 { - aLocale.Language = rtl::OUString("ca"); - aLocale.Country = rtl::OUString("ES"); + aLocale.Language = OUString("ca"); + aLocale.Country = OUString("ES"); - rtl::OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!"); + OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!"); sal_Int32 nPos = 0; sal_Int32 aExpected[] = {8, 20, 30, 34, 39, 51, 52}; @@ -418,12 +418,12 @@ void TestBreakIterator::testWordBoundaries() switch (j) { case 0: - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); break; case 1: - aLocale.Language = rtl::OUString("ca"); - aLocale.Country = rtl::OUString("ES"); + aLocale.Language = OUString("ca"); + aLocale.Country = OUString("ES"); break; default: CPPUNIT_ASSERT(false); @@ -434,7 +434,7 @@ void TestBreakIterator::testWordBoundaries() { 'I', 0x200B, 'w', 'a', 'n', 't', 0x200B, 't', 'o', 0x200B, 'g', 'o' }; - rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); + OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); sal_Int32 nPos = 0; sal_Int32 aExpected[] = {1, 6, 9, 12}; @@ -456,12 +456,12 @@ void TestBreakIterator::testWordBoundaries() switch (j) { case 0: - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); break; case 1: - aLocale.Language = rtl::OUString("grc"); - aLocale.Country = rtl::OUString(); + aLocale.Language = OUString("grc"); + aLocale.Country = OUString(); break; default: CPPUNIT_ASSERT(false); @@ -475,7 +475,7 @@ void TestBreakIterator::testWordBoundaries() 0x03C2, 0x0020, 0x1F00, 0x03BB, 0x03BB, 0x0020, 0x1F24, 0x03C3, 0x03B8, 0x03B9, 0x03BF, 0x03BD }; - rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); + OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); sal_Int32 nPos = 0; sal_Int32 aExpected[] = {5, 15, 19, 26}; @@ -496,7 +496,7 @@ void TestBreakIterator::testWordBoundaries() aLocale.Language = "fi"; aLocale.Country = "FI"; - rtl::OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi"); + OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi"); { sal_Int32 nPos = 0; @@ -533,14 +533,14 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=107843 { - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); const sal_Unicode TEST[] = { 'r', 'u', 0xFB00, 'l', 'e', ' ', 0xFB01, 's', 'h' }; - rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); + OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale, i18n::WordType::DICTIONARY_WORD, false); CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 5); @@ -551,14 +551,14 @@ void TestBreakIterator::testWordBoundaries() //See https://issues.apache.org/ooo/show_bug.cgi?id=113785 { - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); const sal_Unicode TEST[] = { 'a', 0x2013, 'b', 0x2014, 'c' }; - rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); + OUString aTest(TEST, SAL_N_ELEMENTS(TEST)); aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 1); @@ -578,12 +578,12 @@ void TestBreakIterator::testWordBoundaries() void TestBreakIterator::testGraphemeIteration() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("bn"); - aLocale.Country = rtl::OUString("IN"); + aLocale.Language = OUString("bn"); + aLocale.Country = OUString("IN"); { const sal_Unicode BA_HALANT_LA[] = { 0x09AC, 0x09CD, 0x09AF }; - rtl::OUString aTest(BA_HALANT_LA, SAL_N_ELEMENTS(BA_HALANT_LA)); + OUString aTest(BA_HALANT_LA, SAL_N_ELEMENTS(BA_HALANT_LA)); sal_Int32 nDone=0; sal_Int32 nPos; @@ -597,7 +597,7 @@ void TestBreakIterator::testGraphemeIteration() { const sal_Unicode HA_HALANT_NA_VOWELSIGNI[] = { 0x09B9, 0x09CD, 0x09A3, 0x09BF }; - rtl::OUString aTest(HA_HALANT_NA_VOWELSIGNI, SAL_N_ELEMENTS(HA_HALANT_NA_VOWELSIGNI)); + OUString aTest(HA_HALANT_NA_VOWELSIGNI, SAL_N_ELEMENTS(HA_HALANT_NA_VOWELSIGNI)); sal_Int32 nDone=0; sal_Int32 nPos; @@ -611,7 +611,7 @@ void TestBreakIterator::testGraphemeIteration() { const sal_Unicode TA_HALANT_MA_HALANT_YA [] = { 0x09A4, 0x09CD, 0x09AE, 0x09CD, 0x09AF }; - rtl::OUString aTest(TA_HALANT_MA_HALANT_YA, SAL_N_ELEMENTS(TA_HALANT_MA_HALANT_YA)); + OUString aTest(TA_HALANT_MA_HALANT_YA, SAL_N_ELEMENTS(TA_HALANT_MA_HALANT_YA)); sal_Int32 nDone=0; sal_Int32 nPos; @@ -623,12 +623,12 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0); } - aLocale.Language = rtl::OUString("ta"); - aLocale.Country = rtl::OUString("IN"); + aLocale.Language = OUString("ta"); + aLocale.Country = OUString("IN"); { const sal_Unicode KA_VIRAMA_SSA[] = { 0x0B95, 0x0BCD, 0x0BB7 }; - rtl::OUString aTest(KA_VIRAMA_SSA, SAL_N_ELEMENTS(KA_VIRAMA_SSA)); + OUString aTest(KA_VIRAMA_SSA, SAL_N_ELEMENTS(KA_VIRAMA_SSA)); sal_Int32 nDone=0; sal_Int32 nPos = 0; @@ -643,7 +643,7 @@ void TestBreakIterator::testGraphemeIteration() { const sal_Unicode KA_VOWELSIGNU[] = { 0x0B95, 0x0BC1 }; - rtl::OUString aTest(KA_VOWELSIGNU, SAL_N_ELEMENTS(KA_VOWELSIGNU)); + OUString aTest(KA_VOWELSIGNU, SAL_N_ELEMENTS(KA_VOWELSIGNU)); sal_Int32 nDone=0; sal_Int32 nPos = 0; @@ -659,7 +659,7 @@ void TestBreakIterator::testGraphemeIteration() { const sal_Unicode CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI[] = { 0x0B9A, 0x0BBF, 0x0BA4, 0x0BCD, 0x0BA4, 0x0BBF, 0x0BB0, 0x0BC8 }; - rtl::OUString aTest(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI, + OUString aTest(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI, SAL_N_ELEMENTS(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI)); sal_Int32 nDone=0; @@ -684,7 +684,7 @@ void TestBreakIterator::testGraphemeIteration() { const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 }; - rtl::OUString aText(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS)); + OUString aText(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS)); sal_Int32 nGraphemeCount = 0; @@ -700,12 +700,12 @@ void TestBreakIterator::testGraphemeIteration() CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1); } - aLocale.Language = rtl::OUString("hi"); - aLocale.Country = rtl::OUString("IN"); + aLocale.Language = OUString("hi"); + aLocale.Country = OUString("IN"); { const sal_Unicode SHA_VOWELSIGNII[] = { 0x936, 0x940 }; - rtl::OUString aTest(SHA_VOWELSIGNII, SAL_N_ELEMENTS(SHA_VOWELSIGNII)); + OUString aTest(SHA_VOWELSIGNII, SAL_N_ELEMENTS(SHA_VOWELSIGNII)); sal_Int32 nDone=0; sal_Int32 nPos = 0; @@ -725,8 +725,8 @@ void TestBreakIterator::testGraphemeIteration() void TestBreakIterator::testWeak() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { const sal_Unicode WEAKS[] = @@ -744,12 +744,12 @@ void TestBreakIterator::testWeak() 0x25A0, 0x25FF, //Geometric Shapes 0x2B30, 0x2B4C //Miscellaneous Symbols and Arrows }; - rtl::OUString aWeaks(WEAKS, SAL_N_ELEMENTS(WEAKS)); + OUString aWeaks(WEAKS, SAL_N_ELEMENTS(WEAKS)); for (sal_Int32 i = 0; i < aWeaks.getLength(); ++i) { sal_Int16 nScript = m_xBreak->getScriptType(aWeaks, i); - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; aMsg.append(RTL_CONSTASCII_STRINGPARAM("Char 0x")); aMsg.append(static_cast<sal_Int32>(aWeaks.getStr()[i]), 16); aMsg.append(RTL_CONSTASCII_STRINGPARAM(" should have been weak")); @@ -766,8 +766,8 @@ void TestBreakIterator::testWeak() void TestBreakIterator::testAsian() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("en"); - aLocale.Country = rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { const sal_Unicode ASIANS[] = @@ -783,12 +783,12 @@ void TestBreakIterator::testAsian() //UAX25 as "Latin", i.e. by that logic LATIN 0xFF21, 0xFF5A }; - rtl::OUString aAsians(ASIANS, SAL_N_ELEMENTS(ASIANS)); + OUString aAsians(ASIANS, SAL_N_ELEMENTS(ASIANS)); for (sal_Int32 i = 0; i < aAsians.getLength(); ++i) { sal_Int16 nScript = m_xBreak->getScriptType(aAsians, i); - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; aMsg.append(RTL_CONSTASCII_STRINGPARAM("Char 0x")); aMsg.append(static_cast<sal_Int32>(aAsians.getStr()[i]), 16); aMsg.append(RTL_CONSTASCII_STRINGPARAM(" should have been asian")); @@ -802,13 +802,13 @@ void TestBreakIterator::testAsian() void TestBreakIterator::testThai() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("th"); - aLocale.Country = rtl::OUString("TH"); + aLocale.Language = OUString("th"); + aLocale.Country = OUString("TH"); //See http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html { const sal_Unicode THAI[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; - rtl::OUString aTest(THAI, SAL_N_ELEMENTS(THAI)); + OUString aTest(THAI, SAL_N_ELEMENTS(THAI)); i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); CPPUNIT_ASSERT_MESSAGE("Should skip full word", @@ -827,7 +827,7 @@ void TestBreakIterator::testThai() 0x0E2B, 0x0E48, 0x0E07, 0x0E0A, 0x0E32, 0x0E15, 0x0E34, 0x0E19, 0x0E49, 0x0E33, 0x0E2B, 0x0E19, 0x0E32, 0x0E27 }; - rtl::OUString aTest(THAI, SAL_N_ELEMENTS(THAI)); + OUString aTest(THAI, SAL_N_ELEMENTS(THAI)); std::stack<sal_Int32> aPositions; sal_Int32 nPos = -1; @@ -855,11 +855,11 @@ void TestBreakIterator::testThai() void TestBreakIterator::testNorthernThai() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("nod"); - aLocale.Country = rtl::OUString("TH"); + aLocale.Language = OUString("nod"); + aLocale.Country = OUString("TH"); const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; - rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); + OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); CPPUNIT_ASSERT_MESSAGE("Should skip full word", @@ -876,12 +876,12 @@ void TestBreakIterator::testNorthernThai() void TestBreakIterator::testKhmer() { lang::Locale aLocale; - aLocale.Language = rtl::OUString("km"); - aLocale.Country = rtl::OUString("KH"); + aLocale.Language = OUString("km"); + aLocale.Country = OUString("KH"); const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 }; - rtl::OUString aTest(KHMER, SAL_N_ELEMENTS(KHMER)); + OUString aTest(KHMER, SAL_N_ELEMENTS(KHMER)); i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); @@ -904,7 +904,7 @@ void TestBreakIterator::testJapanese() { const sal_Unicode JAPANESE[] = { 0x30B7, 0x30E3, 0x30C3, 0x30C8, 0x30C0, 0x30A6, 0x30F3 }; - rtl::OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE)); + OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE)); aBounds = m_xBreak->getWordBoundary(aTest, 5, aLocale, i18n::WordType::DICTIONARY_WORD, true); @@ -914,7 +914,7 @@ void TestBreakIterator::testJapanese() { const sal_Unicode JAPANESE[] = { 0x9EBB, 0x306E, 0x8449, 0x9EBB, 0x306E, 0x8449 }; - rtl::OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE)); + OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE)); aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale, i18n::WordType::DICTIONARY_WORD, true); diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 7e99ec2fd419..c5857993d953 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -59,29 +59,29 @@ private: void TestCharacterClassification::testTitleCase() { lang::Locale aLocale; - aLocale.Language = ::rtl::OUString("en"); - aLocale.Country = ::rtl::OUString("US"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); { //basic example - ::rtl::OUString sTest("Some text"); - ::rtl::OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), aLocale); + OUString sTest("Some text"); + OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be title", sTitleCase == "Some Text"); - ::rtl::OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), aLocale); + OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be upper", sUpperCase == "SOME TEXT"); - ::rtl::OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), aLocale); + OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be lower ", sLowerCase == "some text"); } { //tricky one const sal_Unicode LATINSMALLLETTERDZ[] = { 0x01F3 }; - ::rtl::OUString aTest(LATINSMALLLETTERDZ, SAL_N_ELEMENTS(LATINSMALLLETTERDZ)); - ::rtl::OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale); + OUString aTest(LATINSMALLLETTERDZ, SAL_N_ELEMENTS(LATINSMALLLETTERDZ)); + OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be title", sTitleCase.getLength() == 1 && sTitleCase[0] == 0x01F2); - ::rtl::OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale); + OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be upper", sUpperCase.getLength() == 1 && sUpperCase[0] == 0x01F1); - ::rtl::OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale); + OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale); CPPUNIT_ASSERT_MESSAGE("Should be lower ", sLowerCase.getLength() == 1 && sLowerCase[0] == 0x01F3); } } diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 2bf2a03e3de3..72da09f87629 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -35,8 +35,6 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace com { namespace sun { namespace star { namespace i18n { @@ -228,7 +226,7 @@ sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) { * @param pos : Position of the given character. * @return true if CJK. */ -sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos, +sal_Bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, Boundary& segBoundary) { sal_Int32 indexUtf16; diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 81a191b72e57..1d0e2b4e9575 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index e01abaf0cf64..fa26966c0f24 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -120,7 +120,6 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r ) using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { @@ -1173,7 +1172,7 @@ Calendar_gregorian::getImplementationName(void) throw( RuntimeException ) } sal_Bool SAL_CALL -Calendar_gregorian::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException ) +Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return !rServiceName.compareToAscii(cCalendar); } diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index 237047cbb2d3..634c414efd2e 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index d3ab35100bcf..65f8f9cc047c 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace com { namespace sun { namespace star { namespace i18n { @@ -210,7 +208,7 @@ CharacterClassificationImpl::getImplementationName(void) } sal_Bool SAL_CALL -CharacterClassificationImpl::supportsService(const rtl::OUString& rServiceName) +CharacterClassificationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return !rServiceName.compareToAscii(cClass); diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index aeaa34ad1891..14857d6df5f3 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -25,62 +25,62 @@ // ----------------------------------------------------; sal_Int16 SAL_CALL -UnoScriptTypeDetector::getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection); } // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction); } sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction); } sal_Int16 SAL_CALL -UnoScriptTypeDetector::getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::getCTLScriptType(Text, nPos); } // Begin of Script Type is inclusive. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos); } // End of the Script Type is exclusive, the return value pointing to the begin of next script type sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) { return ScriptTypeDetector::endOfCTLScriptType(Text, nPos); } const sal_Char sDetector[] = "draft.com.sun.star.i18n.UnoScriptTypeDetector"; -rtl::OUString SAL_CALL +OUString SAL_CALL UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { - return rtl::OUString(sDetector); + return OUString(sDetector); } sal_Bool SAL_CALL -UnoScriptTypeDetector::supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ) +UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ) { return ServiceName != sDetector; } -::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); + ::com::sun::star::uno::Sequence< OUString > aRet(1); aRet[0] = sDetector; return aRet; } diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index 23c936df4a12..a4630fa363b7 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -83,7 +83,7 @@ ChapterCollator::getImplementationName() throw( RuntimeException ) } sal_Bool SAL_CALL -ChapterCollator::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException ) +ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return !rServiceName.compareToAscii(cChapCollator); } diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 35cfd3c91c7b..2a184523155f 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -28,8 +28,6 @@ using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 2ba089a43418..4e7990828dae 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -244,7 +244,7 @@ Collator_Unicode::getImplementationName() throw( RuntimeException ) } sal_Bool SAL_CALL -Collator_Unicode::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException ) +Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return !rServiceName.compareToAscii(implementationName); } diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 61573a964996..4e962c8edccd 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1049,7 +1049,7 @@ OUString DefaultNumberingProvider::getImplementationName(void) return OUString::createFromAscii(cDefaultNumberingProvider); } -sal_Bool DefaultNumberingProvider::supportsService(const rtl::OUString& rServiceName) +sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) throw( RuntimeException ) { return rServiceName.equalsAscii(cDefaultNumberingProvider); diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx index a03fde10c4c3..9c7cd94c8cc4 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx @@ -20,7 +20,6 @@ #include <inputsequencechecker_hi.hxx> -using ::rtl::OUString; namespace com { namespace sun { diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index e0ea3a9ebd67..488145573cac 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -21,7 +21,6 @@ #include <inputsequencechecker_th.hxx> #include <wtt.h> -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 9ec83baaab5e..fc211343fe41 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -33,7 +33,7 @@ // NOTE: MUST match the Locale versionDTD attribute defined in data/locale.dtd #define LOCALE_VERSION_DTD "2.0.3" -typedef ::std::set< ::rtl::OUString > NameSet; +typedef ::std::set< OUString > NameSet; typedef ::std::set< sal_Int16 > ValueSet; namespace cssi = ::com::sun::star::i18n; @@ -59,7 +59,7 @@ int LocaleNode::getError() const void LocaleNode::print () const { printf ("<"); - ::rtl::OUString str (aName); + OUString str (aName); for(sal_Int32 i = 0; i < str.getLength(); i++) printf( "%c", str[i]); printf (">\n"); @@ -224,7 +224,7 @@ void print_node( const LocaleNode* p, int depth=0 ) void LocaleNode :: generateCode (const OFileWriter &of) const { - ::rtl::OUString aDTD = getAttr().getValueByName("versionDTD"); + OUString aDTD = getAttr().getValueByName("versionDTD"); if ( aDTD != LOCALE_VERSION_DTD ) { ++nError; @@ -236,7 +236,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const } -::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of, +OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of, const char* pParameterName, const LocaleNode* pNode, sal_Int32 nMinLen, sal_Int32 nMaxLen ) const { @@ -272,7 +272,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const } -::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of, +OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of, const char* pNodeName, const char* pParameterName, sal_Int32 nMinLen, sal_Int32 nMaxLen ) const { @@ -296,7 +296,7 @@ void LocaleNode::incError( const char* pStr ) const fprintf( stderr, "Error: %s\n", pStr); } -void LocaleNode::incError( const ::rtl::OUString& rStr ) const +void LocaleNode::incError( const OUString& rStr ) const { incError( OSTR( rStr)); } @@ -321,13 +321,13 @@ void LocaleNode::incErrorInt( const char* pStr, int nVal ) const fprintf( stderr, prepareErrorFormat( pStr, ": %d"), nVal); } -void LocaleNode::incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const +void LocaleNode::incErrorStr( const char* pStr, const OUString& rVal ) const { ++nError; fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OSTR( rVal)); } -void LocaleNode::incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const +void LocaleNode::incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const { ++nError; fprintf( stderr, prepareErrorFormat( pStr, ": %s %s"), OSTR( rVal1), OSTR( rVal2)); @@ -361,7 +361,7 @@ void LCInfoNode::generateCode (const OFileWriter &of) const "Variants are not supported by application."); } else - of.writeParameter("Variant", ::rtl::OUString()); + of.writeParameter("Variant", OUString()); of.writeAsciiString("\nstatic const sal_Unicode* LCInfoArray[] = {\n"); of.writeAsciiString("\tlangID,\n"); of.writeAsciiString("\tlangDefaultName,\n"); @@ -379,12 +379,12 @@ static OUString aDecSep; void LCCTYPENode::generateCode (const OFileWriter &of) const { const LocaleNode * sepNode = 0; - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getLocaleItem_", useLocale); return; } - ::rtl::OUString str = getAttr().getValueByName("unoid"); + OUString str = getAttr().getValueByName("unoid"); of.writeAsciiString("\n\n"); of.writeParameter("LC_CTYPE_Unoid", str);; @@ -627,7 +627,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const } } - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { switch (mnSection) @@ -876,7 +876,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const if (n) of.writeParameter("FormatDefaultName", n->getValue(), formatCount); else - of.writeParameter("FormatDefaultName", ::rtl::OUString(), formatCount); + of.writeParameter("FormatDefaultName", OUString(), formatCount); } @@ -1265,7 +1265,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const void LCCollationNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getCollatorImplementation_", useLocale); of.writeRefFunction("getCollationOptions_", useLocale); @@ -1279,7 +1279,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const LocaleNode * currNode = getChildAt (j); if( currNode->getName().compareToAscii("Collator") == 0 ) { - ::rtl::OUString str; + OUString str; str = currNode->getAttr().getValueByName("unoid"); of.writeParameter("CollatorID", str, j); str = currNode->getValue(); @@ -1338,7 +1338,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const void LCSearchNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getSearchOptions_", useLocale); return; @@ -1376,7 +1376,7 @@ void LCSearchNode::generateCode (const OFileWriter &of) const void LCIndexNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getIndexAlgorithm_", useLocale); of.writeRefFunction("getUnicodeScripts_", useLocale); @@ -1391,7 +1391,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const LocaleNode * currNode = getChildAt (i); if( currNode->getName().compareToAscii("IndexKey") == 0 ) { - ::rtl::OUString str; + OUString str; str = currNode->getAttr().getValueByName("unoid"); of.writeParameter("IndexID", str, nbOfIndexs); str = currNode->getAttr().getValueByName("module"); @@ -1536,13 +1536,13 @@ static void lcl_writeAbbrFullNarrArrays( const OFileWriter & of, sal_Int16 nCoun void LCCalendarNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getAllCalendars_", useLocale); return; } sal_Int16 nbOfCalendars = sal::static_int_cast<sal_Int16>( getNumberOfChildren() ); - ::rtl::OUString str; + OUString str; sal_Int16 * nbOfDays = new sal_Int16[nbOfCalendars]; sal_Int16 * nbOfMonths = new sal_Int16[nbOfCalendars]; sal_Int16 * nbOfGenitiveMonths = new sal_Int16[nbOfCalendars]; @@ -1568,7 +1568,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const // Generate Days of Week const sal_Char *elementTag; LocaleNode * daysNode = NULL; - ::rtl::OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref"); + OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref"); if (!ref_name.isEmpty() && i > 0) { for (j = 0; j < i; j++) { str = getChildAt(j)->getAttr().getValueByName("unoid"); @@ -1851,13 +1851,13 @@ bool isIso4217( const OUString& rStr ) void LCCurrencyNode :: generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getAllCurrencies_", useLocale); return; } sal_Int16 nbOfCurrencies = 0; - ::rtl::OUString str; + OUString str; sal_Int16 i; bool bTheDefault= false; @@ -1952,13 +1952,13 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const void LCTransliterationNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getTransliterations_", useLocale); return; } sal_Int16 nbOfModules = 0; - ::rtl::OUString str; + OUString str; sal_Int16 i; for ( i = 0; i < getNumberOfChildren(); i++,nbOfModules++) { @@ -2001,7 +2001,7 @@ static NameValuePair ReserveWord[] = { void LCMiscNode::generateCode (const OFileWriter &of) const { - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction("getForbiddenCharacters_", useLocale); of.writeRefFunction("getBreakIteratorRules_", useLocale); @@ -2017,7 +2017,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const bool bEnglishLocale = (strncmp( of.getLocale(), "en_", 3) == 0); sal_Int16 nbOfWords = 0; - ::rtl::OUString str; + OUString str; sal_Int16 i; for ( i = 0; i < sal_Int16(SAL_N_ELEMENTS(ReserveWord)); i++,nbOfWords++) { @@ -2060,9 +2060,9 @@ void LCMiscNode::generateCode (const OFileWriter &of) const of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue()); of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue()); } else { - of.writeParameter( "forbiddenBegin", ::rtl::OUString()); - of.writeParameter( "forbiddenEnd", ::rtl::OUString()); - of.writeParameter( "hangingChars", ::rtl::OUString()); + of.writeParameter( "forbiddenBegin", OUString()); + of.writeParameter( "forbiddenEnd", OUString()); + of.writeParameter( "hangingChars", OUString()); } of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n"); of.writeAsciiString("\tforbiddenBegin,\n"); @@ -2078,11 +2078,11 @@ void LCMiscNode::generateCode (const OFileWriter &of) const of.writeParameter( "CharacterMode", breakNode -> getChildAt(3)->getValue()); of.writeParameter( "LineMode", breakNode -> getChildAt(4)->getValue()); } else { - of.writeParameter( "EditMode", ::rtl::OUString()); - of.writeParameter( "DictionaryMode", ::rtl::OUString()); - of.writeParameter( "WordCountMode", ::rtl::OUString()); - of.writeParameter( "CharacterMode", ::rtl::OUString()); - of.writeParameter( "LineMode", ::rtl::OUString()); + of.writeParameter( "EditMode", OUString()); + of.writeParameter( "DictionaryMode", OUString()); + of.writeParameter( "WordCountMode", OUString()); + of.writeParameter( "CharacterMode", OUString()); + of.writeParameter( "LineMode", OUString()); } of.writeAsciiString("\nstatic const sal_Unicode* LCBreakIteratorRulesArray[] = {\n"); of.writeAsciiString("\tEditMode,\n"); @@ -2098,7 +2098,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const void LCNumberingLevelNode::generateCode (const OFileWriter &of) const { of.writeAsciiString("// ---> ContinuousNumbering\n"); - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction2("getContinuousNumberingLevels_", useLocale); return; @@ -2168,7 +2168,7 @@ void LCNumberingLevelNode::generateCode (const OFileWriter &of) const void LCOutlineNumberingLevelNode::generateCode (const OFileWriter &of) const { of.writeAsciiString("// ---> OutlineNumbering\n"); - ::rtl::OUString useLocale = getAttr().getValueByName("ref"); + OUString useLocale = getAttr().getValueByName("ref"); if (!useLocale.isEmpty()) { of.writeRefFunction3("getOutlineNumberingLevels_", useLocale); return; diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index 3acc65525358..27b0027d5622 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -47,26 +47,26 @@ public: OFileWriter(const char *pcFile, const char *locale ); virtual ~OFileWriter(); - virtual void writeStringCharacters(const ::rtl::OUString& str) const; + virtual void writeStringCharacters(const OUString& str) const; virtual void writeAsciiString(const char *str)const ; virtual void writeInt(sal_Int16 nb) const; virtual void writeFunction(const char *func, const char *count, const char *array) const; - virtual void writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const; + virtual void writeRefFunction(const char *func, const OUString& useLocale) const; virtual void writeFunction(const char *func, const char *count, const char *array, const char *from, const char *to) const; - virtual void writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const; + virtual void writeRefFunction(const char *func, const OUString& useLocale, const char *to) const; virtual void writeFunction2(const char *func, const char *style, const char* attr, const char *array) const; - virtual void writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const; + virtual void writeRefFunction2(const char *func, const OUString& useLocale) const; virtual void writeFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const; - virtual void writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const; + virtual void writeRefFunction3(const char *func, const OUString& useLocale) const; virtual void writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const; - virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const; - virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const; - virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const; - virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const; - virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; - virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const; - virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const; - virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; + virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const; + virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const; + virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const; + virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const; + virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; + virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const; + virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const; + virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; virtual void flush(void) const ; virtual void closeOutput(void) const; /// Return the locale string, something like en_US or de_DE @@ -132,14 +132,14 @@ public: // ++nError with output to stderr void incError( const char* pStr ) const; // ++nError with output to stderr - void incError( const ::rtl::OUString& rStr ) const; + void incError( const OUString& rStr ) const; // ++nError with output to stderr, pStr should contain "%d", otherwise appended void incErrorInt( const char* pStr, int nVal ) const; // ++nError with output to stderr, pStr should contain "%s", otherwise appended - void incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const; + void incErrorStr( const char* pStr, const OUString& rVal ) const; // ++nError with output to stderr, pStr should contain "%s %s", otherwise // appended - void incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const; + void incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const; // used by incError...(), returns a pointer to a static buffer, // pDefaultConversion is appended if pFormat doesn't contain a % // specification and should be something like ": %d" or ": %s" or similar. diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index 8ea5c70478a0..7a9505a51c92 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -49,7 +49,7 @@ void OFileWriter::writeAsciiString(const char* str) const fprintf(m_f, "%s", str); } -void OFileWriter::writeStringCharacters(const ::rtl::OUString& str) const +void OFileWriter::writeStringCharacters(const OUString& str) const { for(int i = 0; i < str.getLength(); i++) fprintf(m_f, "0x%x, ", str[i]); @@ -62,7 +62,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array); } -void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const +void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale) const { OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) ); const char* locale = aRefLocale.getStr(); @@ -80,7 +80,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array); } -void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const +void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale, const char *to) const { OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) ); const char* locale = aRefLocale.getStr(); @@ -99,7 +99,7 @@ void OFileWriter::writeFunction2(const char *func, const char *style, const char fprintf(m_f, "\treturn %s;\n}\n", array); } -void OFileWriter::writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const +void OFileWriter::writeRefFunction2(const char *func, const OUString& useLocale) const { OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) ); const char* locale = aRefLocale.getStr(); @@ -117,7 +117,7 @@ void OFileWriter::writeFunction3(const char *func, const char *style, const char fprintf(m_f, "\treturn %s;\n}\n", array); } -void OFileWriter::writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const +void OFileWriter::writeRefFunction3(const char *func, const OUString& useLocale) const { OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) ); const char* locale = aRefLocale.getStr(); @@ -131,56 +131,56 @@ void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 c fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val); } -bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const +bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const { bool bBool = (str == "true" ? 1 : 0); fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool); return bBool; } -bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const +bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const { bool bBool = (str == "true" ? 1 : 0); fprintf(m_f,"static const sal_Unicode default%s[] = {%d};\n", pAsciiStr, bBool); return bBool; } -void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const +void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const { fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr); writeStringCharacters(aChars); fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const +void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const { fprintf(m_f, "static const sal_Unicode %s%d[] = {", pAsciiStr, count); writeStringCharacters(aChars); fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const +void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const { fprintf(m_f, "static const sal_Unicode %s%d%d[] = {", pAsciiStr, count0, count1); writeStringCharacters(aChars); fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const +void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const { fprintf(m_f, "static const sal_Unicode %s%s%d[] = {", pTagStr, pAsciiStr, count); writeStringCharacters(aChars); fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const +void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const { fprintf(m_f, "static const sal_Unicode %s%s[] = {", pTagStr, pAsciiStr); writeStringCharacters(aChars); fprintf(m_f, "0x0};\n"); } -void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const +void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const { fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr, pAsciiStr, count0, count1); writeStringCharacters(aChars); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 66b51747bd1f..7960f5061a69 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; static const sal_Char clocaledata[] = "com.sun.star.i18n.LocaleData"; diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 8de5a8cefc78..e73c0c31a600 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -162,7 +162,7 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset, Number* number ) throw(RuntimeException) { - rtl::OUString aRet; + OUString aRet; sal_Int32 strLen = inStr.getLength() - startPos; sal_Unicode *numberChar = NumberChar[number->number]; diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 99958212a86e..ea0ec9416d26 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -45,8 +45,8 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper() NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString elementType = mapElementTypeShortToString(formatType); - ::rtl::OUString elementUsage = mapElementUsageShortToString(formatUsage); + OUString elementType = mapElementTypeShortToString(formatType); + OUString elementUsage = mapElementUsageShortToString(formatUsage); getFormats( rLocale ); @@ -175,24 +175,24 @@ void NumberFormatCodeMapper::getFormats( const ::com::sun::star::lang::Locale& r } -::rtl::OUString +OUString NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType) { switch ( formatType ) { case com::sun::star::i18n::KNumberFormatType::SHORT : - return ::rtl::OUString( "short" ); + return OUString( "short" ); case com::sun::star::i18n::KNumberFormatType::MEDIUM : - return ::rtl::OUString( "medium" ); + return OUString( "medium" ); case com::sun::star::i18n::KNumberFormatType::LONG : - return ::rtl::OUString( "long" ); + return OUString( "long" ); } - return ::rtl::OUString(); + return OUString(); } sal_Int16 -NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& formatType) +NumberFormatCodeMapper::mapElementTypeStringToShort(const OUString& formatType) { if ( formatType == "short" ) return com::sun::star::i18n::KNumberFormatType::SHORT; @@ -204,34 +204,34 @@ NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& forma return com::sun::star::i18n::KNumberFormatType::SHORT; } -::rtl::OUString +OUString NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage) { switch ( formatUsage ) { case com::sun::star::i18n::KNumberFormatUsage::DATE : - return ::rtl::OUString( "DATE" ); + return OUString( "DATE" ); case com::sun::star::i18n::KNumberFormatUsage::TIME : - return ::rtl::OUString( "TIME" ); + return OUString( "TIME" ); case com::sun::star::i18n::KNumberFormatUsage::DATE_TIME : - return ::rtl::OUString( "DATE_TIME" ); + return OUString( "DATE_TIME" ); case com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER : - return ::rtl::OUString( "FIXED_NUMBER" ); + return OUString( "FIXED_NUMBER" ); case com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER : - return ::rtl::OUString( "FRACTION_NUMBER" ); + return OUString( "FRACTION_NUMBER" ); case com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER : - return ::rtl::OUString( "PERCENT_NUMBER" ); + return OUString( "PERCENT_NUMBER" ); case com::sun::star::i18n::KNumberFormatUsage::CURRENCY : - return ::rtl::OUString( "CURRENCY" ); + return OUString( "CURRENCY" ); case com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER : - return ::rtl::OUString( "SCIENTIFIC_NUMBER" ); + return OUString( "SCIENTIFIC_NUMBER" ); } - return ::rtl::OUString(); + return OUString(); } sal_Int16 -NumberFormatCodeMapper::mapElementUsageStringToShort(const ::rtl::OUString& formatUsage) +NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage) { if ( formatUsage == "DATE" ) return com::sun::star::i18n::KNumberFormatUsage::DATE; @@ -263,27 +263,27 @@ NumberFormatCodeMapper::createLocaleDataObject() { mxLocaleData.set( com::sun::star::i18n::LocaleData::create(mxContext) ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL NumberFormatCodeMapper::getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString("com.sun.star.i18n.NumberFormatCodeMapper"); + return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); } const sal_Char cNumFormat[] = "com.sun.star.i18n.NumberFormatMapper"; sal_Bool SAL_CALL -NumberFormatCodeMapper::supportsService(const rtl::OUString& rServiceName) +NumberFormatCodeMapper::supportsService(const OUString& rServiceName) throw( ::com::sun::star::uno::RuntimeException ) { return !rServiceName.compareToAscii(cNumFormat); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString::createFromAscii(cNumFormat); + ::com::sun::star::uno::Sequence< OUString > aRet(1); + aRet[0] = OUString::createFromAscii(cNumFormat); return aRet; } diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 9eca3a099e0b..45306cfe52c9 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -25,7 +25,7 @@ #include <unicode/rbnf.h> #include <unicode/normlzr.h> -#define CSTR( ouStr ) rtl::OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( ) +#define CSTR( ouStr ) OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( ) using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index d585895d28f9..b9c19b082bc5 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -578,12 +578,12 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Cha { if( 0 == rtl_str_compare( sImplementationName, pArr->pImplementationNm ) ) { - uno::Sequence< ::rtl::OUString > aServiceNames(1); + uno::Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = - ::rtl::OUString::createFromAscii( pArr->pServiceNm ); + OUString::createFromAscii( pArr->pServiceNm ); xFactory = ::cppu::createSingleFactory( pServiceManager, - ::rtl::OUString::createFromAscii( pArr->pImplementationNm ), + OUString::createFromAscii( pArr->pImplementationNm ), *pArr->pFn, aServiceNames ); break; } diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 8bd86a586682..cebda5090a93 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -46,8 +46,8 @@ class TextSearch: public cppu::WeakImplHelper2 ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::util::SearchOptions aSrchPara; - ::rtl::OUString sSrchStr; - ::rtl::OUString sSrchStr2; + OUString sSrchStr; + OUString sSrchStr2; mutable com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass; @@ -59,7 +59,7 @@ class TextSearch: public cppu::WeakImplHelper2 // define a function pointer for the different search nethods typedef ::com::sun::star::util::SearchResult - (SAL_CALL TextSearch:: *FnSrch)( const ::rtl::OUString& searchStr, + (SAL_CALL TextSearch:: *FnSrch)( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ); FnSrch fnForward; @@ -76,22 +76,22 @@ class TextSearch: public cppu::WeakImplHelper2 void MakeBackwardTab2(); sal_Int32 GetDiff( const sal_Unicode ) const; ::com::sun::star::util::SearchResult SAL_CALL - NSrchFrwrd( const ::rtl::OUString& searchStr, + NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::util::SearchResult SAL_CALL - NSrchBkwrd( const ::rtl::OUString& searchStr, + NSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); // Members and methods for the regular expression search RegexMatcher* pRegexMatcher; ::com::sun::star::util::SearchResult SAL_CALL - RESrchFrwrd( const ::rtl::OUString& searchStr, + RESrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::util::SearchResult SAL_CALL - RESrchBkwrd( const ::rtl::OUString& searchStr, + RESrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); void RESrchPrepare( const ::com::sun::star::util::SearchOptions&); @@ -101,18 +101,18 @@ class TextSearch: public cppu::WeakImplHelper2 WLevDistance* pWLD; com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > xBreak; ::com::sun::star::util::SearchResult SAL_CALL - ApproxSrchFrwrd( const ::rtl::OUString& searchStr, + ApproxSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::util::SearchResult SAL_CALL - ApproxSrchBkwrd( const ::rtl::OUString& searchStr, + ApproxSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); - bool IsDelimiter( const ::rtl::OUString& rStr, sal_Int32 nPos ) const; + bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const; sal_Bool checkCTLStart, checkCTLEnd; - sal_Bool SAL_CALL isCellStart(const ::rtl::OUString& searchStr, sal_Int32 nPos) + sal_Bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos) throw(::com::sun::star::uno::RuntimeException); public: @@ -126,20 +126,20 @@ public: setOptions( const ::com::sun::star::util::SearchOptions& options ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::util::SearchResult SAL_CALL - searchForward( const ::rtl::OUString& searchStr, + searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::util::SearchResult SAL_CALL - searchBackward( const ::rtl::OUString& searchStr, + searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index 77f03c6cf935..4c650b4eefc9 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -23,7 +23,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index c03517718421..2c3a0c9a8cca 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index d9fe16ccce20..617ff29f0dad 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index 94c1cd85e1af..1cbd3b3934e8 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index a991c6f80e25..22036446535f 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index a7b028c152b7..911164ae3e43 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 07d56e2648e1..c0e07f3c3ec6 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 57c1b1c676f8..098a6a072fd5 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index 9eb07bd3a420..e525f5dcca35 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index 977f471e4e74..88ea9a89f10f 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 66f45c5bbee6..67ad5043fda3 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx index 9891febfe712..76cb444aead5 100644 --- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index 1d40692880cc..aa4e87b5d5c3 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index f4e22111f1f6..7d1898e703e0 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -28,8 +28,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index af5ca8f0bdbf..918461b5dad9 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { @@ -576,7 +575,7 @@ namespace /** structure to cache the last transliteration body used. */ struct TransBody { - ::rtl::OUString Name; + OUString Name; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration > Body; }; class theTransBodyMutex : public rtl::Static<osl::Mutex, theTransBodyMutex> {}; diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 0300ea48f8b0..a1de147f4e42 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -23,7 +23,6 @@ #include <transliteration_Ignore.hxx> using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 329f2d565a4b..4ef2cfbc249a 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index f62a7fbc4f29..eb2dc0efaf18 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index 8a63e1bebe88..1eb07f7ba577 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -262,7 +262,7 @@ Transliteration_titlecase::Transliteration_titlecase() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_titlecase"; } -static rtl::OUString transliterate_titlecase_Impl( +static OUString transliterate_titlecase_Impl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, const Locale &rLocale, Sequence< sal_Int32 >& offset ) @@ -317,7 +317,7 @@ static rtl::OUString transliterate_titlecase_Impl( // this function expects to be called on a word-by-word basis, // namely that startPos points to the first char of the word -rtl::OUString SAL_CALL Transliteration_titlecase::transliterate( +OUString SAL_CALL Transliteration_titlecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException) @@ -336,7 +336,7 @@ Transliteration_sentencecase::Transliteration_sentencecase() // this function expects to be called on a sentence-by-sentence basis, // namely that startPos points to the first word (NOT first char!) in the sentence -rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate( +OUString SAL_CALL Transliteration_sentencecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException) diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 11bdf4a00c4c..d42261bb3380 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -89,8 +89,8 @@ Transliteration_caseignore::transliterateRange( const OUString& str1, const OUSt sal_Bool SAL_CALL Transliteration_caseignore::equals( - const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) + const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) throw(::com::sun::star::uno::RuntimeException) { return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0); @@ -98,8 +98,8 @@ Transliteration_caseignore::equals( sal_Int32 SAL_CALL Transliteration_caseignore::compareSubstring( - const ::rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1, - const ::rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) + const OUString& str1, sal_Int32 off1, sal_Int32 len1, + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException) { sal_Int32 nMatch1, nMatch2; @@ -109,8 +109,8 @@ Transliteration_caseignore::compareSubstring( sal_Int32 SAL_CALL Transliteration_caseignore::compareString( - const ::rtl::OUString& str1, - const ::rtl::OUString& str2) + const OUString& str1, + const OUString& str2) throw(RuntimeException) { sal_Int32 nMatch1, nMatch2; @@ -119,8 +119,8 @@ Transliteration_caseignore::compareString( sal_Int32 SAL_CALL Transliteration_caseignore::compare( - const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) + const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) throw(RuntimeException) { const sal_Unicode *unistr1 = (sal_Unicode*) str1.getStr() + pos1; |