[Libreoffice-commits] core.git: i18npool/inc i18npool/source
Noel Grandin
noel at peralex.com
Mon Oct 19 04:15:49 PDT 2015
i18npool/inc/breakiteratorImpl.hxx | 80 ++---
i18npool/inc/breakiterator_cjk.hxx | 16 -
i18npool/inc/breakiterator_ctl.hxx | 10
i18npool/inc/breakiterator_th.hxx | 2
i18npool/inc/breakiterator_unicode.hxx | 50 +--
i18npool/inc/calendarImpl.hxx | 82 +++---
i18npool/inc/calendar_gregorian.hxx | 80 ++---
i18npool/inc/calendar_hijri.hxx | 4
i18npool/inc/calendar_jewish.hxx | 6
i18npool/inc/cclass_unicode.hxx | 46 +--
i18npool/inc/chaptercollator.hxx | 14 -
i18npool/inc/characterclassificationImpl.hxx | 67 ++--
i18npool/inc/collatorImpl.hxx | 44 +--
i18npool/inc/collator_unicode.hxx | 26 -
i18npool/inc/defaultnumberingprovider.hxx | 62 ++--
i18npool/inc/indexentrysupplier.hxx | 68 ++---
i18npool/inc/indexentrysupplier_asian.hxx | 20 -
i18npool/inc/indexentrysupplier_common.hxx | 69 ++---
i18npool/inc/indexentrysupplier_default.hxx | 26 -
i18npool/inc/indexentrysupplier_ja_phonetic.hxx | 22 -
i18npool/inc/inputsequencechecker.hxx | 28 +-
i18npool/inc/inputsequencechecker_hi.hxx | 4
i18npool/inc/inputsequencechecker_th.hxx | 4
i18npool/inc/localedata.hxx | 108 +++----
i18npool/inc/nativenumbersupplier.hxx | 42 +--
i18npool/inc/numberformatcode.hxx | 36 +-
i18npool/inc/ordinalsuffix.hxx | 10
i18npool/inc/textToPronounce_zh.hxx | 14 -
i18npool/inc/textconversion.hxx | 136 +++++-----
i18npool/inc/textconversionImpl.hxx | 60 ++--
i18npool/inc/transliterationImpl.hxx | 82 +++---
i18npool/inc/transliteration_Ignore.hxx | 36 +-
i18npool/inc/transliteration_Numeric.hxx | 24 -
i18npool/inc/transliteration_OneToOne.hxx | 30 +-
i18npool/inc/transliteration_body.hxx | 24 -
i18npool/inc/transliteration_caseignore.hxx | 18 -
i18npool/inc/transliteration_commonclass.hxx | 66 ++--
i18npool/inc/unoscripttypedetector.hxx | 24 -
i18npool/source/breakiterator/breakiteratorImpl.cxx | 2
i18npool/source/breakiterator/breakiterator_unicode.cxx | 2
i18npool/source/calendar/calendar_gregorian.cxx | 17 -
i18npool/source/characterclassification/unoscripttypedetector.cxx | 22 -
i18npool/source/collator/collatorImpl.cxx | 2
i18npool/source/indexentry/indexentrysupplier.cxx | 4
i18npool/source/indexentry/indexentrysupplier_default.cxx | 4
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx | 22 -
i18npool/source/inputchecker/inputsequencechecker_hi.cxx | 4
i18npool/source/inputchecker/inputsequencechecker_th.cxx | 4
i18npool/source/localedata/localedata.cxx | 16 -
i18npool/source/localedata/saxparser.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 2
i18npool/source/numberformatcode/numberformatcode.cxx | 99 +++----
i18npool/source/search/textsearch.cxx | 38 +-
i18npool/source/search/textsearch.hxx | 71 ++---
i18npool/source/transliteration/transliterationImpl.cxx | 4
i18npool/source/transliteration/transliteration_caseignore.cxx | 2
56 files changed, 925 insertions(+), 932 deletions(-)
New commits:
commit 184637be60fcdbde3b3fb0ab0c1d158a92f63889
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 19 10:34:45 2015 +0200
com::sun::star->css in i18npool
Change-Id: I13a290cba0f38c79eb2d93148b972d3d931c3862
Reviewed-on: https://gerrit.libreoffice.org/19445
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index ce77d9f..82547e3 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 5d78fb0..a477558 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 704a3f6..7715a2e 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 1428151..dccafea 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 9983cfc..94b9f85 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 80d33a1..286972e 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 b3fcdf9..31883d6 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 98e938a..d3ee50a 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 18a8ed2..a4242c2 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 adb2b27..eb449e4 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 3b3eae2..57adfd2 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 a9cd538..ef44b26 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 5634496..f9b135c 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 0439995..7ea38d0 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 044ca0a..4e72d30 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 7436516..8b59211 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 62ab687..8f68dfc 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 19478b85..aab4a4c 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 47fe4b2..d53bda5 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 d92d3be..2fcfa1a 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 1c96a06..953aa9d 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) :
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list