CWS-TOOLING: integrate CWS sw32bf05_OOO320

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

13 files changed, 118 insertions, 97 deletions

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 676698b54f..f3dcb30d01 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
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 05e5659082..b78699fa6e 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -311,16 +311,16 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
     { 0, SFX_ITEM_POOLABLE },							// RES_CHRATR_DUMMY1
     { 0, SFX_ITEM_POOLABLE },							// RES_CHRATR_DUMMY2
 
+    { 0, 0 },                                           // RES_TXTATR_REFMARK
+    { 0, 0 },                                           // RES_TXTATR_TOXMARK
+    { 0, 0 },                                           // RES_TXTATR_META
+    { 0, 0 },                                           // RES_TXTATR_METAFIELD
     { 0, SFX_ITEM_POOLABLE },                           // RES_TXTATR_AUTOFMT
     { FN_TXTATR_INET, 0 },                              // RES_TXTATR_INETFMT
-    { 0, 0 },                                           // RES_TXTATR_REFMARK
-    { 0, 0 },											// RES_TXTATR_TOXMARK
-    { 0, 0 },											// RES_TXTATR_CHARFMT
+    { 0, 0 },                                           // RES_TXTATR_CHARFMT
+    { SID_ATTR_CHAR_CJK_RUBY, 0 },                      // RES_TXTATR_CJK_RUBY
+    { 0, SFX_ITEM_POOLABLE },                           // RES_TXTATR_UNKNOWN_CONTAINER
     { 0, SFX_ITEM_POOLABLE },                           // RES_TXTATR_DUMMY5
-    { SID_ATTR_CHAR_CJK_RUBY, 0 },					 	// RES_TXTATR_CJK_RUBY,
-    { 0, SFX_ITEM_POOLABLE },					 		// RES_TXTATR_UNKNOWN_CONTAINER,
-    { 0, 0 },                                           // RES_TXTATR_META,
-    { 0, 0 },                                           // RES_TXTATR_METAFIELD,
 
     { 0, 0 },											// RES_TXTATR_FIELD
     { 0, 0 },											// RES_TXTATR_FLYCNT
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index f885456bfa..fff14d4ed3 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -469,9 +469,10 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
         // --> OD 2008-02-25 #refactorlists#
         RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
         // <--
-        RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
         RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
-        RES_TXTATR_CJK_RUBY, RES_TXTATR_UNKNOWN_CONTAINER,
+        RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
+        RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
+        RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
         RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
         0
     };
@@ -753,7 +754,8 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
             // TEST_TEMP ToDo: AutoFmt!
             SfxItemSet aTxtSet( pDoc->GetAttrPool(),
                                 RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK,
-                                RES_TXTATR_DUMMY5, RES_TXTATR_WITHEND_END-1,
+                                RES_TXTATR_META, RES_TXTATR_METAFIELD,
+                                RES_TXTATR_CJK_RUBY, RES_TXTATR_WITHEND_END-1,
                                 0 );
 
             aTxtSet.Put( rChgSet );
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 641bd51ee3..4ac576d66a 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -86,7 +86,7 @@
 
 const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) - 
                      static_cast<USHORT>(RES_CHRATR_BEGIN) + 1 ] =
-{                     
+{
      0, //                                       //  0
      1, // RES_CHRATR_CASEMAP = RES_CHRATR_BEGIN //  1
      0, // RES_CHRATR_CHARSETCOLOR,              //  2
@@ -128,16 +128,16 @@ const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) -
     35, // RES_CHRATR_OVERLINE,                  // 38
      0, // RES_CHRATR_DUMMY1,                    // 39
      0, // RES_CHRATR_DUMMY2,                    // 40
-     0, // RES_TXTATR_AUTOFMT,                   // 41
-     0, // RES_TXTATR_INETFMT                    // 42
-    36, // RES_TXTATR_REFMARK,                   // 43
-    37, // RES_TXTATR_TOXMARK,                   // 44
-     0, // RES_TXTATR_CHARFMT,                   // 45
-     0, // RES_TXTATR_DUMMY5                     // 46
-    38, // RES_TXTATR_CJK_RUBY,                  // 47
-     0, // RES_TXTATR_UNKNOWN_CONTAINER,         // 48
-    39, // RES_TXTATR_META,                      // 49
-    39  // RES_TXTATR_METAFIELD,                 // 50
+    36, // RES_TXTATR_REFMARK,                   // 41
+    37, // RES_TXTATR_TOXMARK,                   // 42
+    38, // RES_TXTATR_META,                      // 43
+    38, // RES_TXTATR_METAFIELD,                 // 44
+     0, // RES_TXTATR_AUTOFMT,                   // 45
+     0, // RES_TXTATR_INETFMT                    // 46
+     0, // RES_TXTATR_CHARFMT,                   // 47
+    39, // RES_TXTATR_CJK_RUBY,                  // 48
+     0, // RES_TXTATR_UNKNOWN_CONTAINER,         // 49
+     0, // RES_TXTATR_DUMMY5                     // 50
 };
 
 /*************************************************************************
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index c6a2773db0..1cb509fd3e 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -123,8 +123,8 @@ static BOOL lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
 
                 return (long)&rHt1 < (long)&rHt2;
             }
-            // the order must ensure that META is inside RUBY!
-            return ( nWhich1 < nWhich2 );
+            // order is important! for requirements see hintids.hxx
+            return ( nWhich1 > nWhich2 );
         }
         return ( nHt1 > nHt2 );
     }
@@ -159,8 +159,8 @@ static BOOL lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
 
                 return (long)&rHt1 > (long)&rHt2;
             }
-            // the order must ensure that META is inside RUBY!
-            return ( nWhich1 > nWhich2 );
+            // order is important! for requirements see hintids.hxx
+            return ( nWhich1 < nWhich2 );
         }
         else
             return ( *rHt1.GetStart() > *rHt2.GetStart() );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a0740a35b0..7930190ffa 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1518,8 +1518,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
             {
                 SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
-                                    RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                     RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
+                                    RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                                     0 );
                 aCharSet.Put( *GetpSwAttrSet() );
@@ -1565,8 +1565,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
         {
             SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                                 RES_CHRATR_BEGIN, RES_CHRATR_END-1,
-                                RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                 RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
+                                RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                 RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                                 0 );
             aCharSet.Put( *GetpSwAttrSet() );
@@ -2072,8 +2072,8 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
             {
                 SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END-1,
-                                    RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                     RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
+                                    RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                                     RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                                     0 );
                 aCharSet.Put( *GetpSwAttrSet() );
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 0d7e260be1..35c09ac23b 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -679,22 +679,27 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(const SwUndos & rUndos, sal_uInt16 nPos )
                 int nTmpPos = nPos + pUndoStart->GetEndOffset();
                 int nSubstitute = -1;
 
-                SwUndo * pTmpUndo;
-                do
+                // --> OD 2009-09-30 #i105457#
+                if ( nTmpPos > 0 )
+                // <--
                 {
-                    nTmpPos--;
-                    pTmpUndo = rUndos[ static_cast<USHORT>(nTmpPos) ];
+                    SwUndo * pTmpUndo;
+                    do
+                    {
+                        nTmpPos--;
+                        pTmpUndo = rUndos[ static_cast<USHORT>(nTmpPos) ];
 
-                    if (pTmpUndo->GetEffectiveId() > UNDO_END)
-                        nSubstitute = nTmpPos;
-                }
-                while (nSubstitute < 0 && nTmpPos > nPos);
+                        if (pTmpUndo->GetEffectiveId() > UNDO_END)
+                            nSubstitute = nTmpPos;
+                    }
+                    while (nSubstitute < 0 && nTmpPos > nPos);
 
-                if (nSubstitute >= 0)
-                {
-                    SwUndo * pSubUndo = rUndos[ static_cast<USHORT>(nSubstitute) ];
-                    nId = pSubUndo->GetEffectiveId();
-                    sStr = pSubUndo->GetComment();
+                    if (nSubstitute >= 0)
+                    {
+                        SwUndo * pSubUndo = rUndos[ static_cast<USHORT>(nSubstitute) ];
+                        nId = pSubUndo->GetEffectiveId();
+                        sStr = pSubUndo->GetComment();
+                    }
                 }
             }
             else
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 1db4197de0..2c1cb1ceb5 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2061,6 +2061,7 @@ SwChartDataSequence::SwChartDataSequence(
     // which is required for some functions
     SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
     DBG_ASSERT(pUnoTblCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
+    (void) pUnoTblCrsr;
 #endif
 }
 
@@ -2111,6 +2112,7 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     // which is required for some functions
     SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
     DBG_ASSERT(pUnoTblCrsr, "SwChartDataSequence: cursor not SwUnoTableCrsr");
+    (void) pUnoTblCrsr;
 #endif
 }
 
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index cb327b1962..5486a8a97f 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2387,9 +2387,10 @@ void SAL_CALL SwXTextCursor::setAllPropertiesToDefault()
         // selection specific attribut ranges
         USHORT aResetableSetRange[] = {
             RES_CHRATR_BEGIN, RES_CHRATR_END-1,
-            RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
             RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
-            RES_TXTATR_CJK_RUBY, RES_TXTATR_UNKNOWN_CONTAINER,
+            RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
+            RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
+            RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
             0
         };
         SvUShortsSort	aParaWhichIds;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 155b1652d3..38f82babb9 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3755,22 +3755,22 @@ SwAttrFnTab aCSS1AttrFnTab = {
 /* RES_CHRATR_DUMMY1 */             0,
 /* RES_CHRATR_DUMMY2 */             0,
 
-/* RES_TXTATR_NOLINEBREAK	*/      0,
-/* RES_TXTATR_NOHYPHEN	*/			0,
-/* RES_TXTATR_REFMARK*/				0,
-/* RES_TXTATR_TOXMARK */ 			0,
-/* RES_TXTATR_CHARFMT	*/			0,
-/* RES_TXTATR_TWO_LINES */			0,
-/* RES_TXTATR_CJK_RUBY */			0,
-/* RES_TXTATR_UNKNOWN_CONTAINER */	0,
-/* RES_TXTATR_DUMMY5 */				0,
-/* RES_TXTATR_DUMMY6 */				0,
+/* RES_TXTATR_REFMARK */            0,
+/* RES_TXTATR_TOXMARK */            0,
+/* RES_TXTATR_META */               0,
+/* RES_TXTATR_METAFIELD */          0,
+/* RES_TXTATR_AUTOFMT */            0,
+/* RES_TXTATR_INETFMT */            0,
+/* RES_TXTATR_CHARFMT */            0,
+/* RES_TXTATR_CJK_RUBY */           0,
+/* RES_TXTATR_UNKNOWN_CONTAINER */  0,
+/* RES_TXTATR_DUMMY5 */             0,
 
 /* RES_TXTATR_FIELD	*/          	0,
 /* RES_TXTATR_FLYCNT */ 			0,
 /* RES_TXTATR_FTN */				0,
-/* RES_TXTATR_SOFTHYPH */			0,
-/* RES_TXTATR_HARDBLANK*/			0,
+/* RES_TXTATR_DUMMY4 */             0,
+/* RES_TXTATR_DUMMY3 */             0,
 /* RES_TXTATR_DUMMY1 */        	    0, // Dummy:
 /* RES_TXTATR_DUMMY2 */        	    0, // Dummy:
 
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index ab62e9d2ee..45e5ce7e55 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3391,22 +3391,22 @@ SwAttrFnTab aHTMLAttrFnTab = {
 /* RES_CHRATR_DUMMY1 */             0,
 /* RES_CHRATR_DUMMY2 */             0,
 
-/* RES_TXTATR_DUMMY4    */          0,
-/* RES_TXTATR_INETFMT   */          OutHTML_SwFmtINetFmt,
-/* RES_TXTATR_REFMARK*/             0,
-/* RES_TXTATR_TOXMARK */ 			0,
-/* RES_TXTATR_CHARFMT	*/			OutHTML_SwTxtCharFmt,
-/* RES_TXTATR_TWO_LINES */			0,
-/* RES_TXTATR_CJK_RUBY */			0,
-/* RES_TXTATR_UNKNOWN_CONTAINER */	0,
-/* RES_TXTATR_DUMMY5 */				0,
-/* RES_TXTATR_DUMMY6 */				0,
+/* RES_TXTATR_REFMARK */            0,
+/* RES_TXTATR_TOXMARK */            0,
+/* RES_TXTATR_META */               0,
+/* RES_TXTATR_METAFIELD */          0,
+/* RES_TXTATR_AUTOFMT */            0,
+/* RES_TXTATR_INETFMT */            OutHTML_SwFmtINetFmt,
+/* RES_TXTATR_CHARFMT */            OutHTML_SwTxtCharFmt,
+/* RES_TXTATR_CJK_RUBY */           0,
+/* RES_TXTATR_UNKNOWN_CONTAINER */  0,
+/* RES_TXTATR_DUMMY5 */             0,
 
 /* RES_TXTATR_FIELD	*/          	OutHTML_SwFmtFld,
 /* RES_TXTATR_FLYCNT */ 			OutHTML_SwFlyCnt,
 /* RES_TXTATR_FTN */				OutHTML_SwFmtFtn,
-/* RES_TXTATR_SOFTHYPH */			0,
-/* RES_TXTATR_HARDBLANK*/			0,
+/* RES_TXTATR_DUMMY4 */             0,
+/* RES_TXTATR_DUMMY3 */             0,
 /* RES_TXTATR_DUMMY1 */        	    0, // Dummy:
 /* RES_TXTATR_DUMMY2 */        	    0, // Dummy:
 
diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx
index ba95d018ac..9b97984126 100644
--- a/sw/source/filter/rtf/rtfatr.cxx
+++ b/sw/source/filter/rtf/rtfatr.cxx
@@ -4251,22 +4251,22 @@ SwAttrFnTab aRTFAttrFnTab = {
 /* RES_CHRATR_DUMMY1 */             0,
 /* RES_CHRATR_DUMMY2 */             0,
 
-/* RES_TXTATR_AUTOFMT   */          OutRTF_SwTxtAutoFmt,
-/* RES_TXTATR_INETFMT   */          OutRTF_SwTxtINetFmt, // Dummy
-/* RES_TXTATR_REFMARK*/             0, // NOT USED!! OutRTF_SwRefMark,
-/* RES_TXTATR_TOXMARK */ 			0, // NOT USED!! OutRTF_SwTOXMark,
-/* RES_TXTATR_CHARFMT	*/			OutRTF_SwTxtCharFmt,
-/* RES_TXTATR_TWO_LINES */			0,
-/* RES_TXTATR_CJK_RUBY */			OutRTF_SwTxtRuby,
-/* RES_TXTATR_UNKNOWN_CONTAINER */	0,
-/* RES_TXTATR_DUMMY5 */				0,
-/* RES_TXTATR_DUMMY6 */				0,
+/* RES_TXTATR_REFMARK */            0, // NOT USED!! OutRTF_SwRefMark,
+/* RES_TXTATR_TOXMARK */            0, // NOT USED!! OutRTF_SwTOXMark,
+/* RES_TXTATR_META */               0,
+/* RES_TXTATR_METAFIELD */          0,
+/* RES_TXTATR_AUTOFMT */            OutRTF_SwTxtAutoFmt,
+/* RES_TXTATR_INETFMT */            OutRTF_SwTxtINetFmt,
+/* RES_TXTATR_CHARFMT */            OutRTF_SwTxtCharFmt,
+/* RES_TXTATR_CJK_RUBY */           OutRTF_SwTxtRuby,
+/* RES_TXTATR_UNKNOWN_CONTAINER */  0,
+/* RES_TXTATR_DUMMY5 */             0,
 
 /* RES_TXTATR_FIELD	*/          	OutRTF_SwField,
 /* RES_TXTATR_FLYCNT */ 			OutRTF_SwFlyCntnt,
 /* RES_TXTATR_FTN */				OutRTF_SwFtn,
-/* RES_TXTATR_SOFTHYPH */			0,	// old attr. - coded now by character
-/* RES_TXTATR_HARDBLANK*/			0,
+/* RES_TXTATR_DUMMY4 */             0,
+/* RES_TXTATR_DUMMY3 */             0,
 /* RES_TXTATR_DUMMY1 */        	    0, // Dummy:
 /* RES_TXTATR_DUMMY2 */        	    0, // Dummy:
 
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index a0ccd838ac..3042101976 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -488,9 +488,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 RES_CHRATR_CJK_LANGUAGE + 1, RES_CHRATR_CTL_LANGUAGE - 1,
                 RES_CHRATR_CTL_LANGUAGE + 1, RES_CHRATR_END-1,
                 RES_PARATR_BEGIN, RES_PARATR_END-1,
-                RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
                 RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
-                RES_TXTATR_CJK_RUBY, RES_TXTATR_UNKNOWN_CONTAINER,
+                RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
+                RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
+                RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
                 RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
                 0
             };