diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-19 10:34:45 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2015-10-19 11:15:23 +0000 |
commit | 184637be60fcdbde3b3fb0ab0c1d158a92f63889 (patch) | |
tree | f4995fb1e5be06419efe4352e60984cf4d531d61 | |
parent | convert DBG_ASSERTWARNING to SAL_WARN_IF (diff) | |
download | core-184637be60fcdbde3b3fb0ab0c1d158a92f63889.tar.gz core-184637be60fcdbde3b3fb0ab0c1d158a92f63889.zip |
com::sun::star->css in i18npool
Change-Id: I13a290cba0f38c79eb2d93148b972d3d931c3862
Reviewed-on: https://gerrit.libreoffice.org/19445
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
56 files changed, 925 insertions, 932 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index ce77d9f6cb49..82547e32fc11 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -42,72 +42,72 @@ namespace com { namespace sun { namespace star { namespace i18n { class BreakIteratorImpl : public cppu::WeakImplHelper < XBreakIterator, - com::sun::star::lang::XServiceInfo + css::lang::XServiceInfo > { public: - BreakIteratorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + BreakIteratorImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); BreakIteratorImpl(); virtual ~BreakIteratorImpl(); 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, std::exception) override; + const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar); protected: @@ -116,19 +116,19 @@ protected: private: struct lookupTableItem { - lookupTableItem(const com::sun::star::lang::Locale& _aLocale, com::sun::star::uno::Reference < XBreakIterator >& _xBI) : aLocale(_aLocale), xBI(_xBI) {}; - com::sun::star::lang::Locale aLocale; - com::sun::star::uno::Reference < XBreakIterator > xBI; + lookupTableItem(const css::lang::Locale& _aLocale, css::uno::Reference < XBreakIterator >& _xBI) : aLocale(_aLocale), xBI(_xBI) {}; + css::lang::Locale aLocale; + css::uno::Reference < XBreakIterator > xBI; }; - std::vector<lookupTableItem*> lookupTable; - com::sun::star::lang::Locale aLocale; - com::sun::star::uno::Reference < XBreakIterator > xBI; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + std::vector<lookupTableItem*> lookupTable; + css::lang::Locale aLocale; + css::uno::Reference < XBreakIterator > xBI; + css::uno::Reference < css::uno::XComponentContext > m_xContext; 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 ); + throw( css::uno::RuntimeException ); + css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale ) + throw( css::uno::RuntimeException ); }; diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index 5d78fb0e2406..a477558f7bee 100644 --- a/i18npool/inc/breakiterator_cjk.hxx +++ b/i18npool/inc/breakiterator_cjk.hxx @@ -32,18 +32,18 @@ public: BreakIterator_CJK(); 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) + throw(css::uno::RuntimeException, std::exception) override; LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; protected: xdictionary *dict; diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx index 704a3f6dbc22..7715a2e3e50a 100644 --- a/i18npool/inc/breakiterator_ctl.hxx +++ b/i18npool/inc/breakiterator_ctl.hxx @@ -34,21 +34,21 @@ public: virtual ~BreakIterator_CTL(); 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, std::exception) override; + sal_Int32& nDone) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + sal_Int32& nDone) throw(css::uno::RuntimeException, std::exception) override; virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; protected: OUString cachedText; // for cell index sal_Int32* nextCellIndex; sal_Int32* previousCellIndex; sal_Int32 cellIndexSize; - virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx index 1428151f16d3..dccafea9c24f 100644 --- a/i18npool/inc/breakiterator_th.hxx +++ b/i18npool/inc/breakiterator_th.hxx @@ -32,7 +32,7 @@ public: virtual ~BreakIterator_th(); protected: - void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException) override; + void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException) override; }; } } } } diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 9983cfc90952..94b9f85b6fe9 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -40,36 +40,36 @@ public: virtual ~BreakIterator_Unicode(); 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, + sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override; virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, + const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; protected: const sal_Char *cBreakIterator, *lineRule; @@ -77,14 +77,12 @@ protected: struct BI_Data { - OUString aICUText; - UText *ut; - icu::BreakIterator *aBreakIterator; - com::sun::star::lang::Locale maLocale; - - BI_Data() - : ut(NULL) - , aBreakIterator(NULL) + OUString aICUText; + UText* ut; + icu::BreakIterator* aBreakIterator; + css::lang::Locale maLocale; + + BI_Data() : ut(NULL), aBreakIterator(NULL) { } ~BI_Data() @@ -97,8 +95,8 @@ 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 OUString& rText) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale, + sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 80d33a10da1d..286972e4b7be 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -36,15 +36,15 @@ namespace com { namespace sun { namespace star { namespace i18n { class CalendarImpl : public cppu::WeakImplHelper < - com::sun::star::i18n::XCalendar4, - com::sun::star::lang::XServiceInfo + css::i18n::XCalendar4, + css::lang::XServiceInfo > { public: // Constructors CalendarImpl() {}; - CalendarImpl(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext); + CalendarImpl(const css::uno::Reference < css::uno::XComponentContext >& rxContext); /** * Destructor @@ -53,56 +53,56 @@ public: // Methods - virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateTime(double fTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; + virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override; // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override; // XCalendar3 - virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override; // XCalendar4 - virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getLocalDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; private: struct lookupTableItem { - lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 >& _xCalendar) : - uniqueID(_uniqueID), xCalendar(_xCalendar) {} - OUString uniqueID; - com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 > xCalendar; + lookupTableItem(const OUString& _uniqueID, css::uno::Reference < css::i18n::XCalendar4 >& _xCalendar) + : uniqueID(_uniqueID), xCalendar(_xCalendar) {} + OUString uniqueID; + css::uno::Reference < css::i18n::XCalendar4 > xCalendar; }; - std::vector<lookupTableItem*> lookupTable; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 > xCalendar; + std::vector<lookupTableItem*> lookupTable; + css::uno::Reference < css::uno::XComponentContext > m_xContext; + css::uno::Reference < css::i18n::XCalendar4 > xCalendar; }; } } } } diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index b3fcdf9451bd..31883d693e55 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -56,70 +56,70 @@ public: virtual ~Calendar_gregorian(); // Methods in XCalendar - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateTime(double fTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override; // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override; // XCalendar3 - virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override; // XCalendar4 - virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getLocalDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; protected: const Era *eraArray; icu::Calendar *body; css::uno::Reference<NativeNumberSupplierService> mxNatNum; const sal_Char* cCalendar; - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; sal_uInt32 fieldSet; sal_Int16 fieldValue[FIELD_INDEX_COUNT]; sal_Int16 fieldSetValue[FIELD_INDEX_COUNT]; - virtual void mapToGregorian() throw(com::sun::star::uno::RuntimeException); - virtual void mapFromGregorian() throw(com::sun::star::uno::RuntimeException); - void getValue() throw(com::sun::star::uno::RuntimeException); + virtual void mapToGregorian() throw(css::uno::RuntimeException); + virtual void mapFromGregorian() throw(css::uno::RuntimeException); + void getValue() throw(css::uno::RuntimeException); - 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 (css::uno::RuntimeException); private: Calendar2 aCalendar; /** Submit fieldSetValue array according to fieldSet. */ - void submitFields() throw(com::sun::star::uno::RuntimeException); + void submitFields() throw(css::uno::RuntimeException); /** Submit fieldSetValue array according to fieldSet, plus YMDhms if >=0, plus zone and DST if != 0 */ - void submitValues( sal_Int32 nYear, sal_Int32 nMonth, sal_Int32 nDay, sal_Int32 nHour, sal_Int32 nMinute, sal_Int32 nSecond, sal_Int32 nMilliSecond, sal_Int32 nZone, sal_Int32 nDST) throw(com::sun::star::uno::RuntimeException); + void submitValues( sal_Int32 nYear, sal_Int32 nMonth, sal_Int32 nDay, sal_Int32 nHour, sal_Int32 nMinute, sal_Int32 nSecond, sal_Int32 nMilliSecond, sal_Int32 nZone, sal_Int32 nDST) throw(css::uno::RuntimeException); /** Set fields internally. */ - void setValue() throw(com::sun::star::uno::RuntimeException); + void setValue() throw(css::uno::RuntimeException); /** Obtain combined field values for timezone offset (minutes+secondmillis) in milliseconds and whether fields were set. */ bool getZoneOffset( sal_Int32 & o_nOffset ) const; @@ -140,8 +140,8 @@ class Calendar_hanja : public Calendar_gregorian public: // Constructors Calendar_hanja(); - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override; }; @@ -174,7 +174,7 @@ public: Calendar_buddhist(); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override; }; } } } } diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx index 98e938ac0507..d3ee50ae027c 100644 --- a/i18npool/inc/calendar_hijri.hxx +++ b/i18npool/inc/calendar_hijri.hxx @@ -36,8 +36,8 @@ public: Calendar_hijri(); protected: - void mapToGregorian() throw(com::sun::star::uno::RuntimeException) override; - void mapFromGregorian() throw(com::sun::star::uno::RuntimeException) override; + void mapToGregorian() throw(css::uno::RuntimeException) override; + void mapFromGregorian() throw(css::uno::RuntimeException) override; // radians per degree (pi/180) static const double RadPerDeg; diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx index 18a8ed20d4a3..a4242c296f13 100644 --- a/i18npool/inc/calendar_jewish.hxx +++ b/i18npool/inc/calendar_jewish.hxx @@ -34,11 +34,11 @@ public: Calendar_jewish(); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override; protected: - void mapToGregorian() throw(com::sun::star::uno::RuntimeException) override; - void mapFromGregorian() throw(com::sun::star::uno::RuntimeException) override; + void mapToGregorian() throw(css::uno::RuntimeException) override; + void mapFromGregorian() throw(css::uno::RuntimeException) override; }; } } } } diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index adb2b27aec63..eb449e45db38 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -38,35 +38,35 @@ typedef sal_uInt32 UPT_FLAG_TYPE; class cclass_Unicode : public cppu::WeakImplHelper < XCharacterClassification, css::lang::XServiceInfo > { public: - cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + cclass_Unicode(const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~cclass_Unicode(); 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, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; - virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, + sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override; virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, - sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, + sal_Int32 nPos, const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, - const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private: Transliteration_casemapping *trans; @@ -117,12 +117,12 @@ private: static const sal_Unicode* StrChr( const sal_Unicode* pStr, sal_Unicode c ); - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference < css::uno::XComponentContext > m_xContext; /// used for parser only - com::sun::star::lang::Locale aParserLocale; - com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; - com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup; + css::lang::Locale aParserLocale; + css::uno::Reference < XLocaleData4 > mxLocaleData; + css::uno::Reference < css::i18n::XNativeNumberSupplier > xNatNumSup; OUString aStartChars; OUString aContChars; UPT_FLAG_TYPE* pTable; @@ -150,12 +150,12 @@ private: UPT_FLAG_TYPE getContCharsFlags( sal_Unicode c ); /// Setup parser table. Calls initParserTable() only if needed. - void setupParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType, + void setupParserTable( const css::lang::Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ); /// Init parser table. - void initParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType, + void initParserTable( const css::lang::Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ); @@ -167,7 +167,7 @@ private: sal_Int32 nTokenType = 0xffffffff ); /// Setup International class, new'ed only if different from existing. - bool setupInternational( const com::sun::star::lang::Locale& rLocale ); + bool setupInternational( const css::lang::Locale& rLocale ); /// Implementation of getCharacterType() for one single character static 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 3b3eae278cc7..57adfd27e228 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.hxx @@ -31,22 +31,22 @@ class ChapterCollator : public CollatorImpl { public: // Constructors - ChapterCollator( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + ChapterCollator( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); // Destructor virtual ~ChapterCollator(); 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, std::exception) override; - sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private: // CharacterClassification Implementation - com::sun::star::uno::Reference< XCharacterClassification > cclass; + css::uno::Reference< XCharacterClassification > cclass; }; } } } } diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index a9cd538dfddf..ef44b2655ef8 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -31,63 +31,63 @@ namespace com { namespace sun { namespace star { namespace i18n { class CharacterClassificationImpl : public cppu::WeakImplHelper < XCharacterClassification, - com::sun::star::lang::XServiceInfo + css::lang::XServiceInfo > { public: - CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + CharacterClassificationImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~CharacterClassificationImpl(); 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, std::exception) override; + sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + sal_Int32 nCount, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + sal_Int32 nCount, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, + const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, - const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, + const OUString& Text, sal_Int32 nPos, const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: struct lookupTableItem { - lookupTableItem(const com::sun::star::lang::Locale& rLocale, const OUString& rName, - com::sun::star::uno::Reference < XCharacterClassification >& rxCI) : + lookupTableItem(const css::lang::Locale& rLocale, const OUString& rName, + css::uno::Reference < XCharacterClassification >& rxCI) : aLocale(rLocale), aName(rName), xCI(rxCI) {}; - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; OUString aName; - com::sun::star::uno::Reference < XCharacterClassification > xCI; - bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) { + css::uno::Reference < XCharacterClassification > xCI; + bool SAL_CALL equals(const css::lang::Locale& rLocale) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant; @@ -96,13 +96,12 @@ private: std::vector<lookupTableItem*> lookupTable; lookupTableItem *cachedItem; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < XCharacterClassification > xUCI; + css::uno::Reference < css::uno::XComponentContext > m_xContext; + css::uno::Reference < XCharacterClassification > xUCI; - com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL - getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - bool SAL_CALL - createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale); + css::uno::Reference < XCharacterClassification > SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale) + throw(css::uno::RuntimeException); + bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale); }; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 563449612f8d..f9b135c964db 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -37,41 +37,41 @@ namespace com { namespace sun { namespace star { namespace i18n { class CollatorImpl : public cppu::WeakImplHelper < XCollator, - com::sun::star::lang::XServiceInfo + css::lang::XServiceInfo > { public: // Constructors - CollatorImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + CollatorImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); // Destructor virtual ~CollatorImpl(); 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, std::exception) override; + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL compareString( const OUString& s1, - const OUString& s2) throw(com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& s2) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, - sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Sequence< sal_Int32 >& collatorOptions) throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; protected: lang::Locale nLocale; @@ -80,9 +80,9 @@ private: lang::Locale aLocale; OUString algorithm; OUString service; - com::sun::star::uno::Reference < XCollator > xC; + css::uno::Reference < XCollator > xC; 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) {} + css::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {} bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && @@ -90,18 +90,18 @@ private: algorithm == _algorithm; } }; - std::vector<lookupTableItem*> lookupTable; - lookupTableItem *cachedItem; + std::vector<lookupTableItem*> lookupTable; + lookupTableItem * cachedItem; // Service Factory - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference < css::uno::XComponentContext > m_xContext; // lang::Locale Data - com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; + css::uno::Reference < XLocaleData4 > mxLocaleData; bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName, - const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); + const OUString& rSortAlgorithm) throw(css::uno::RuntimeException); void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) - throw(com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index 04399953c695..7ea38d090760 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace i18n { -class Collator_Unicode : public cppu::WeakImplHelper < XCollator, com::sun::star::lang::XServiceInfo > +class Collator_Unicode : public cppu::WeakImplHelper < XCollator, css::lang::XServiceInfo > { public: // Constructors @@ -42,29 +42,29 @@ public: virtual ~Collator_Unicode(); 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, std::exception) override; + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, - sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override; // following 4 methods are implemented in collatorImpl. sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) - throw(com::sun::star::uno::RuntimeException, std::exception) override {throw com::sun::star::uno::RuntimeException();} + throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();} void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&, - const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException, std::exception) override {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) - throw(com::sun::star::uno::RuntimeException, std::exception) override {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) - throw(com::sun::star::uno::RuntimeException, std::exception) override {throw com::sun::star::uno::RuntimeException();} + const css::uno::Sequence< sal_Int32 >&) throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();} + css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) + throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();} + css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) + throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();} //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; protected: const sal_Char *implementationName; diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 044ca0adcf42..4e72d3014bc6 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -33,62 +33,62 @@ namespace com { namespace sun { namespace star { namespace i18n { class DefaultNumberingProvider : public cppu::WeakImplHelper < - com::sun::star::text::XDefaultNumberingProvider, - com::sun::star::text::XNumberingFormatter, - com::sun::star::text::XNumberingTypeInfo, - com::sun::star::lang::XServiceInfo + css::text::XDefaultNumberingProvider, + css::text::XNumberingFormatter, + css::text::XNumberingTypeInfo, + css::lang::XServiceInfo > { void impl_loadTranslit(); public: DefaultNumberingProvider( - const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~DefaultNumberingProvider(); //XDefaultNumberingProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess > > SAL_CALL - getDefaultOutlineNumberings( const com::sun::star::lang::Locale& aLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< + css::container::XIndexAccess > > SAL_CALL + getDefaultOutlineNumberings( const css::lang::Locale& aLocale ) + throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue > > SAL_CALL - getDefaultContinuousNumberingLevels( const com::sun::star::lang::Locale& aLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< + css::beans::PropertyValue > > SAL_CALL + getDefaultContinuousNumberingLevels( const css::lang::Locale& aLocale ) + throw(css::uno::RuntimeException, std::exception) override; //XNumberingFormatter virtual OUString SAL_CALL makeNumberingString( - const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& aProperties, - const com::sun::star::lang::Locale& aLocale ) - throw(com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< + css::beans::PropertyValue >& aProperties, + const css::lang::Locale& aLocale ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; //XNumberingTypeInfo - virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess; + css::uno::Reference < css::uno::XComponentContext > m_xContext; + css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess; TransliterationImpl* translit; OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception); bool SAL_CALL isScriptFlagEnabled(const OUString& aName ) - throw(com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 7436516e4605..8b5921129a9e 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -31,70 +31,70 @@ namespace com { namespace sun { namespace star { namespace i18n { class IndexEntrySupplier : public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedIndexEntrySupplier, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedIndexEntrySupplier, + css::lang::XServiceInfo > { public: - IndexEntrySupplier( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + IndexEntrySupplier( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); // Methods - virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() + throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList( + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL usePhoneticEntry( - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, - const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, - const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, - const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale2 ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale, const OUString& SortAlgorithm ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - 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 OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException); + css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES; + css::uno::Reference < css::uno::XComponentContext > m_xContext; + bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( css::uno::RuntimeException ); + css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier( + const css::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (css::uno::RuntimeException); protected: - com::sun::star::lang::Locale aLocale; - OUString aSortAlgorithm; + css::lang::Locale aLocale; + OUString aSortAlgorithm; }; } } } } diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx index 62ab687c4a61..8f68dfc63b06 100644 --- a/i18npool/inc/indexentrysupplier_asian.hxx +++ b/i18npool/inc/indexentrysupplier_asian.hxx @@ -31,24 +31,24 @@ namespace com { namespace sun { namespace star { namespace i18n { class IndexEntrySupplier_asian : public IndexEntrySupplier_Common { public: - IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + IndexEntrySupplier_asian( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~IndexEntrySupplier_asian(); OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale, const OUString& rAlgorithm ) + throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& rPhoneticEntry, const css::lang::Locale& rLocale) + throw (css::uno::RuntimeException, std::exception) override; sal_Int16 SAL_CALL compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, - const com::sun::star::lang::Locale& rLocale1, + const css::lang::Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, - const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale2 ) + throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; #ifndef DISABLE_DYNLOADING private: oslModule hModule; diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index 19478b8541bf..aab4a4c5668e 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -33,69 +33,70 @@ namespace com { namespace sun { namespace star { namespace i18n { class IndexEntrySupplier_Common : public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedIndexEntrySupplier, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedIndexEntrySupplier, + css::lang::XServiceInfo > { public: - IndexEntrySupplier_Common( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + IndexEntrySupplier_Common( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~IndexEntrySupplier_Common(); - virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() + throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList( + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL usePhoneticEntry( - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, - const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, - const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, - const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale2 ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, - const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; protected: - const sal_Char *implementationName; - bool usePhonetic; - CollatorImpl *collator; + const sal_Char * implementationName; + bool usePhonetic; + CollatorImpl* collator; + css::lang::Locale aLocale; + OUString aAlgorithm; + 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; - OUString aAlgorithm; + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index 47fe4b220d05..d53bda5afc18 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.hxx @@ -30,27 +30,27 @@ class Index; class IndexEntrySupplier_Unicode : public IndexEntrySupplier_Common { public: - IndexEntrySupplier_Unicode( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + IndexEntrySupplier_Unicode( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~IndexEntrySupplier_Unicode(); virtual sal_Bool SAL_CALL loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, - const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, - const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, + const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, - const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale2 ) + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, - const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) + throw (css::uno::RuntimeException, std::exception) override; private: Index *index; @@ -81,12 +81,12 @@ public: class Index { public: - Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext); + Index(const css::uno::Reference < css::uno::XComponentContext >& rxContext); ~Index(); - void init(const com::sun::star::lang::Locale& rLocale, const OUString& algorithm) throw (com::sun::star::uno::RuntimeException); + void init(const css::lang::Locale& rLocale, const OUString& algorithm) throw (css::uno::RuntimeException); - void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const OUString &algorithm) throw (com::sun::star::uno::RuntimeException); + void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm) throw (css::uno::RuntimeException); sal_Int16 getIndexWeight(const OUString& rIndexEntry); OUString getIndexDescription(const OUString& rIndexEntry); diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index d92d3be1cd2f..2fcfa1a8fcaa 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx @@ -30,32 +30,32 @@ namespace com { namespace sun { namespace star { namespace i18n { class IndexEntrySupplier_ja_phonetic : public IndexEntrySupplier_Common { public: - IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { + IndexEntrySupplier_ja_phonetic( const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic"; }; virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\ - const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \ - throw (com::sun::star::uno::RuntimeException, std::exception) override;\ + const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \ + throw (css::uno::RuntimeException, std::exception) override;\ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \ - const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\ - throw (com::sun::star::uno::RuntimeException, std::exception) override;\ + const OUString& PhoneticEntry, const css::lang::Locale& rLocale )\ + throw (css::uno::RuntimeException, std::exception) override;\ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\ - const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\ + const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,\ const OUString& IndexEntry2, const OUString& PhoneticEntry2,\ - const com::sun::star::lang::Locale& rLocale2 )\ - throw (com::sun::star::uno::RuntimeException, std::exception) override;\ + const css::lang::Locale& rLocale2 )\ + throw (css::uno::RuntimeException, std::exception) override;\ }; #define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \ class IndexEntrySupplier_##algorithm : public IndexEntrySupplier_ja_phonetic {\ public:\ - IndexEntrySupplier_##algorithm (const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext) : IndexEntrySupplier_ja_phonetic (rxContext) {\ + IndexEntrySupplier_##algorithm (const css::uno::Reference < css::uno::XComponentContext >& rxContext) : IndexEntrySupplier_ja_phonetic (rxContext) {\ implementationName = "com.sun.star.i18n.IndexEntrySupplier_"#algorithm;\ };\ virtual sal_Bool SAL_CALL loadAlgorithm(\ - const com::sun::star::lang::Locale& rLocale,\ + const css::lang::Locale& rLocale,\ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \ - throw (com::sun::star::uno::RuntimeException, std::exception) override;\ + throw (css::uno::RuntimeException, std::exception) override;\ }; INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable ) diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index 1c96a0673d14..953aa9d2faca 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -34,44 +34,44 @@ namespace com { namespace sun { namespace star { namespace i18n { class InputSequenceCheckerImpl : public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedInputSequenceChecker, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedInputSequenceChecker, + css::lang::XServiceInfo > { public: - InputSequenceCheckerImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + InputSequenceCheckerImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); InputSequenceCheckerImpl(const char *pServiceName); virtual ~InputSequenceCheckerImpl(); virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: const sal_Char *serviceName; struct lookupTableItem { - lookupTableItem(const sal_Char* rLanguage, const com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedInputSequenceChecker >& rxISC) : + lookupTableItem(const sal_Char* rLanguage, const css::uno::Reference < css::i18n::XExtendedInputSequenceChecker >& rxISC) : aLanguage(rLanguage), xISC(rxISC) {} const sal_Char* aLanguage; - com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedInputSequenceChecker > xISC; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC; }; std::vector<lookupTableItem*> lookupTable; lookupTableItem *cachedItem; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference < css::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage) - throw (com::sun::star::uno::RuntimeException); + css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage) + throw (css::uno::RuntimeException); static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); }; diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx index 9e7704a09fdf..27938f4591fc 100644 --- a/i18npool/inc/inputsequencechecker_hi.hxx +++ b/i18npool/inc/inputsequencechecker_hi.hxx @@ -36,10 +36,10 @@ public: virtual ~InputSequenceChecker_hi(); sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; }; } } } } diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx index 7620a1fa927c..bf1ede02348f 100644 --- a/i18npool/inc/inputsequencechecker_th.hxx +++ b/i18npool/inc/inputsequencechecker_th.hxx @@ -33,10 +33,10 @@ public: virtual ~InputSequenceChecker_th(); sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override; }; } } } } diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index afe75fbfc827..b45ece567aeb 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -58,94 +58,94 @@ struct LocaleDataLookupTableItem; namespace com { namespace sun { namespace star { namespace i18n { -inline bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2) { +inline bool operator ==(const css::lang::Locale& l1, const css::lang::Locale& l2) { return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; }; class LocaleDataImpl : public cppu::WeakImplHelper < - com::sun::star::i18n::XLocaleData4, - com::sun::star::lang::XServiceInfo + css::i18n::XLocaleData4, + css::lang::XServiceInfo > { public: LocaleDataImpl(); virtual ~LocaleDataImpl(); - static com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem > downcastCalendarItems( const com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > & rCi ); - static com::sun::star::i18n::Calendar downcastCalendar( const com::sun::star::i18n::Calendar2 & rC ); + static css::uno::Sequence< css::i18n::CalendarItem > downcastCalendarItems( const css::uno::Sequence< css::i18n::CalendarItem2 > & rCi ); + static css::i18n::Calendar downcastCalendar( const css::i18n::Calendar2 & rC ); /** Generates a <Language>_<Country> or <Variant> (if Language=="qlt") string suitable as part of service name with all '-' replaced by '_' */ - static OUString getFirstLocaleServiceName( const com::sun::star::lang::Locale & rLocale ); + static OUString getFirstLocaleServiceName( const css::lang::Locale & rLocale ); /** Generates fallback strings suitable as parts of service names, excluding the one obtained via getFirstLocaleServiceName() */ - static ::std::vector< OUString > getFallbackLocaleServiceNames( const com::sun::star::lang::Locale & rLocale ); - - virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual LocaleDataItem SAL_CALL getLocaleItem( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override ; - 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, std::exception) override; - - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - 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); + static ::std::vector< OUString > getFallbackLocaleServiceNames( const css::lang::Locale & rLocale ); + + virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException) ; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); // XLocaleData4 - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; // following methods are used by indexentry service - 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< OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual 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); + virtual css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); + virtual bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private: - friend bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); + friend bool operator ==(const css::lang::Locale& l1, const css::lang::Locale& l2); ::std::unique_ptr< LocaleDataLookupTableItem > cachedItem; - - oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException ); - 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 OUString& rAlgorithm); - com::sun::star::i18n::Calendar2 ref_cal; + css::i18n::Calendar2 ref_cal; OUString ref_name; - com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > & + + oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException ); + sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount); + sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm); + css::uno::Sequence< css::i18n::CalendarItem2 > & 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 ); + const css::lang::Locale& rLocale, + const css::uno::Sequence< css::i18n::Calendar2 >& calendarsSeq, + sal_Int16 item) throw( css::uno::RuntimeException ); /// Helper to obtain a sequence of days, months, gmonths or eras. - com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > getCalendarItems( + css::uno::Sequence< css::i18n::CalendarItem2 > getCalendarItems( sal_Unicode const * const * const allCalendars, sal_Int16 & rnOffset, const sal_Int16 nWhichItem, const sal_Int16 nCalendar, - const com::sun::star::lang::Locale & rLocale, - const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar2 > & calendarsSeq ) - throw( com::sun::star::uno::RuntimeException ); + const css::lang::Locale & rLocale, + const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq ) + throw( css::uno::RuntimeException ); }; diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 7292f82e2927..270cb7a165e6 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -32,8 +32,8 @@ namespace com { namespace sun { namespace star { namespace i18n { // ---------------------------------------------------- class NativeNumberSupplierService : public cppu::WeakImplHelper < - com::sun::star::i18n::XNativeNumberSupplier, - com::sun::star::lang::XServiceInfo + css::i18n::XNativeNumberSupplier, + css::lang::XServiceInfo > { public: @@ -41,40 +41,40 @@ public: // Methods virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale, + virtual sal_Bool SAL_CALL isValidNatNum( const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes( - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes( + const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL convertFromXmlAttributes( - const ::com::sun::star::i18n::NativeNumberXmlAttributes& aAttr ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::i18n::NativeNumberXmlAttributes& aAttr ) + throw (css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; // following methods are not for XNativeNumberSupplier, they are for calling from transliterations 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); + const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode, + css::uno::Sequence< sal_Int32 >& offset ) + throw (css::uno::RuntimeException); sal_Unicode SAL_CALL getNativeNumberChar( const sal_Unicode inChar, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw(com::sun::star::uno::RuntimeException) ; + const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) + throw(css::uno::RuntimeException) ; private: - ::com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; bool useOffset; }; diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index ab6e0c9cc542..3b36cec9dcf0 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -31,37 +31,37 @@ class NumberFormatCodeMapper : public cppu::WeakImplHelper < - ::com::sun::star::i18n::XNumberFormatCode, - ::com::sun::star::lang::XServiceInfo + css::i18n::XNumberFormatCode, + css::lang::XServiceInfo > { public: - NumberFormatCodeMapper( const ::com::sun::star::uno::Reference < - ::com::sun::star::uno::XComponentContext >& rxContext ); + NumberFormatCodeMapper( const css::uno::Reference < + css::uno::XComponentContext >& rxContext ); virtual ~NumberFormatCodeMapper(); - virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: - ::com::sun::star::lang::Locale aLocale; - ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > mxContext; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > aFormatSeq; - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XLocaleData4 > mxLocaleData; + css::lang::Locale aLocale; + css::uno::Reference < css::uno::XComponentContext > mxContext; + css::uno::Sequence< css::i18n::FormatElement > aFormatSeq; + css::uno::Reference < css::i18n::XLocaleData4 > mxLocaleData; bool bFormatsValid; - void setupLocale( const ::com::sun::star::lang::Locale& rLocale ); - void getFormats( const ::com::sun::star::lang::Locale& rLocale ); + void setupLocale( const css::lang::Locale& rLocale ); + void getFormats( const css::lang::Locale& rLocale ); static OUString mapElementTypeShortToString(sal_Int16 formatType); static sal_Int16 mapElementTypeStringToShort(const OUString& formatType); static OUString mapElementUsageShortToString(sal_Int16 formatUsage); diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index aa06b3f6bb0d..f87f5b87b2bc 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n { class OrdinalSuffixService : public cppu::WeakImplHelper < XOrdinalSuffix, - com::sun::star::lang::XServiceInfo + css::lang::XServiceInfo > { public: @@ -39,12 +39,12 @@ class OrdinalSuffixService : public cppu::WeakImplHelper virtual ~OrdinalSuffixService(); // XOrdinalSuffix - 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, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; } } } } diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index 156527caa72d..a428fdd378d4 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -42,23 +42,23 @@ public: virtual ~TextToPronounce_zh(); 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, std::exception) override; + folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset) + throw (css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override; + throw(css::uno::RuntimeException, + css::i18n::MultipleCharsOutputException, std::exception) override; }; #define TRANSLITERATION_TextToPronounce_zh( name ) \ diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 1b58e62337f9..6b8b16d41bc1 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -35,52 +35,52 @@ namespace com { namespace sun { namespace star { namespace i18n { class TextConversionService: public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedTextConversion, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedTextConversion, + css::lang::XServiceInfo > { public: TextConversionService(const char* pImplName); virtual ~TextConversionService(); // Methods - virtual com::sun::star::i18n::TextConversionResult SAL_CALL + virtual css::i18n::TextConversionResult SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override = 0; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override = 0; virtual OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override = 0; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override = 0; 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, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException, std::exception ) override = 0; + const css::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override = 0; virtual sal_Bool SAL_CALL - interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, + interactiveConversion(const css::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, std::exception ) override = 0; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override = 0; //XServiceInfo OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: const sal_Char* implementationName; protected: @@ -103,46 +103,46 @@ typedef struct { class TextConversion_ko : public TextConversionService { public: - TextConversion_ko( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + TextConversion_ko( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL + css::i18n::TextConversionResult SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; 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, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException, std::exception ) override; + const css::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; sal_Bool SAL_CALL - interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, + interactiveConversion(const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; private: // Hangul/Hanja system dictionary - com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionary > xCD; + css::uno::Reference < css::linguistic2::XConversionDictionary > xCD; // Hangul/Hanja user defined dictionary list - com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; + css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL; sal_Int32 maxLeftLength; sal_Int32 maxRightLength; - com::sun::star::uno::Sequence< OUString > SAL_CALL + css::uno::Sequence< OUString > SAL_CALL getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja); }; @@ -159,44 +159,44 @@ typedef struct { class TextConversion_zh : public TextConversionService { public: - TextConversion_zh( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ); + TextConversion_zh( const css::uno::Reference < css::uno::XComponentContext >& rxContext ); // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL + css::i18n::TextConversionResult SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; 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, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException, std::exception ) override; + const css::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; sal_Bool SAL_CALL - interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, + interactiveConversion(const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; private: // user defined dictionary list - com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; + css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL; OUString SAL_CALL getWordConversion(const OUString& aText, - sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset); + sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, css::uno::Sequence <sal_Int32>& offset); rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions); - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; }; } // i18n diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index 1db93d1910ad..7f43e2983334 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -32,59 +32,59 @@ namespace com { namespace sun { namespace star { namespace i18n { class TextConversionImpl : public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedTextConversion, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedTextConversion, + css::lang::XServiceInfo > { public: - TextConversionImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : m_xContext(rxContext) {}; + TextConversionImpl( const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : m_xContext(rxContext) {}; // Methods - com::sun::star::i18n::TextConversionResult SAL_CALL + css::i18n::TextConversionResult SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, - const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, + const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; 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, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException, std::exception ) override; + const css::lang::Locale& aLocale, sal_Int16 nTextConversionType, + sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; sal_Bool SAL_CALL - interactiveConversion( const ::com::sun::star::lang::Locale& aLocale, + interactiveConversion( const css::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, std::exception ) override; + throw( css::uno::RuntimeException, + css::lang::IllegalArgumentException, + css::lang::NoSupportException, std::exception ) override; //XServiceInfo OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::lang::Locale aLocale; - com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedTextConversion > xTC; - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; + css::lang::Locale aLocale; + css::uno::Reference < css::i18n::XExtendedTextConversion > xTC; + css::uno::Reference < css::uno::XComponentContext > m_xContext; - void SAL_CALL getLocaleSpecificTextConversion( const com::sun::star::lang::Locale& rLocale ) - throw( com::sun::star::lang::NoSupportException ); + void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale ) + throw( css::lang::NoSupportException ); }; } // i18n diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index 8f10cab61452..990a55263f93 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -38,90 +38,90 @@ namespace com { namespace sun { namespace star { namespace i18n { class TransliterationImpl : public cppu::WeakImplHelper < - com::sun::star::i18n::XExtendedTransliteration, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedTransliteration, + css::lang::XServiceInfo > { public: // Constructors - TransliterationImpl(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& xContext); + TransliterationImpl(const css::uno::Reference < css::uno::XComponentContext >& xContext); // Destructor virtual ~TransliterationImpl(); // Methods - virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException, std::exception) override ; - virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override ; + virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override ; - 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, std::exception) override ; + virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ; virtual void SAL_CALL loadModuleByImplName( const OUString& implName, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, + const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableModules( + const css::lang::Locale& rLocale, sal_Int16 sType ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override ; + css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override ; 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, std::exception) override; + css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override; // Methods in XExtendedTransliteration virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) - throw(com::sun::star::uno::RuntimeException, std::exception) override ; + throw(css::uno::RuntimeException, std::exception) override ; virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) - throw(com::sun::star::uno::RuntimeException, std::exception) override ; + throw(css::uno::RuntimeException, std::exception) override ; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) - throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException, std::exception) override ; + throw(css::i18n::MultipleCharsOutputException, + css::uno::RuntimeException, std::exception) override ; 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, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception) override ; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, + const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override ; 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, std::exception) override; + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; private: #define maxCascade 27 - com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > bodyCascade[maxCascade]; + css::uno::Reference< css::i18n::XExtendedTransliteration > bodyCascade[maxCascade]; sal_Int16 numCascade; bool caseignoreOnly; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; - com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata; - com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< XLocaleData4 > mxLocaledata; + css::uno::Reference< css::i18n::XExtendedTransliteration > caseignore; virtual 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); + css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale) + throw(css::uno::RuntimeException); void clear(); void loadBody( OUString &implName, - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body ) - throw (::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::i18n::XExtendedTransliteration >& body ) + throw (css::uno::RuntimeException); - com::sun::star::uno::Sequence< OUString > SAL_CALL getRange( - const com::sun::star::uno::Sequence< OUString > &inStrs, + css::uno::Sequence< OUString > SAL_CALL getRange( + const css::uno::Sequence< OUString > &inStrs, sal_Int32 length, const sal_Int16 _nCascade) - throw(com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index d5f15ec03b77..672ace293463 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -30,36 +30,36 @@ class transliteration_Ignore : public transliteration_commonclass { public: 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, std::exception) override; + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) + throw(css::uno::RuntimeException, std::exception) override; // This method is shared. 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used. - com::sun::star::uno::Sequence< OUString > SAL_CALL + css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // Methods which are shared. - sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override; + throw(css::uno::RuntimeException, + css::i18n::MultipleCharsOutputException, std::exception) override; - static com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 ) - throw(com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); struct Mapping { sal_Unicode previousChar; @@ -107,7 +107,7 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ 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, std::exception) override; \ + css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \ }; TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP) @@ -128,14 +128,14 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ 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, std::exception) override; \ + css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \ using transliteration_Ignore::transliterateRange;\ - com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \ - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception) override; \ + css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \ + const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override; \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ - throw(com::sun::star::uno::RuntimeException,\ - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override;\ + throw(css::uno::RuntimeException,\ + css::i18n::MultipleCharsOutputException, std::exception) override;\ }; TRANSLITERATION_IGNORE(Kana) diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 0c130e761d5c..33ce3690805a 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -26,28 +26,28 @@ namespace com { namespace sun { namespace star { namespace i18n { class transliteration_Numeric : public transliteration_commonclass { public: 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, std::exception) override; + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::i18n::MultipleCharsOutputException, + css::uno::RuntimeException, std::exception) override; // Methods which are shared. - virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; protected: sal_Int16 nNativeNumberMode; sal_Int16 tableSize; @@ -56,8 +56,8 @@ protected: private: 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); + css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 16f1a7e073a3..2ef7c973481c 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -30,29 +30,29 @@ class transliteration_OneToOne : public transliteration_commonclass { public: 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, std::exception) override; + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override; + throw(css::uno::RuntimeException, + css::i18n::MultipleCharsOutputException, std::exception) override; // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) + throw(css::uno::RuntimeException, std::exception) override; - com::sun::star::uno::Sequence< OUString > SAL_CALL + css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; protected: TransFunc func; @@ -65,12 +65,12 @@ class name : public transliteration_OneToOne \ public: \ name (); \ 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, std::exception) override; \ + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) \ + throw(css::uno::RuntimeException, std::exception) override; \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ - throw(com::sun::star::uno::RuntimeException, \ - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override; \ + throw(css::uno::RuntimeException, \ + css::i18n::MultipleCharsOutputException, std::exception) override; \ }; TRANSLITERATION_ONETOONE( fullwidthToHalfwidth ) diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index eaa18aa2fee9..01757b95f4dd 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -30,30 +30,30 @@ public: Transliteration_body(); // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException, std::exception) override; + throw(css::uno::RuntimeException, + css::i18n::MultipleCharsOutputException, std::exception) override; 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, std::exception) override; + css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, + const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override; protected: sal_uInt8 nMappingType; @@ -75,7 +75,7 @@ class Transliteration_casemapping : public Transliteration_body { public: Transliteration_casemapping(); - void SAL_CALL setMappingType(const sal_uInt8 rMappingType, const com::sun::star::lang::Locale& rLocale ); + void SAL_CALL setMappingType(const sal_uInt8 rMappingType, const css::lang::Locale& rLocale ); }; class Transliteration_togglecase : public Transliteration_body @@ -89,7 +89,7 @@ class Transliteration_titlecase : public Transliteration_body public: Transliteration_titlecase(); - 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, std::exception) override; + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override; }; class Transliteration_sentencecase : public Transliteration_body @@ -97,7 +97,7 @@ class Transliteration_sentencecase : public Transliteration_body public: Transliteration_sentencecase(); - 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, std::exception) override; + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override; }; } } } } diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx index 42f94e1cb5d5..f80c747c12eb 100644 --- a/i18npool/inc/transliteration_caseignore.hxx +++ b/i18npool/inc/transliteration_caseignore.hxx @@ -29,29 +29,29 @@ public: Transliteration_caseignore(); // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; - com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( + css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL equals( 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; protected: TransliterationModules moduleLoaded; @@ -59,7 +59,7 @@ private: sal_Int32 SAL_CALL compare( 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); + throw(css::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index de4071882218..1b2d1eed39fa 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -29,8 +29,8 @@ namespace com { namespace sun { namespace star { namespace i18n { class transliteration_commonclass : public cppu::WeakImplHelper< - com::sun::star::i18n::XExtendedTransliteration, - com::sun::star::lang::XServiceInfo + css::i18n::XExtendedTransliteration, + css::lang::XServiceInfo > { public: @@ -38,75 +38,75 @@ public: // Methods which are shared. void SAL_CALL - loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL - loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, const css::lang::Locale& rLocale) + throw(css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL + getAvailableModules( const css::lang::Locale& rLocale, sal_Int16 sType ) + throw(css::uno::RuntimeException, std::exception) override; // Methods which should be implemented in each transliteration module. - virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override = 0; 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, std::exception) override = 0; + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override = 0; 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, std::exception) override = 0; + folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) + throw(css::uno::RuntimeException, std::exception) override = 0; // Methods in XExtendedTransliteration virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) - throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException, std::exception) override = 0; + throw(css::i18n::MultipleCharsOutputException, + css::uno::RuntimeException, std::exception) override = 0; 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, std::exception) override = 0; + throw(css::uno::RuntimeException, std::exception) override = 0; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; + throw(css::uno::RuntimeException, std::exception) override = 0; 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, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; protected: - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; const sal_Char* transliterationName; const sal_Char* implementationName; bool useOffset; diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx index e6d42297d312..effbb23acdd3 100644 --- a/i18npool/inc/unoscripttypedetector.hxx +++ b/i18npool/inc/unoscripttypedetector.hxx @@ -29,27 +29,27 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper < - ::com::sun::star::i18n::XScriptTypeDetector, - ::com::sun::star::lang::XServiceInfo + css::i18n::XScriptTypeDetector, + css::lang::XServiceInfo > { public: // Methods - virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 492e504dc129..e5458b0a9001 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -626,7 +626,7 @@ com_sun_star_i18n_BreakIterator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new com::sun::star::i18n::BreakIteratorImpl(context)); + return cppu::acquire(new css::i18n::BreakIteratorImpl(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 0f7512b34f46..10a445214c41 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -76,7 +76,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator }; // loading ICU breakiterator on demand. -void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, +void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) throw(uno::RuntimeException) { bool newBreak = false; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index e455c53097b3..e3b383399510 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -188,8 +188,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 { if ( displayIndex == CalendarDisplayIndex::AM_PM ) { // Am/Pm string for Korean Hanja calendar will refer to Japanese locale - com::sun::star::lang::Locale jaLocale = - com::sun::star::lang::Locale(OUString("ja"), OUString(), OUString()); + css::lang::Locale jaLocale(OUString("ja"), OUString(), OUString()); if (idx == 0) return LocaleDataImpl().getLocaleItem(jaLocale).timeAM; else if (idx == 1) return LocaleDataImpl().getLocaleItem(jaLocale).timePM; else throw ERROR; @@ -199,7 +198,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 } void SAL_CALL -Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException, std::exception) +Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // Since this class could be called by service name 'hanja_yoil', we have to // rename uniqueID to get right calendar defined in locale data. @@ -237,7 +236,7 @@ Calendar_buddhist::Calendar_buddhist() : Calendar_gregorian(buddhist_eraArray) } void SAL_CALL -Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException, std::exception) +Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // init. fieldValue[] getValue(); @@ -269,13 +268,13 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star } -com::sun::star::i18n::Calendar2 SAL_CALL +css::i18n::Calendar2 SAL_CALL Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException, std::exception) { return aCalendar; } -com::sun::star::i18n::Calendar SAL_CALL +css::i18n::Calendar SAL_CALL Calendar_gregorian::getLoadedCalendar() throw(RuntimeException, std::exception) { return LocaleDataImpl::downcastCalendar( aCalendar); @@ -466,7 +465,7 @@ bool Calendar_gregorian::getDSTOffset( sal_Int32 & o_nOffset ) const CalendarFieldIndex::DST_OFFSET_SECOND_MILLIS); } -void Calendar_gregorian::submitFields() throw(com::sun::star::uno::RuntimeException) +void Calendar_gregorian::submitFields() throw(css::uno::RuntimeException) { for (sal_Int16 fieldIndex = 0; fieldIndex < FIELD_INDEX_COUNT; fieldIndex++) { @@ -495,7 +494,7 @@ void Calendar_gregorian::submitFields() throw(com::sun::star::uno::RuntimeExcept void Calendar_gregorian::submitValues( sal_Int32 nYear, sal_Int32 nMonth, sal_Int32 nDay, sal_Int32 nHour, sal_Int32 nMinute, sal_Int32 nSecond, sal_Int32 nMilliSecond, sal_Int32 nZone, sal_Int32 nDST ) - throw(com::sun::star::uno::RuntimeException) + throw(css::uno::RuntimeException) { submitFields(); if (nYear >= 0) @@ -843,7 +842,7 @@ Calendar_gregorian::isValid() throw(RuntimeException, std::exception) // NatNum3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3 // NatNum4 NatNum9/9/11/11 -static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& aLocale, +static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale, sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value ) { bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index c20fbe712f41..ecdd68ba587f 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -24,60 +24,60 @@ // class UnoScriptTypeDetector sal_Int16 SAL_CALL -UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception) { 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 OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception) { return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction); } sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception) { return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction); } sal_Int16 SAL_CALL -UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) { return ScriptTypeDetector::getCTLScriptType(Text, nPos); } // Begin of Script Type is inclusive. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) { 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 OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) { return ScriptTypeDetector::endOfCTLScriptType(Text, nPos); } OUString SAL_CALL -UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +UnoScriptTypeDetector::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.ScriptTypeDetector"); } sal_Bool SAL_CALL -UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL -UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL +UnoScriptTypeDetector::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Sequence< OUString > aRet(1); + css::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.ScriptTypeDetector"; return aRet; } diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 6d64b2fd3a71..6aef93a7e6bd 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -238,7 +238,7 @@ com_sun_star_i18n_Collator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new com::sun::star::i18n::CollatorImpl(context)); + return cppu::acquire(new css::i18n::CollatorImpl(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 96fef17c9f44..3f6855ceb4ae 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -80,7 +80,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry, sal_Int16 SAL_CALL IndexEntrySupplier::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 ) -throw (com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { if (xIES.is()) return xIES->compareIndexEntry(rIndexEntry1, rPhoneticEntry1, rLocale1, @@ -109,7 +109,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O return false; } -Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL +Reference < css::i18n::XExtendedIndexEntrySupplier > SAL_CALL IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) throw (RuntimeException) { if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 871a4923362a..5f9b3f13f974 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode( - const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : + const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) { implementationName = "com.sun.star.i18n.IndexEntrySupplier_Unicode"; @@ -107,7 +107,7 @@ void IndexTable::init(sal_Unicode start_, sal_Unicode end_, IndexKey *keys, sal_ } } -Index::Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext) +Index::Index(const css::uno::Reference < css::uno::XComponentContext >& rxContext) : table_count(0) , key_count(0) , mkey_count(0) diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index a0120a89252e..1a956cdeb75b 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -27,7 +27,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry, const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) - throw (com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { sal_Unicode ch=rIndexEntry.toChar(); sal_uInt16 first = idx[ ch >> 8 ]; @@ -42,7 +42,7 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString()); } @@ -50,7 +50,7 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& I sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { sal_Int16 result = sal::static_int_cast<sal_Int16>( collator->compareString( IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1), @@ -65,28 +65,28 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( static const sal_Char first[] = "ja_phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) + const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, + sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant::loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) + const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, + sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } static const sal_Char last[] = "ja_phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) + const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, + sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant::loadAlgorithm( - const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) + const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, + sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0; } diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx index 1a29210361e4..0b5c3e2f2c26 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx @@ -112,7 +112,7 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { sal_Unicode currentChar = Text[nStartPos]; sal_uInt16 ch1 = getCharType(inputChar); @@ -126,7 +126,7 @@ InputSequenceChecker_hi::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { if (checkInputSequence(Text, nStartPos, inputChar, inputCheckMode)) Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar)); diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index 339331a3d162..48e3ca37cf89 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -78,7 +78,7 @@ static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputChec sal_Bool SAL_CALL InputSequenceChecker_th::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) { return check(Text[nStartPos], inputChar, inputCheckMode); } @@ -88,7 +88,7 @@ InputSequenceChecker_th::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { /* 9 rules for input sequence correction, see issue i42661 for detail, diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 344b3bfe23d7..6fcbb58f0e47 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -321,15 +321,15 @@ static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable); struct LocaleDataLookupTableItem { - LocaleDataLookupTableItem(const sal_Char *name, osl::Module* m, const sal_Char* lname) : dllName(name), module(m), localeName(lname) - { - } const sal_Char* dllName; osl::Module *module; const sal_Char* localeName; + css::lang::Locale aLocale; - com::sun::star::lang::Locale aLocale; - bool equals(const com::sun::star::lang::Locale& rLocale) + LocaleDataLookupTableItem(const sal_Char *name, osl::Module* m, const sal_Char* lname) : dllName(name), module(m), localeName(lname) + { + } + bool equals(const css::lang::Locale& rLocale) { return (rLocale == aLocale); } @@ -1337,7 +1337,7 @@ namespace com{ namespace sun{ namespace star{ namespace lang { struct OutlineNumberingLevel_Impl { OUString sPrefix; - sal_Int16 nNumType; //com::sun::star::style::NumberingType + sal_Int16 nNumType; //css::style::NumberingType OUString sSuffix; sal_Unicode cBulletChar; OUString sBulletFontName; @@ -1608,7 +1608,7 @@ LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException, std::excepti } // static -OUString LocaleDataImpl::getFirstLocaleServiceName( const com::sun::star::lang::Locale & rLocale ) +OUString LocaleDataImpl::getFirstLocaleServiceName( const css::lang::Locale & rLocale ) { if (rLocale.Language == I18NLANGTAG_QLT) return rLocale.Variant.replace( cHyphen, cUnder); @@ -1619,7 +1619,7 @@ OUString LocaleDataImpl::getFirstLocaleServiceName( const com::sun::star::lang:: } // static -::std::vector< OUString > LocaleDataImpl::getFallbackLocaleServiceNames( const com::sun::star::lang::Locale & rLocale ) +::std::vector< OUString > LocaleDataImpl::getFallbackLocaleServiceNames( const css::lang::Locale & rLocale ) { ::std::vector< OUString > aVec; if (rLocale.Language == I18NLANGTAG_QLT) diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index bde98f98e62d..beb184ed6bf7 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -78,7 +78,7 @@ public: return nBytesToRead; } virtual sal_Int32 SAL_CALL readSomeBytes( - ::com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override { diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 34f65e9d840a..b8e74a307f6a 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -605,7 +605,7 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); } -sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(com::sun::star::uno::RuntimeException) +sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(css::uno::RuntimeException) { if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii for (sal_Int16 i = 0; i < NumberChar_Count; i++) diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 42f9a08d46af..544ea67fb592 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -24,8 +24,7 @@ #include <cppuhelper/supportsservice.hxx> NumberFormatCodeMapper::NumberFormatCodeMapper( - const ::com::sun::star::uno::Reference < - ::com::sun::star::uno::XComponentContext >& rxContext ) + const css::uno::Reference < css::uno::XComponentContext >& rxContext ) : mxContext( rxContext ), bFormatsValid( false ) @@ -38,8 +37,8 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper() } -::com::sun::star::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::i18n::NumberFormatCode SAL_CALL +NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { OUString elementType = mapElementTypeShortToString(formatType); @@ -50,7 +49,7 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, for(sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) { if(aFormatSeq[i].isDefault && aFormatSeq[i].formatType == elementType && aFormatSeq[i].formatUsage == elementUsage) { - com::sun::star::i18n::NumberFormatCode anumberFormatCode(formatType, + css::i18n::NumberFormatCode anumberFormatCode(formatType, formatUsage, aFormatSeq[i].formatCode, aFormatSeq[i].formatName, @@ -60,20 +59,20 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, return anumberFormatCode; } } - com::sun::star::i18n::NumberFormatCode defaultNumberFormatCode; + css::i18n::NumberFormatCode defaultNumberFormatCode; return defaultNumberFormatCode; } -::com::sun::star::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::i18n::NumberFormatCode SAL_CALL +NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { getFormats( rLocale ); for(sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) { if(aFormatSeq[i].formatIndex == formatIndex) { - com::sun::star::i18n::NumberFormatCode anumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), + css::i18n::NumberFormatCode anumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), mapElementUsageStringToShort(aFormatSeq[i].formatUsage), aFormatSeq[i].formatCode, aFormatSeq[i].formatName, @@ -83,15 +82,15 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const ::com::sun:: return anumberFormatCode; } } - com::sun::star::i18n::NumberFormatCode defaultNumberFormatCode; + css::i18n::NumberFormatCode defaultNumberFormatCode; return defaultNumberFormatCode; } -::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL +NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { getFormats( rLocale ); @@ -103,12 +102,12 @@ NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::su count++; } - ::com::sun::star::uno::Sequence<com::sun::star::i18n::NumberFormatCode> seq(count); + css::uno::Sequence<css::i18n::NumberFormatCode> seq(count); sal_Int32 j = 0; for(i = 0; i < aFormatSeq.getLength(); i++) { sal_Int16 elementUsage = mapElementUsageStringToShort(aFormatSeq[i].formatUsage); if( elementUsage == formatUsage) { - seq[j] = com::sun::star::i18n::NumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), + seq[j] = css::i18n::NumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), formatUsage, aFormatSeq[i].formatCode, aFormatSeq[i].formatName, @@ -123,15 +122,15 @@ NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::su } -::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL +NumberFormatCodeMapper::getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { getFormats( rLocale ); - ::com::sun::star::uno::Sequence<com::sun::star::i18n::NumberFormatCode> seq(aFormatSeq.getLength()); + css::uno::Sequence<css::i18n::NumberFormatCode> seq(aFormatSeq.getLength()); for(sal_Int32 i = 0; i < aFormatSeq.getLength(); i++) { - seq[i] = com::sun::star::i18n::NumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), + seq[i] = css::i18n::NumberFormatCode(mapElementTypeStringToShort(aFormatSeq[i].formatType), mapElementUsageStringToShort(aFormatSeq[i].formatUsage), aFormatSeq[i].formatCode, aFormatSeq[i].formatName, @@ -145,7 +144,7 @@ NumberFormatCodeMapper::getAllFormatCodes( const ::com::sun::star::lang::Locale& // --- private implementation ----------------------------------------- -void NumberFormatCodeMapper::setupLocale( const ::com::sun::star::lang::Locale& rLocale ) +void NumberFormatCodeMapper::setupLocale( const css::lang::Locale& rLocale ) { if ( aLocale.Country != rLocale.Country || aLocale.Language != rLocale.Language @@ -157,14 +156,14 @@ void NumberFormatCodeMapper::setupLocale( const ::com::sun::star::lang::Locale& } -void NumberFormatCodeMapper::getFormats( const ::com::sun::star::lang::Locale& rLocale ) +void NumberFormatCodeMapper::getFormats( const css::lang::Locale& rLocale ) { setupLocale( rLocale ); if ( !bFormatsValid ) { createLocaleDataObject(); if( !mxLocaleData.is() ) - aFormatSeq = ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > (0); + aFormatSeq = css::uno::Sequence< css::i18n::FormatElement > (0); else aFormatSeq = mxLocaleData->getAllFormats( aLocale ); bFormatsValid = true; @@ -178,11 +177,11 @@ NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType) switch ( formatType ) { - case com::sun::star::i18n::KNumberFormatType::SHORT : + case css::i18n::KNumberFormatType::SHORT : return OUString( "short" ); - case com::sun::star::i18n::KNumberFormatType::MEDIUM : + case css::i18n::KNumberFormatType::MEDIUM : return OUString( "medium" ); - case com::sun::star::i18n::KNumberFormatType::LONG : + case css::i18n::KNumberFormatType::LONG : return OUString( "long" ); } return OUString(); @@ -192,13 +191,13 @@ sal_Int16 NumberFormatCodeMapper::mapElementTypeStringToShort(const OUString& formatType) { if ( formatType == "short" ) - return com::sun::star::i18n::KNumberFormatType::SHORT; + return css::i18n::KNumberFormatType::SHORT; if ( formatType == "medium" ) - return com::sun::star::i18n::KNumberFormatType::MEDIUM; + return css::i18n::KNumberFormatType::MEDIUM; if ( formatType == "long" ) - return com::sun::star::i18n::KNumberFormatType::LONG; + return css::i18n::KNumberFormatType::LONG; - return com::sun::star::i18n::KNumberFormatType::SHORT; + return css::i18n::KNumberFormatType::SHORT; } OUString @@ -206,21 +205,21 @@ NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage) { switch ( formatUsage ) { - case com::sun::star::i18n::KNumberFormatUsage::DATE : + case css::i18n::KNumberFormatUsage::DATE : return OUString( "DATE" ); - case com::sun::star::i18n::KNumberFormatUsage::TIME : + case css::i18n::KNumberFormatUsage::TIME : return OUString( "TIME" ); - case com::sun::star::i18n::KNumberFormatUsage::DATE_TIME : + case css::i18n::KNumberFormatUsage::DATE_TIME : return OUString( "DATE_TIME" ); - case com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER : + case css::i18n::KNumberFormatUsage::FIXED_NUMBER : return OUString( "FIXED_NUMBER" ); - case com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER : + case css::i18n::KNumberFormatUsage::FRACTION_NUMBER : return OUString( "FRACTION_NUMBER" ); - case com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER : + case css::i18n::KNumberFormatUsage::PERCENT_NUMBER : return OUString( "PERCENT_NUMBER" ); - case com::sun::star::i18n::KNumberFormatUsage::CURRENCY : + case css::i18n::KNumberFormatUsage::CURRENCY : return OUString( "CURRENCY" ); - case com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER : + case css::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER : return OUString( "SCIENTIFIC_NUMBER" ); } return OUString(); @@ -231,21 +230,21 @@ sal_Int16 NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage) { if ( formatUsage == "DATE" ) - return com::sun::star::i18n::KNumberFormatUsage::DATE; + return css::i18n::KNumberFormatUsage::DATE; if ( formatUsage == "TIME" ) - return com::sun::star::i18n::KNumberFormatUsage::TIME; + return css::i18n::KNumberFormatUsage::TIME; if ( formatUsage == "DATE_TIME" ) - return com::sun::star::i18n::KNumberFormatUsage::DATE_TIME; + return css::i18n::KNumberFormatUsage::DATE_TIME; if ( formatUsage == "FIXED_NUMBER" ) - return com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER; + return css::i18n::KNumberFormatUsage::FIXED_NUMBER; if ( formatUsage == "FRACTION_NUMBER" ) - return com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER; + return css::i18n::KNumberFormatUsage::FRACTION_NUMBER; if ( formatUsage == "PERCENT_NUMBER" ) - return com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER; + return css::i18n::KNumberFormatUsage::PERCENT_NUMBER; if ( formatUsage == "CURRENCY" ) - return com::sun::star::i18n::KNumberFormatUsage::CURRENCY; + return css::i18n::KNumberFormatUsage::CURRENCY; if ( formatUsage == "SCIENTIFIC_NUMBER" ) - return com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER; + return css::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER; return 0; } @@ -257,26 +256,26 @@ NumberFormatCodeMapper::createLocaleDataObject() { if(mxLocaleData.is()) return; - mxLocaleData.set( com::sun::star::i18n::LocaleData::create(mxContext) ); + mxLocaleData.set( css::i18n::LocaleData::create(mxContext) ); } OUString SAL_CALL NumberFormatCodeMapper::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); } sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL -NumberFormatCodeMapper::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL +NumberFormatCodeMapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Sequence< OUString > aRet(1); + css::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.NumberFormatMapper"; return aRet; } diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index fbc4db19994c..7c9645114416 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -160,7 +160,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep } if ( !xBreak.is() ) - xBreak = com::sun::star::i18n::BreakIterator::create( m_xContext ); + xBreak = css::i18n::BreakIterator::create( m_xContext ); sSrchStr = aSrchPara.searchString; @@ -172,7 +172,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep if (maskSimpleRegexTrans( aSrchPara.transliterateFlags) != maskSimpleTrans( aSrchPara.transliterateFlags)) { - com::sun::star::uno::Reference< XExtendedTransliteration > xTranslitPattern( + css::uno::Reference< XExtendedTransliteration > xTranslitPattern( Transliteration::create( m_xContext )); if (xTranslitPattern.is()) { @@ -265,7 +265,7 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta if ( xTranslit.is() ) { // apply normal transliteration (1<->1, 1<->0) - com::sun::star::uno::Sequence<sal_Int32> offset(endPos - startPos); + css::uno::Sequence<sal_Int32> offset(endPos - startPos); in_str = xTranslit->transliterate( searchStr, startPos, endPos - startPos, offset ); // JP 20.6.2001: also the start and end positions must be corrected! @@ -323,7 +323,7 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta SearchResult sres2; in_str = OUString(searchStr); - com::sun::star::uno::Sequence <sal_Int32> offset( in_str.getLength()); + css::uno::Sequence <sal_Int32> offset( in_str.getLength()); in_str = xTranslit2->transliterate( searchStr, 0, in_str.getLength(), offset ); @@ -374,7 +374,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st if ( xTranslit.is() ) { // apply only simple 1<->1 transliteration here - com::sun::star::uno::Sequence<sal_Int32> offset(startPos - endPos); + css::uno::Sequence<sal_Int32> offset(startPos - endPos); in_str = xTranslit->transliterate( searchStr, endPos, startPos - endPos, offset ); // JP 20.6.2001: also the start and end positions must be corrected! @@ -423,7 +423,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st SearchResult sres2; in_str = OUString(searchStr); - com::sun::star::uno::Sequence <sal_Int32> offset( in_str.getLength()); + css::uno::Sequence <sal_Int32> offset( in_str.getLength()); in_str = xTranslit2->transliterate(searchStr, 0, in_str.getLength(), offset); @@ -762,7 +762,7 @@ SearchResult TextSearch::NSrchBkwrd( const OUString& searchStr, sal_Int32 startP return aRet; } -void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOptions) +void TextSearch::RESrchPrepare( const css::util::SearchOptions& rOptions) { // select the transliterated pattern string const OUString& rPatternStr = @@ -770,7 +770,7 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp : (isComplexTrans( rOptions.transliterateFlags) ? sSrchStr2 : rOptions.searchString)); sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode capability - // map com::sun::star::util::SearchFlags to ICU uregex.h flags + // map css::util::SearchFlags to ICU uregex.h flags // TODO: REG_EXTENDED, REG_NOT_BEGINOFLINE, REG_NOT_ENDOFLINE // REG_NEWLINE is neither properly defined nor used anywhere => not implemented // REG_NOSUB is not used anywhere => not implemented @@ -778,7 +778,7 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp // LEV_RELAXED is only used for SearchAlgorithm==Approximate // Note that the search flag ALL_IGNORE_CASE is deprecated in UNO // probably because the transliteration flag IGNORE_CASE handles it as well. - if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0 + if( (rOptions.searchFlag & css::util::SearchFlags::ALL_IGNORE_CASE) != 0 || (rOptions.transliterateFlags & TransliterationModules_IGNORE_CASE) != 0) nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE; UErrorCode nIcuErr = U_ZERO_ERROR; @@ -1097,13 +1097,13 @@ TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception ) return aRet; } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +css::uno::Reference< css::uno::XInterface > SAL_CALL TextSearch_CreateInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rxMSF ) + const css::uno::Reference< + css::lang::XMultiServiceFactory >& rxMSF ) { - return ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >( + return css::uno::Reference< + css::uno::XInterface >( static_cast<cppu::OWeakObject*>(new TextSearch( comphelper::getComponentContext( rxMSF ) )) ); } @@ -1117,15 +1117,15 @@ i18nsearch_component_getFactory( const sal_Char* sImplementationName, { void* pRet = NULL; - ::com::sun::star::lang::XMultiServiceFactory* pServiceManager = - static_cast< ::com::sun::star::lang::XMultiServiceFactory* > + css::lang::XMultiServiceFactory* pServiceManager = + static_cast< css::lang::XMultiServiceFactory* > ( _pServiceManager ); - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XSingleServiceFactory > xFactory; + css::uno::Reference< + css::lang::XSingleServiceFactory > xFactory; if ( 0 == rtl_str_compare( sImplementationName, cSearchImpl) ) { - ::com::sun::star::uno::Sequence< OUString > aServiceNames(1); + css::uno::Sequence< OUString > aServiceNames(1); aServiceNames[0] = getServiceName_Static(); xFactory = ::cppu::createSingleFactory( pServiceManager, getImplementationName_Static(), diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index afa3a5fe1b33..7b42fe7368a8 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -39,26 +39,23 @@ typedef ::std::map< sal_Unicode, sal_Int32 > TextSearchJumpTable; class TextSearch: public cppu::WeakImplHelper < - ::com::sun::star::util::XTextSearch, - ::com::sun::star::lang::XServiceInfo + css::util::XTextSearch, + css::lang::XServiceInfo > { - ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference < css::uno::XComponentContext > m_xContext; - ::com::sun::star::util::SearchOptions aSrchPara; + css::util::SearchOptions aSrchPara; OUString sSrchStr; OUString sSrchStr2; - mutable com::sun::star::uno::Reference< - com::sun::star::i18n::XCharacterClassification > xCharClass; + mutable css::uno::Reference< css::i18n::XCharacterClassification > xCharClass; - com::sun::star::uno::Reference< - com::sun::star::i18n::XExtendedTransliteration > xTranslit; - com::sun::star::uno::Reference< - com::sun::star::i18n::XExtendedTransliteration > xTranslit2; + css::uno::Reference< css::i18n::XExtendedTransliteration > xTranslit; + css::uno::Reference< css::i18n::XExtendedTransliteration > xTranslit2; // define a function pointer for the different search methods - typedef ::com::sun::star::util::SearchResult + typedef css::util::SearchResult (SAL_CALL TextSearch:: *FnSrch)( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ); @@ -75,72 +72,72 @@ class TextSearch: public cppu::WeakImplHelper void MakeBackwardTab(); void MakeBackwardTab2(); sal_Int32 GetDiff( const sal_Unicode ) const; - ::com::sun::star::util::SearchResult SAL_CALL + css::util::SearchResult SAL_CALL NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::util::SearchResult SAL_CALL + throw(css::uno::RuntimeException); + css::util::SearchResult SAL_CALL NSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); // Members and methods for the regular expression search RegexMatcher* pRegexMatcher; - ::com::sun::star::util::SearchResult SAL_CALL + css::util::SearchResult SAL_CALL RESrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::util::SearchResult SAL_CALL + throw(css::uno::RuntimeException); + css::util::SearchResult SAL_CALL RESrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); - void RESrchPrepare( const ::com::sun::star::util::SearchOptions&); + throw(css::uno::RuntimeException); + void RESrchPrepare( const css::util::SearchOptions&); // Members and methods for the "Weight Levenshtein-Distance" search int nLimit; WLevDistance* pWLD; - com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > xBreak; - ::com::sun::star::util::SearchResult SAL_CALL + css::uno::Reference < css::i18n::XBreakIterator > xBreak; + css::util::SearchResult SAL_CALL ApproxSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::util::SearchResult SAL_CALL + throw(css::uno::RuntimeException); + css::util::SearchResult SAL_CALL ApproxSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const; bool checkCTLStart, checkCTLEnd; bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); public: TextSearch( - const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference < css::uno::XComponentContext >& rxContext ); virtual ~TextSearch(); // Methods virtual void SAL_CALL - setOptions( const ::com::sun::star::util::SearchOptions& options ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::SearchResult SAL_CALL + setOptions( const css::util::SearchOptions& options ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::util::SearchResult SAL_CALL searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::SearchResult SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::util::SearchResult SAL_CALL searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 782c633f2626..04a640d6cd6d 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -595,7 +595,7 @@ namespace struct TransBody { OUString Name; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration > Body; + css::uno::Reference< css::i18n::XExtendedTransliteration > Body; }; class theTransBodyMutex : public rtl::Static<osl::Mutex, theTransBodyMutex> {}; } @@ -671,7 +671,7 @@ com_sun_star_i18n_Transliteration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new com::sun::star::i18n::TransliterationImpl(context)); + return cppu::acquire(new css::i18n::TransliterationImpl(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 9e89c39356b9..52f0cd2f21e4 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -89,7 +89,7 @@ sal_Bool SAL_CALL Transliteration_caseignore::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, std::exception) + throw(css::uno::RuntimeException, std::exception) { return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0); } |