CWS-TOOLING: integrate CWS os120

13 files changed, 62 insertions, 73 deletions

diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index bf52d9c579d4..03450d714ece 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: poolfmt.hrc,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -256,6 +256,7 @@
 #define STR_POOLPAGE_HTML               (RC_POOLPAGEDESC_BEGIN+  6)
 #define STR_POOLPAGE_FOOTNOTE           (RC_POOLPAGEDESC_BEGIN+  7)
 #define STR_POOLPAGE_ENDNOTE            (RC_POOLPAGEDESC_BEGIN+  8)
+#define STR_POOLPAGE_LANDSCAPE                  (RC_POOLPAGEDESC_BEGIN+  9)
 
 //-----------------
 // Numbering styles
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 600cf351a5b8..0526732fd00c 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: poolfmt.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -196,6 +196,7 @@ RES_POOLPAGE_REGISTER,                              // Verzeichnis
 RES_POOLPAGE_HTML,                                  // HTML
 RES_POOLPAGE_FOOTNOTE,                              // Fussnote bei Dokumentende
 RES_POOLPAGE_ENDNOTE,                               // Endnotensseite
+RES_POOLPAGE_LANDSCAPE,                             // Landscape Page Style
 
 RES_POOLPAGE_END
 };
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index d2e232053c7d..6084b53abc5b 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: SwStyleNameMapper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -301,6 +301,7 @@ const struct SwTableEntry PageDescProgNameTable [] =
     ENTRY( "HTML" ),
     ENTRY( "Footnote" ),
     ENTRY( "Endnote" ), // STR_POOLPAGE_PRGM_ENDNOTE
+    ENTRY( "Landscape" ),
     { 0, NULL }
 };
 
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6bcd11e03fe0..2a3914e4d28a 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docredln.cxx,v $
- * $Revision: 1.51 $
+ * $Revision: 1.51.122.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -203,6 +203,7 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode )
             SetInXMLImport( bSaveInXMLImportFlag );
         }
         eRedlineMode = eMode;
+        SetModified();
     }
 }
 
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 21f64991bc01..ad06bf858c99 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: poolfmt.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.54.108.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1605,6 +1605,24 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
             pNewPgDsc->SetFtnInfo( aInf );
         }
         break;
+        case RES_POOLPAGE_LANDSCAPE:
+        {
+            SwPageDesc* pStdPgDsc = this->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
+            SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+            SwTwips nTmp = aFrmSz.GetHeight();
+            aFrmSz.SetHeight( aFrmSz.GetWidth() );
+            aFrmSz.SetWidth( nTmp );
+            aSet.Put( aFrmSz );
+            aSet.Put( aLR );
+            aSet.Put( aUL );
+            if( pNewPgDsc )
+            {
+                pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
+                pNewPgDsc->SetLandscape( TRUE );
+            }
+       }
+       break;
+
     }
 
     if( aSet.Count() )
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 0b143e1c4f28..82bac90642a3 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoobj.cxx,v $
- * $Revision: 1.111 $
+ * $Revision: 1.111.80.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -764,7 +764,7 @@ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional)
     }
     if(!pRet)
     {
-        for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_ENDNOTE; ++i)
+        for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
         {
             const String aFmtName(SW_RES(i));
             if(aFmtName == rName)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 24b0e3edd0a8..e17fbebf893d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unostyle.cxx,v $
- * $Revision: 1.83 $
+ * $Revision: 1.83.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1732,7 +1732,7 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
         }
         if(!pOldPageDesc)
         {
-            for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_ENDNOTE; ++i)
+            for(i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
             {
                 const String aFmtName(SW_RES(i));
                 if(aFmtName == rStyleName)
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index b907f6cbba47..d2d07d81e368 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: break.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -207,7 +207,10 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
         if(LISTBOX_ENTRY_NOTFOUND == aPageCollBox.GetEntryPos( aFmtName =
                                     SwStyleNameMapper::GetUIName( i, aFmtName )))
             ::InsertStringSorted(aFmtName, aPageCollBox, 1 );
-
+    //add landscape page
+    if(LISTBOX_ENTRY_NOTFOUND == aPageCollBox.GetEntryPos( aFmtName =
+                                    SwStyleNameMapper::GetUIName( RES_POOLPAGE_LANDSCAPE, aFmtName )))
+            ::InsertStringSorted(aFmtName, aPageCollBox, 1 );
     CheckEnable();
     aPageNumEdit.SetText( aEmptyStr );
     FreeResource();
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 9e0e29991f18..194a8586a5dc 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fontcfg.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -329,7 +329,15 @@ void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight )
         sal_Int16   eWestern = aLinguOpt.nDefaultLanguage,
                     eCJK = aLinguOpt.nDefaultLanguage_CJK,
                     eCTL = aLinguOpt.nDefaultLanguage_CTL;
-        if( nHeight != GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL)))
+        // #i92090# default height value sets back to -1
+        const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
+        const bool bIsDefaultHeight = nHeight == nDefaultHeight;
+        if( bIsDefaultHeight && nDefaultFontHeight[nFontType] > 0 )
+        {
+            SetModified();
+            nDefaultFontHeight[nFontType] = -1;
+        }
+        else if( !bIsDefaultHeight && nHeight != nDefaultFontHeight[nFontType] )
         {
             SetModified();
             nDefaultFontHeight[nFontType] = nHeight;
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index d7bf5fdef6cf..1f39529337c9 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docfnote.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -268,7 +268,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
     }
 
         // Seite
-    for( i = RES_POOLPAGE_BEGIN; i <= RES_POOLPAGE_ENDNOTE; ++i )
+    for( i = RES_POOLPAGE_BEGIN; i <= RES_POOLPAGE_LANDSCAPE; ++i )
         aPageTemplBox.InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyStr ));
 
     USHORT nCount = pSh->GetPageDescCnt();
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 5e65ba718feb..ed462f7cac42 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: view.cxx,v $
- * $Revision: 1.112 $
+ * $Revision: 1.112.110.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1456,6 +1456,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                bViewLayoutBookMode = * (sal_Bool *) pValue->Value.getValue();
                bGotViewLayoutBookMode = sal_True;
             }
+            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsSelectedFrame" ) ) )
+            {
+               pValue->Value >>= bSelectedFrame;
+               bGotIsSelectedFrame = sal_True;
+            }
             pValue++;
         }
         if (bGotVisibleBottom)
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 2a3cac763af8..09ced94e2bb3 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unomailmerge.cxx,v $
- * $Revision: 1.26 $
+ * $Revision: 1.26.206.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -674,6 +674,8 @@ uno::Any SAL_CALL SwXMailMerge::execute(
                 Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY );
                 if (xRowSet.is())
                     xRowSet->execute(); // build ResultSet from properties
+                if( !xCurConnection.is() )
+                    xCurConnection.set( xRowSetPropSet->getPropertyValue( C2U( "ActiveConnection" )), UNO_QUERY );
                 xCurResultSet = Reference< sdbc::XResultSet >( xRowSet, UNO_QUERY );
                 DBG_ASSERT( xCurResultSet.is(), "failed to build ResultSet" );
             }
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
index 2971fc048110..bc634893df63 100644
--- a/sw/source/ui/utlui/poolfmt.src
+++ b/sw/source/ui/utlui/poolfmt.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: poolfmt.src,v $
- * $Revision: 1.50 $
+ * $Revision: 1.50.224.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,7 +34,6 @@
  // -----------------
 String STR_POOLCHR_FOOTNOTE
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Fu�notenzeichen : Fu�notenzeichen */
     Text [ en-US ] = "Footnote Characters" ;
 };
 String STR_POOLCHR_PAGENO
@@ -55,7 +54,6 @@ String STR_POOLCHR_NUM_LEVEL
 };
 String STR_POOLCHR_BUL_LEVEL
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlungszeichen : Aufz�hlungszeichen */
     Text [ en-US ] = "Bullets" ;
 };
 String STR_POOLCHR_INET_NORMAL
@@ -64,8 +62,6 @@ String STR_POOLCHR_INET_NORMAL
 };
 String STR_POOLCHR_INET_VISIT
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Besuchter Internet Link : besuchter Internet Link */
-    /* ### ACHTUNG: Neuer Text in Resource? Besuchter Internet Link : besuchter Internet Link */
     Text [ en-US ] = "Visited Internet Link" ;
 };
 String STR_POOLCHR_JUMPEDIT
@@ -80,6 +76,10 @@ String STR_POOLCHR_ENDNOTE
 {
     Text [ en-US ] = "Endnote Characters" ;
 };
+String STR_POOLPAGE_LANDSCAPE
+{
+   Text [ en-US ] = "Landscape" ;
+};
 String STR_POOLCHR_LINENUM
 {
     Text [ en-US ] = "Line numbering" ;
@@ -173,27 +173,22 @@ String STR_POOLCOLL_STANDARD
 };
 String STR_POOLCOLL_TEXT
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Textk�rper : Textk�rper */
     Text [ en-US ] = "Text body" ;
 };
 String STR_POOLCOLL_TEXT_IDENT
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Textk�rper Einzug : Textk�rper Einzug */
     Text [ en-US ] = "First line indent" ;
 };
 String STR_POOLCOLL_TEXT_NEGIDENT
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Textk�rper Einzug negativ : Textk�rper Einzug negativ */
     Text [ en-US ] = "Hanging indent" ;
 };
 String STR_POOLCOLL_TEXT_MOVE
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Textk�rper Einr�ckung : Textk�rper Einr�ckung */
     Text [ en-US ] = "Text body indent" ;
 };
 String STR_POOLCOLL_GREETING
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Gru�formel : Gru�formel */
     Text [ en-US ] = "Complimentary close" ;
 };
 String STR_POOLCOLL_SIGNATURE
@@ -202,7 +197,6 @@ String STR_POOLCOLL_SIGNATURE
 };
 String STR_POOLCOLL_HEADLINE_BASE
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift : �berschrift */
     Text [ en-US ] = "Heading" ;
 };
 String STR_POOLCOLL_NUMBUL_BASE
@@ -215,7 +209,6 @@ String STR_POOLCOLL_REGISTER_BASE
 };
 String STR_POOLCOLL_CONFRONTATION
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Gegen�berstellung : Gegen�berstellung */
     Text [ en-US ] = "List Indent" ;
 };
 String STR_POOLCOLL_MARGINAL
@@ -224,52 +217,42 @@ String STR_POOLCOLL_MARGINAL
 };
 String STR_POOLCOLL_HEADLINE1
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 1 : �berschrift 1 */
     Text [ en-US ] = "Heading 1" ;
 };
 String STR_POOLCOLL_HEADLINE2
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 2 : �berschrift 2 */
     Text [ en-US ] = "Heading 2" ;
 };
 String STR_POOLCOLL_HEADLINE3
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 3 : �berschrift 3 */
     Text [ en-US ] = "Heading 3" ;
 };
 String STR_POOLCOLL_HEADLINE4
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 4 : �berschrift 4 */
     Text [ en-US ] = "Heading 4" ;
 };
 String STR_POOLCOLL_HEADLINE5
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 5 : �berschrift 5 */
     Text [ en-US ] = "Heading 5" ;
 };
 String STR_POOLCOLL_HEADLINE6
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 5 : �berschrift 5 */
     Text [ en-US ] = "Heading 6" ;
 };
 String STR_POOLCOLL_HEADLINE7
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 7 : �berschrift 7 */
     Text [ en-US ] = "Heading 7" ;
 };
 String STR_POOLCOLL_HEADLINE8
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 8 : �berschrift 8 */
     Text [ en-US ] = "Heading 8" ;
 };
 String STR_POOLCOLL_HEADLINE9
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 9 : �berschrift 9 */
     Text [ en-US ] = "Heading 9" ;
 };
 String STR_POOLCOLL_HEADLINE10
 {
-    /* ### ACHTUNG: Neuer Text in Resource? �berschrift 10 : �berschrift 10 */
     Text [ en-US ] = "Heading 10" ;
 };
 String STR_POOLCOLL_NUM_LEVEL1S
@@ -354,102 +337,82 @@ String STR_POOLCOLL_NUM_NONUM5
 };
 String STR_POOLCOLL_BUL_LEVEL1S
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 Anfang : Aufz�hlung 1 Anfang */
     Text [ en-US ] = "List 1 Start" ;
 };
 String STR_POOLCOLL_BUL_LEVEL1
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 : Aufz�hlung 1 */
     Text [ en-US ] = "List 1" ;
 };
 String STR_POOLCOLL_BUL_LEVEL1E
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 Ende : Aufz�hlung 1 Ende */
     Text [ en-US ] = "List 1 End" ;
 };
 String STR_POOLCOLL_BUL_NONUM1
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 Fortsetzung : Aufz�hlung 1 Fortsetzung */
     Text [ en-US ] = "List 1 Cont." ;
 };
 String STR_POOLCOLL_BUL_LEVEL2S
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 2 Anfang : Aufz�hlung 2 Anfang */
     Text [ en-US ] = "List 2 Start" ;
 };
 String STR_POOLCOLL_BUL_LEVEL2
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 2 : Aufz�hlung 2 */
     Text [ en-US ] = "List 2" ;
 };
 String STR_POOLCOLL_BUL_LEVEL2E
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 2 Ende : Aufz�hlung 2 Ende */
     Text [ en-US ] = "List 2 End" ;
 };
 String STR_POOLCOLL_BUL_NONUM2
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 2 Fortsetzung : Aufz�hlung 2 Fortsetzung */
     Text [ en-US ] = "List 2 Cont." ;
 };
 String STR_POOLCOLL_BUL_LEVEL3S
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 3 Anfang : Aufz�hlung 3 Anfang */
     Text [ en-US ] = "List 3 Start" ;
 };
 String STR_POOLCOLL_BUL_LEVEL3
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 3 : Aufz�hlung 3 */
     Text [ en-US ] = "List 3" ;
 };
 String STR_POOLCOLL_BUL_LEVEL3E
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 3 Ende : Aufz�hlung 3 Ende */
     Text [ en-US ] = "List 3 End" ;
 };
 String STR_POOLCOLL_BUL_NONUM3
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 3 Fortsetzung : Aufz�hlung 3 Fortsetzung */
     Text [ en-US ] = "List 3 Cont." ;
 };
 String STR_POOLCOLL_BUL_LEVEL4S
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 4 Anfang : Aufz�hlung 4 Anfang */
     Text [ en-US ] = "List 4 Start" ;
 };
 String STR_POOLCOLL_BUL_LEVEL4
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 4 : Aufz�hlung 4 */
     Text [ en-US ] = "List 4" ;
 };
 String STR_POOLCOLL_BUL_LEVEL4E
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 4 Ende : Aufz�hlung 4 Ende */
     Text [ en-US ] = "List 4 End" ;
 };
 String STR_POOLCOLL_BUL_NONUM4
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 4 Fortsetzung : Aufz�hlung 4 Fortsetzung */
     Text [ en-US ] = "List 4 Cont." ;
 };
 String STR_POOLCOLL_BUL_LEVEL5S
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 5 Anfang : Aufz�hlung 5 Anfang */
     Text [ en-US ] = "List 5 Start" ;
 };
 String STR_POOLCOLL_BUL_LEVEL5
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 5 : Aufz�hlung 5 */
     Text [ en-US ] = "List 5" ;
 };
 String STR_POOLCOLL_BUL_LEVEL5E
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 5 Ende : Aufz�hlung 5 Ende */
     Text [ en-US ] = "List 5 End" ;
 };
 String STR_POOLCOLL_BUL_NONUM5
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 5 Fortsetzung : Aufz�hlung 5 Fortsetzung */
     Text [ en-US ] = "List 5 Cont." ;
 };
 String STR_POOLCOLL_HEADER
@@ -466,17 +429,14 @@ String STR_POOLCOLL_HEADERR
 };
 String STR_POOLCOLL_FOOTER
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Fu�zeile : Fu�zeile */
     Text [ en-US ] = "Footer" ;
 };
 String STR_POOLCOLL_FOOTERL
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Fu�zeile links : Fu�zeile links */
     Text [ en-US ] = "Footer left" ;
 };
 String STR_POOLCOLL_FOOTERR
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Fu�zeile rechts : Fu�zeile rechts */
     Text [ en-US ] = "Footer right" ;
 };
 String STR_POOLCOLL_TABLE
@@ -485,7 +445,6 @@ String STR_POOLCOLL_TABLE
 };
 String STR_POOLCOLL_TABLE_HDLN
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Tabellen �berschrift : Tabellen �berschrift */
     Text [ en-US ] = "Table Heading" ;
 };
 String STR_POOLCOLL_FRAME
@@ -494,7 +453,6 @@ String STR_POOLCOLL_FRAME
 };
 String STR_POOLCOLL_FOOTNOTE
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Fu�note : Fu�note */
     Text [ en-US ] = "Footnote" ;
 };
 String STR_POOLCOLL_ENDNOTE
@@ -523,7 +481,6 @@ String STR_POOLCOLL_LABEL_DRAWING
 };
 String STR_POOLCOLL_JAKETADRESS
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Empf�nger : Empf�nger */
     Text [ en-US ] = "Addressee" ;
 };
 String STR_POOLCOLL_SENDADRESS
@@ -532,7 +489,6 @@ String STR_POOLCOLL_SENDADRESS
 };
 String STR_POOLCOLL_TOX_IDXH
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Stichwortverzeichnis �berschrift : Stichwortverzeichnis �berschrift */
     Text [ en-US ] = "Index Heading" ;
 };
 String STR_POOLCOLL_TOX_IDX1
@@ -553,7 +509,6 @@ String STR_POOLCOLL_TOX_IDXBREAK
 };
 String STR_POOLCOLL_TOX_CNTNTH
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Inhaltsverzeichnis �berschrift : Inhaltsverzeichnis �berschrift */
     Text [ en-US ] = "Contents Heading" ;
 };
 String STR_POOLCOLL_TOX_CNTNT1
@@ -598,7 +553,6 @@ String STR_POOLCOLL_TOX_CNTNT10
 };
 String STR_POOLCOLL_TOX_USERH
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Benutzerverzeichnis �berschrift : Benutzerverzeichnis �berschrift */
     Text [ en-US ] = "User Index Heading" ;
 };
 String STR_POOLCOLL_TOX_USER1
@@ -764,27 +718,22 @@ String STR_POOLNUMRULE_NUM5
 };
 String STR_POOLNUMRULE_BUL1
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 : Aufz�hlung 1 */
     Text [ en-US ] = "List 1" ;
 };
 String STR_POOLNUMRULE_BUL2
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 : Aufz�hlung 1 */
     Text [ en-US ] = "List 2" ;
 };
 String STR_POOLNUMRULE_BUL3
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 : Aufz�hlung 1 */
     Text [ en-US ] = "List 3" ;
 };
 String STR_POOLNUMRULE_BUL4
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 1 : Aufz�hlung 4 */
     Text [ en-US ] = "List 4" ;
 };
 String STR_POOLNUMRULE_BUL5
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Aufz�hlung 5 : Aufz�hlung 5 */
     Text [ en-US ] = "List 5" ;
 };