cws tl80: merge with DEV300 m77

3 files changed, 4 insertions, 4 deletions

diff --git a/i18npool/source/breakiterator/data/dict.map b/i18npool/source/breakiterator/data/dict.map
index 271ba8b2b83c..ebd4f9185d1f 100644
--- a/i18npool/source/breakiterator/data/dict.map
+++ b/i18npool/source/breakiterator/data/dict.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
     GetVersionInfo;
     getDataArea;
diff --git a/i18npool/source/breakiterator/data/dict_word.txt b/i18npool/source/breakiterator/data/dict_word.txt
index 367a82db9e6f..f69f038e7f7e 100644
--- a/i18npool/source/breakiterator/data/dict_word.txt
+++ b/i18npool/source/breakiterator/data/dict_word.txt
@@ -35,7 +35,7 @@ $ALetter   = [\u0002 [:Alphabetic:] [:name= COMMERCIAL AT:] [:name= HEBREW PUNCT
 $MidLetter = [[:name = APOSTROPHE:] [:name = GRAVE ACCENT:] \u0084 [:name = SOFT HYPHEN:] [:name = MIDDLE DOT:] [:name = GREEK TONOS:] [:name= FULL STOP:] 
               [:name = HEBREW PUNCTUATION GERSHAYIM:] [:name = DOUBLE VERTICAL LINE:] [:name = LEFT SINGLE QUOTATION MARK:]
               [:name = RIGHT SINGLE QUOTATION MARK:] [:name = HYPHENATION POINT:] [:name = PRIME:] 
-              [:name = HYPHEN-MINUS:] [:name = EN DASH:] [:name = EM DASH:] ];
+              [:name = HYPHEN-MINUS:] ];
 
 $SufixLetter = [:name= FULL STOP:];
               
diff --git a/i18npool/source/breakiterator/data/dict_word_prepostdash.txt b/i18npool/source/breakiterator/data/dict_word_prepostdash.txt
index 1bf94451fae2..0a60cc5d4924 100644
--- a/i18npool/source/breakiterator/data/dict_word_prepostdash.txt
+++ b/i18npool/source/breakiterator/data/dict_word_prepostdash.txt
@@ -27,7 +27,7 @@ $Hangul = [:Script = HANGUL:];
 # list of dashes or hyphens that should be accepted as part of the word if a single one of these
 # pre- or postfixes a word. E.g. in German: "Arbeits-" or "-nehmer" where that hyphen needs to
 # be part of the word in order to have it properly spell checked etc.
-$PrePostDashHyphen = [ [:name = HYPHEN-MINUS:] [:name = EN DASH:] [:name = EM DASH:] ];
+$PrePostDashHyphen = [ [:name = HYPHEN-MINUS:] ];
 
 
 $ALetter   = [\u0002 [:Alphabetic:] [:name= COMMERCIAL AT:] [:name= HEBREW PUNCTUATION GERESH:]
@@ -41,7 +41,7 @@ $ALetter   = [\u0002 [:Alphabetic:] [:name= COMMERCIAL AT:] [:name= HEBREW PUNCT
 $MidLetter = [[:name = APOSTROPHE:] [:name = GRAVE ACCENT:] \u0084 [:name = SOFT HYPHEN:] [:name = MIDDLE DOT:] [:name = GREEK TONOS:] [:name= FULL STOP:] 
               [:name = HEBREW PUNCTUATION GERSHAYIM:] [:name = DOUBLE VERTICAL LINE:] [:name = LEFT SINGLE QUOTATION MARK:]
               [:name = RIGHT SINGLE QUOTATION MARK:] [:name = HYPHENATION POINT:] [:name = PRIME:] 
-              [:name = HYPHEN-MINUS:] [:name = EN DASH:] [:name = EM DASH:] ];
+              [:name = HYPHEN-MINUS:] ];
 
 $SufixLetter = [:name= FULL STOP:];