CWS-TOOLING: integrate CWS sw32bf05

2009-10-08 12:41:26 +0200 tl  r276785 : #ii102766# updated de_* hyphenation patterns
2009-10-08 11:09:24 +0200 tl  r276775 : #i105715# update for hu_HU dictionary
2009-10-06 09:25:53 +0200 tl  r276694 : #i105565# fix for dictionary.xcu in dict-de.oxt
2009-10-05 12:29:46 +0200 mst  r276675 : #i105453#: hintids.hxx: change order of RES_TXTATR_WITHEND hints
2009-10-05 12:28:49 +0200 mst  r276674 : unochart.cxx: fix warning on unxlngi6 debug=t
2009-10-05 11:46:18 +0200 tl  r276672 : #i105490# Hebrew dictionary added
2009-10-05 11:39:41 +0200 tl  r276670 : #i105490# Hebrew dictionary added
2009-10-05 11:33:56 +0200 tl  r276669 : #i105490# Hebrew dictionary added
2009-10-05 11:21:02 +0200 tl  r276667 : #i105490# Hebrew dictionary added
2009-10-05 11:17:37 +0200 tl  r276666 : #i105565# de_* dictionay updates
2009-10-03 09:54:58 +0200 tl  r276654 : #i105565# de_* dictionay updates
2009-10-03 08:52:38 +0200 tl  r276653 : #i105564# pt_BR dictionaries updated
2009-10-03 08:46:42 +0200 tl  r276652 : #i105510#, #i105278# outdated dictionary.lst removed
2009-10-02 14:17:03 +0200 tl  r276644 : #i105510#, #i105278# fr_FR and da_DK dictionary updates
2009-10-01 10:05:28 +0200 od  r276577 : #i105447# method <lcl_GetUndoIdAndName(..)>
- assure correct access to undo stack objects

1 files changed, 26 insertions, 16 deletions

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 3f2bdf6f07ae..1dc28e197107 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -112,23 +112,33 @@ enum RES_TXTATR
 {
 RES_TXTATR_BEGIN = RES_CHRATR_END,
 
-// alle TextAttribute mit einem Ende
-// JP 12.07.96: die Ids RES_TXTATR_NOLINEBREAK und RES_TXTATR_NOHYPHEN
-//              wanderten in den Bereich der CharAttr. Die Ids selbst muessen
-//              aber als Dummies noch erhalten bleiben. Der SwG-/Sw3 Reader
-//              merkt sich die Ids immer als Offset zum Start der Gruppe!!!
-// Aus dem RES_TXTATR_NOLINEBREAK ist jetzt RES_TXTATR_INETFMT geworden.
+/** text attributes with start and end.
+   #i105453#:
+   Hints (SwTxtAttr) with the same start and end position are sorted by
+   WhichId, i.e., the TXTATR constants defined here.
+   The text formatting (SwAttrIter) poses some requirements on TXTATR order:
+   - AUTOFMT must precede CHARFMT, so that auto style can overwrite char style.
+   - INETFMT must precede CHARFMT, so that link style can overwrite char style.
+     (this is actually surprising: CHARFMT hints are not split at INETFMT
+      hints on insertion, but on exporting to ODF. if CHARFMT would precede
+      INETFMT, then exporting and importing will effectively change precedence)
+
+   Nesting hints (SwTxtAttrNesting) also have requirements on TXTATR order,
+   to ensure proper nesting (because CJK_RUBY and INETFMT have no CH_TXTATR):
+   - INETFMT should precede CJK_RUBY (for UNO API it does not matter...)
+   - META and METAFIELD must precede CJK_RUBY and INETFMT
+ */
 RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN ,
-    RES_TXTATR_AUTOFMT = RES_TXTATR_WITHEND_BEGIN,  // 41
-    RES_TXTATR_INETFMT,                             // 42
-    RES_TXTATR_REFMARK,                             // 43
-    RES_TXTATR_TOXMARK,                             // 44
-    RES_TXTATR_CHARFMT,                             // 45
-    RES_TXTATR_DUMMY5,                              // 46
-    RES_TXTATR_CJK_RUBY,                            // 47
-    RES_TXTATR_UNKNOWN_CONTAINER,                   // 48
-    RES_TXTATR_META,                                // 49
-    RES_TXTATR_METAFIELD,                           // 50
+    RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN,  // 41
+    RES_TXTATR_TOXMARK,                             // 42
+    RES_TXTATR_META,                                // 43
+    RES_TXTATR_METAFIELD,                           // 44
+    RES_TXTATR_AUTOFMT,                             // 45
+    RES_TXTATR_INETFMT,                             // 46
+    RES_TXTATR_CHARFMT,                             // 47
+    RES_TXTATR_CJK_RUBY,                            // 48
+    RES_TXTATR_UNKNOWN_CONTAINER,                   // 49
+    RES_TXTATR_DUMMY5,                              // 50
 RES_TXTATR_WITHEND_END,
 
 // alle TextAttribute ohne ein Ende