diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-06 18:13:57 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-06 18:13:57 +0000 |
| commit | e1ad946ef5db3f7c0a540207d0f0fd85799e3b66 (patch) | |
| tree | 4c45e855d4c95fcc62166400f546effceef25788 /i18npool/inc | |
| parent | 9732a509373732db8036bab56ad404ef69d62510 (diff) | |
CWS-TOOLING: integrate CWS tl73
2009-07-31 15:29:33 +0200 tl r274535 : #i64400# dash/hyphen should not break words
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/breakiterator_ctl.hxx | 1 | ||||
| -rw-r--r-- | i18npool/inc/breakiterator_unicode.hxx | 6 | ||||
| -rw-r--r-- | i18npool/inc/xdictionary.hxx | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx index 9e753e8ae16f..3e687b5e8e68 100644 --- a/i18npool/inc/breakiterator_ctl.hxx +++ b/i18npool/inc/breakiterator_ctl.hxx @@ -58,6 +58,7 @@ protected: sal_Int32* nextCellIndex; sal_Int32* previousCellIndex; sal_Int32 cellIndexSize; + virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 3a0720f27545..654df424b237 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -86,12 +86,16 @@ protected: const sal_Char *cBreakIterator, *wordRule, *lineRule; Boundary result; // for word break iterator - struct { + struct BI_Data { UnicodeString aICUText; icu::BreakIterator *aBreakIterator; + + BI_Data() : aICUText(), aBreakIterator(NULL) {} } character, word, sentence, line, *icuBI; + com::sun::star::lang::Locale aLocale; sal_Int16 aBreakType, aWordType; + void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index 32ffdbbfe377..04c5836aaaea 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -45,11 +45,13 @@ namespace com { namespace sun { namespace star { namespace i18n { // cache structure. struct WordBreakCache { - sal_Bool equals(const sal_Unicode *str, Boundary& boundary); // checking cached string sal_Int32 length; // contents length saved here. sal_Unicode *contents; // seperated segment contents. sal_Int32* wordboundary; // word boundaries in segments. sal_Int32 size; // size of wordboundary + + WordBreakCache(); + sal_Bool equals(const sal_Unicode *str, Boundary& boundary); // checking cached string }; class xdictionary |