[PATCH] Clean out dead code and comments from ui/app

Phil Bordelon phil at thenexusproject.org
Fri Oct 1 09:23:48 PDT 2010


This patch removes a bunch of commented-out code and content-free
comments from Writer's ui/app code.

Signed-off-by: Phil Bordelon <phil at thenexusproject.org>
---
 sw/source/ui/app/app.src      |   16 +------
 sw/source/ui/app/appenv.cxx   |    3 -
 sw/source/ui/app/apphdl.cxx   |   26 -----------
 sw/source/ui/app/appopt.cxx   |   43 +++---------------
 sw/source/ui/app/docsh.cxx    |   85 ----------------------------------
 sw/source/ui/app/docsh2.cxx   |  100 ++---------------------------------------
 sw/source/ui/app/docshini.cxx |   41 -----------------
 sw/source/ui/app/docst.cxx    |   35 +--------------
 sw/source/ui/app/docstyle.cxx |   54 ++--------------------
 sw/source/ui/app/error.src    |   10 ----
 sw/source/ui/app/mn.src       |   43 -----------------
 sw/source/ui/app/swmodul1.cxx |   34 --------------
 sw/source/ui/app/swmodule.cxx |   10 +----
 13 files changed, 19 insertions(+), 481 deletions(-)

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4794e78..deaab16 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -470,10 +470,9 @@ String STR_FDLG_TEMPLATE_BUTTON
 
 String STR_FDLG_TEMPLATE_NAME
 {
-    //Text [ en-US ] = "Styles: " ;			//#outline level,removed by zhaojianwei
-    Text [ en-US ] = "separated by: " ;	//<-end,add by zhaojianwei
+    Text [ en-US ] = "separated by: " ;
 };
-//#outline level,add by zhaojianwei
+
 String STR_FDLG_OUTLINE_LEVEL
 {
     Text [ en-US ] = "Outline: Level ";
@@ -483,8 +482,6 @@ String STR_FDLG_STYLE
 {
     Text [ en-US ] = "Style: "; 
 };
-//<-end
-
 
 String STR_PAGEOFFSET
 {
@@ -513,14 +510,6 @@ WarningBox MSG_DISABLE_UNDO_QUESTION
     DEFBUTTON = WB_DEF_YES ;
     Message [ en-US ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?";
 };
-/*QueryBox MSG_INS_MERGE_FIELDS
-{
-    HelpId = HID_MAIL_MERGE_INSERT_FIELDS;
-    Buttons = WB_OK_CANCEL ;
-    DefButton = WB_DEF_YES ;
-    Message [ en-US ] = "Do you want to use names and addresses from a database?";
-};
-*/
 QueryBox MSG_PRINT_AS_MERGE
 {
     HelpId = HID_PRINT_AS_MERGE;
@@ -575,7 +564,6 @@ String  STR_DONT_ASK_AGAIN
 {
     Text [ en-US ] = "~Do not show warning again" ;
 };
-// --> OD 2008-04-14 #outlinelevel#
 String STR_OUTLINE_NUMBERING
 {
     Text [ en-US ] = "Outline Numbering";
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 3896cbb..6482238 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -119,7 +119,6 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
             {
                 sTmpText = aLine.Copy( 0, nPos );
                 aLine.Erase( 0, nPos );
-//				sTmpText = aLine.Cut( 0, nPos );
             }
             else
             {
@@ -128,13 +127,11 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
                 {
                     sTmpText = aLine;
                     aLine.Erase();
-//					sTmpText = aLine.Cut();
                 }
                 else
                 {
                     sTmpText = aLine.Copy( 0, nPos + 1);
                     aLine.Erase( 0, nPos + 1);
-//					sTmpText = aLine.Cut( 0, nPos + 1 );
 
                     // Datenbankfelder muesen mind. 3 Punkte beinhalten!
                     String sDBName( sTmpText.Copy( 1, sTmpText.Len() - 2));
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index f61b643..acc4026 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -215,9 +215,6 @@ void SwModule::StateOther(SfxItemSet &rSet)
     }
 }
 
-/*-- 06.04.2004 15:21:43---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwView* lcl_LoadDoc(SwView* pView, const String& rURL)
 {
     SwView* pNewView = 0;
@@ -701,14 +698,6 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
             SwWrtShell* pWrtSh = pDocSh ? pDocSh->GetWrtShell() : 0;
             switch( rEvHint.GetEventId() )
             {
-/*          MA 07. Mar. 96: UpdateInputFlds() nur noch bei Dokument neu.
-                                (Und bei Einfuegen Textbaust.)
-                case SFX_EVENT_OPENDOC:
-                // dann am aktuellen Dokument die Input-Fedler updaten
-                if( pWrtSh )
-                    pWrtSh->UpdateInputFlds();
-                break;
-*/
             case SFX_EVENT_CREATEDOC:
                 // alle FIX-Date/Time Felder auf akt. setzen
                 if( pWrtSh )
@@ -872,18 +861,13 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
 
 }
 
-/* -----------------------------20.02.01 12:43--------------------------------
-
- ---------------------------------------------------------------------------*/
 SwDBConfig*	SwModule::GetDBConfig()
 {
     if(!pDBConfig)
         pDBConfig = new SwDBConfig;
     return pDBConfig;
 }
-/* -----------------------------11.04.2002 15:27------------------------------
 
- ---------------------------------------------------------------------------*/
 svtools::ColorConfig& SwModule::GetColorConfig()
 {
     if(!pColorConfig)
@@ -894,9 +878,7 @@ svtools::ColorConfig& SwModule::GetColorConfig()
     }
     return *pColorConfig;
 }
-/* -----------------------------06.05.2002 09:42------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtAccessibilityOptions& SwModule::GetAccessibilityOptions()
 {
     if(!pAccessibilityOptions)
@@ -906,9 +888,7 @@ SvtAccessibilityOptions& SwModule::GetAccessibilityOptions()
     }
     return *pAccessibilityOptions;
 }
-/* -----------------06.05.2003 14:52-----------------
 
- --------------------------------------------------*/
 SvtCTLOptions& SwModule::GetCTLOptions()
 {
     if(!pCTLOptions)
@@ -918,9 +898,7 @@ SvtCTLOptions& SwModule::GetCTLOptions()
     }
     return *pCTLOptions;
 }
-/* -----------------07.07.2003 09:31-----------------
 
- --------------------------------------------------*/
 SvtUserOptions& SwModule::GetUserOptions()
 {
     if(!pUserOptions)
@@ -930,9 +908,7 @@ SvtUserOptions& SwModule::GetUserOptions()
     }
     return *pUserOptions;
 }
-/* -----------------18.07.2003 13:31-----------------
 
- --------------------------------------------------*/
 SvtUndoOptions& SwModule::GetUndoOptions()
 {
     if(!pUndoOptions)
@@ -942,9 +918,7 @@ SvtUndoOptions& SwModule::GetUndoOptions()
     }
     return *pUndoOptions;
 }
-/*-----------------30.01.97 08.30-------------------
 
---------------------------------------------------*/
 const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const
 {
     SwModule* pNonConstModule = (SwModule*)this;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 9f3008c..25c62db 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -100,10 +100,6 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-/* -----------------12.02.99 12:28-------------------
- *
- * --------------------------------------------------*/
-
 SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
 {
     BOOL bTextDialog = (nId == SID_SW_EDITOPTIONS) ? TRUE : FALSE;
@@ -182,15 +178,6 @@ SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
     }
     else
     {
-/* 		Der Drucker wird jetzt von der TabPage erzeugt und auch geloescht
- * 		SfxItemSet* pSet = new SfxItemSet( SFX_APP()->GetPool(),
-                    SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
-                    SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
-                    0 );
-
-        pPrt = new SfxPrinter(pSet);
-        pRet->Put(SwPtrItem(FN_PARAM_PRINTER, pPrt));*/
-
         SvtLinguConfig aLinguCfg;
         Locale aLocale;
         LanguageType nLang;
@@ -244,10 +231,7 @@ SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
             pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, (UINT16)pPref->GetDefTab()));
     }
 
-    /*-----------------01.02.97 11.13-------------------
-    Optionen fuer GridTabPage
-    --------------------------------------------------*/
-
+    // Options for GridTabPage
     SvxGridItem aGridItem( SID_ATTR_GRID_OPTIONS);
 
     aGridItem.SetUseGridSnap( aViewOpt.IsSnap());
@@ -263,9 +247,7 @@ SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
 
     pRet->Put(aGridItem);
 
-    /*-----------------01.02.97 13.02-------------------
-        Optionen fuer PrintTabPage
-    --------------------------------------------------*/
+    // Options for PrintTabPage
     SwPrintData* pOpt = pAppView ?
                         pAppView->GetWrtShell().getIDocumentDeviceAccess()->getPrintData() :
                         0;
@@ -276,18 +258,14 @@ SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
     SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, *pOpt );
     pRet->Put(aAddPrinterItem);
 
-    /*-----------------01.02.97 13.12-------------------
-        Optionen fuer Web-Hintergrund
-    --------------------------------------------------*/
+    // Options for Web background
     if(!bTextDialog)
     {
         pRet->Put(SvxBrushItem(aViewOpt.GetRetoucheColor(), RES_BACKGROUND));
     }
 
 #ifdef DBG_UTIL
-    /*-----------------01.02.97 13.02-------------------
-        Test-Optionen
-    --------------------------------------------------*/
+        // Test options
         SwTestItem aTestItem(FN_PARAM_SWTEST);
         aTestItem.bTest1 = aViewOpt.IsTest1();
         aTestItem.bTest2 = aViewOpt.IsTest2();
@@ -301,17 +279,12 @@ SfxItemSet*	 SwModule::CreateItemSet( USHORT nId )
         aTestItem.bTest10 = aViewOpt.IsTest10();
         pRet->Put(aTestItem);
 #endif
-    /*-----------------01.02.97 13.04-------------------
 
-    --------------------------------------------------*/
     if(!bTextDialog)
         pRet->Put(SfxUInt16Item(SID_HTML_MODE, HTMLMODE_ON));
-//	delete pPrt;
     return pRet;
 }
-/* -----------------12.02.99 12:28-------------------
- *
- * --------------------------------------------------*/
+
 void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
 {
     BOOL bTextDialog = nId == SID_SW_EDITOPTIONS;
@@ -323,7 +296,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
         // the text dialog mustn't apply data to the web view and vice versa
         BOOL bWebView = 0 != PTR_CAST(SwWebView, pAppView);
         if( (bWebView == bTextDialog))
-            pAppView = 0; //
+            pAppView = 0;
     }
 
     SwViewOption aViewOpt = *GetUsrPref(!bTextDialog);
@@ -524,9 +497,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     ApplyUsrPref( aViewOpt, pAppView,
                  bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB);
 }
-/* -----------------12.02.99 12:28-------------------
- *
- * --------------------------------------------------*/
+
 SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
 {
     SfxTabPage* pRet = NULL;
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index a5a8bad..6b0380b 100755
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -211,7 +211,6 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
     }
     if(rMedium.IsStorage())
     {
-        //SvStorageRef aStor( rMedium.GetStorage() );
         const SfxItemSet* pSet = rMedium.GetItemSet();
         const SfxPoolItem *pItem;
         if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, TRUE, &pItem))
@@ -223,8 +222,6 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
         // eigene Filter ist.
         ASSERT( /*pRead != ReadSw3 || */pRead != ReadXML || pFlt->GetVersion(),
                 "Am Filter ist keine FF-Version gesetzt" );
-        //if( (pRead == ReadSw3 || pRead == ReadXML) && pFlt->GetVersion() )
-        //    aStor->SetVersion( (long)pFlt->GetVersion() );
     }
     // #i30171# set the UpdateDocMode at the SwDocShell
     SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
@@ -300,16 +297,10 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
     SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
     BOOL bOk = !IsError( nErr );
 
-    // --> OD 2006-11-07 #i59688#
-//    // StartFinishedLoading rufen. Nicht bei asynchronen Filtern!
-//    // Diese muessen das selbst rufen!
-//    if( bOk && !pDoc->IsInLoadAsynchron() )
-//        StartLoadFinishedTimer();
     if ( bOk && !pDoc->IsInLoadAsynchron() )
     {
         LoadingFinished();
     }
-    // <--
 
     pRead->setSotStorageRef(pStg); // #i45333# save sot storage ref in case of recursive calls
 
@@ -330,7 +321,6 @@ BOOL SwDocShell::Save()
     SwWait aWait( *this, TRUE );
 
     CalcLayoutForOLEObjects();	// format for OLE objets
-    // --> OD 2006-03-17 #i62875#
     // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
     if ( pWrtShell && pDoc &&
          pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
@@ -338,7 +328,6 @@ BOOL SwDocShell::Save()
     {
         pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
     }
-    // <--
 
     ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
     if( SfxObjectShell::Save() )
@@ -371,9 +360,6 @@ BOOL SwDocShell::Save()
             {
                 if( pDoc->ContainsMSVBasic() )
                 {
-                    //TODO/MBA: it looks as that this code can be removed!
-                    //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
-                    //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
                     if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
                         nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) (*this) );
                     pDoc->SetContainsMSVBasic( FALSE );
@@ -461,7 +447,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
     }
 
     CalcLayoutForOLEObjects();	// format for OLE objets
-    // --> OD 2006-03-17 #i62875#
     // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
     if ( pWrtShell && pDoc &&
          pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
@@ -469,7 +454,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
     {
         pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
     }
-    // <--
 
     ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
     uno::Reference < embed::XStorage > xStor = rMedium.GetOutputStorage();
@@ -493,9 +477,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
 
         if( pDoc->ContainsMSVBasic() )
         {
-            //TODO/MBA: it looks as that this code can be removed!
-            //SvxImportMSVBasic aTmp( *this, pIo->GetStorage() );
-            //aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr );
             if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
                 nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) *this );
             pDoc->SetContainsMSVBasic( FALSE );
@@ -641,7 +622,6 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
     pDoc->UpdateDocStat( aDocStat );
     // <--
     CalcLayoutForOLEObjects();	// format for OLE objets
-    // --> OD 2006-03-17 #i62875#
     // reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
     if ( pWrtShell && pDoc &&
          pDoc->get(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) &&
@@ -649,7 +629,6 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
     {
         pDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
     }
-    // <--
 
     if( xWriter->IsStgWriter() &&
         ( /*xWriter->IsSw3Writer() ||*/
@@ -770,10 +749,8 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
     if ( pWrtShell )
     {
         SwWait aWait( *this, TRUE );
-        // --> OD 2009-12-31 #i106906#
         const sal_Bool bFormerLockView = pWrtShell->IsViewLocked();
         pWrtShell->LockView( sal_True );
-        // <--
         pWrtShell->StartAllAction();
         pWrtShell->Push();
         SwWriter aWrt( rMedium, *pWrtShell, TRUE );
@@ -784,9 +761,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
         {
             pWrtShell->Pop(FALSE);
             pWrtShell->EndAllAction();
-            // --> OD 2009-12-31 #i106906#
             pWrtShell->LockView( bFormerLockView );
-            // <--
         }
     }
     else
@@ -849,10 +824,6 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
             {
                 DBG_ERROR( "Copying of objects didn't work!" );
             }
-
-            //SvPersist* pPersist = this;
-            //SvInfoObjectRef aRef( pInfList->GetObject( --n ));
-            //pPersist->Move( &aRef, aRef->GetStorageName() );
         }
 
         DELETEZ( pOLEChildList );
@@ -944,32 +915,6 @@ Rectangle SwDocShell::GetVisArea( USHORT nAspect ) const
 
         const SwRect aPageRect = pNd->FindPageFrmRect( FALSE, 0, FALSE );
         return aPageRect.SVRect();
-
-        // Why does this have to be that complicated? I replaced this by the
-        // call of FindPageFrmRect():
-        /*
-        //PageDesc besorgen, vom ersten Absatz oder den default.
-        const SwFmtPageDesc &rDesc = pNd->GetSwAttrSet().GetPageDesc();
-        const SwPageDesc* pDesc = rDesc.GetPageDesc();
-        if( !pDesc )
-            pDesc = &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 );
-
-        //Das Format wird evtl. von der virtuellen Seitennummer bestimmt.
-        const USHORT nPgNum = rDesc.GetNumOffset();
-        const BOOL bOdd = nPgNum % 2 ? TRUE : FALSE;
-        const SwFrmFmt *pFmt = bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt();
-        if ( !pFmt ) //#40568#
-            pFmt = bOdd ? pDesc->GetLeftFmt() : pDesc->GetRightFmt();
-
-        if ( pFmt->GetFrmSize().GetWidth() == LONG_MAX )
-            //Jetzt wird es aber Zeit fuer die Initialisierung
-            pDoc->getPrinter( true );
-
-        const SwFmtFrmSize& rFrmSz = pFmt->GetFrmSize();
-        const Size aSz( rFrmSz.GetWidth(), rFrmSz.GetHeight() );
-        const Point aPt( DOCUMENTBORDER, DOCUMENTBORDER );
-        const Rectangle aRect( aPt, aSz );
-        return aRect;*/
     }
     return SfxObjectShell::GetVisArea( nAspect );
 }
@@ -1048,16 +993,6 @@ void SwDocShell::GetState(SfxItemSet& rSet)
     {
         switch (nWhich)
         {
-        // MT: MakroChosser immer enablen, weil Neu moeglich
-        // case SID_BASICCHOOSER:
-        // {
-        // 	StarBASIC* pBasic = GetBasic();
-        // 	StarBASIC* pAppBasic = SFX_APP()->GetBasic();
-        // 	if ( !(pBasic->GetModules()->Count() ||
-        // 		pAppBasic->GetModules()->Count()) )
-        // 			rSet.DisableItem(nWhich);
-        // }
-        // break;
         case SID_PRINTPREVIEW:
         {
             BOOL bDisable = IsInPlaceActive();
@@ -1210,23 +1145,8 @@ void SwDocShell::LoadingFinished()
     // Thus, manuell modify the document, if its modified and its links are updated
     // before <FinishedLoading(..)> is called.
     const bool bHasDocToStayModified( pDoc->IsModified() && pDoc->LinksUpdated() );
-//    // --> OD 2005-02-11 #i38810# - disable method <SetModified(..)>, if document
-//    // has stay in modified state, due to the update of its links during load.
-//    bool bResetEnableSetModified(false);
-//    if ( IsEnableSetModified() &&
-//         pDoc->IsModified() && pDoc->LinksUpdated() )
-//    {
-//        EnableSetModified( FALSE );
-//        bResetEnableSetModified = true;
-//    }
     // <--
     FinishedLoading( SFX_LOADED_ALL );
-//    // --> OD 2005-02-11 #i38810#
-//    if ( bResetEnableSetModified )
-//    {
-//        EnableSetModified( TRUE );
-//    }
-//    // <--
     SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
     if(pVFrame)
     {
@@ -1235,12 +1155,10 @@ void SwDocShell::LoadingFinished()
             ((SwSrcView*)pShell)->Load(this);
     }
 
-    // --> OD 2007-10-08 #i38810#
     if ( bHasDocToStayModified && !pDoc->IsModified() )
     {
         pDoc->SetModified();
     }
-    // <--
 }
 
 // eine Uebertragung wird abgebrochen (wird aus dem SFX gerufen)
@@ -1326,9 +1244,6 @@ uno::Reference< frame::XController >
     return aRet;
 }
 
-/* -----------------------------12.02.01 12:08--------------------------------
-
- ---------------------------------------------------------------------------*/
 static const char* pEventNames[] =
 {
     "OnPageCountChange",
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 30fa699..f3b01a9 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -219,8 +219,6 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if( !pDoc )
     {
-//MA: Kommt bei der OLE-Registration vor!
-//		ASSERT( !this, "DocShell ist nicht richtig initialisiert!" );
         return ;
     }
 
@@ -274,16 +272,12 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                 const bool bResetModified = IsEnableSetModified();
                 if ( bResetModified )
                     EnableSetModified( FALSE );
-                // --> OD 2005-02-01 #i41679#
                 const bool bIsDocModified = pDoc->IsModified();
-                // <--
 
                 pDoc->DocInfoChgd( );
 
-                // --> OD 2005-02-01 #i41679#
                 if ( !bIsDocModified )
                     pDoc->ResetModified();
-                // <--
                 if ( bResetModified )
                     EnableSetModified( TRUE );
             }
@@ -458,12 +452,6 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
             rIdx1 = rIdx2 = INDEX_IGNORE;
         }
 
-/*		  pMyPool->Count(); 	  //interne Liste neu fuellen lassen!!!!!
-
-        // suchen, um die richige Insert-Position returnen zu koennen
-        pMyPool->Find( rOldName, SFX_STYLE_FAMILY_ALL, nMySrchMask );
-        rIdx2 = pMyPool->GetFindPos();*/
-
         // wer bekommt den Neuen als Parent? wer benutzt den Neuen als Follow?
         // (immer nur ueber die Instanziierten!!!)
         pMyPool->SetSearchMask( eOldFamily, nMySrchMask );
@@ -656,8 +644,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
             // SMARTTAGS
             pAFlags->pSmartTagMgr = &SwSmartTagMgr::Get();
 
-            //pApp->ExecuteSlot(aAppReq);
-
             SfxItemSet aSet( pApp->GetPool(), SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG, SID_OPEN_SMARTTAGOPTIONS, SID_OPEN_SMARTTAGOPTIONS, 0 );
             aSet.Put( aSwOptions );
 
@@ -961,24 +947,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         nSlot = SID_VIEWSHELL0;
                     }
                 }
-/*	 OS 10.04.97 14.20: Im Web-Writer gibt es keinen Unterschied zwischen
-                        Export in den SourceMode und dem Speichern des Docs
-                else if(IsModified())
-                {
-                    USHORT nRet = QueryBox( SFX_APPWINDOW ,SW_RES(MSG_SAVE_HTML_QUERY)).Execute();
-                    if(RET_YES == nRet)
-                    {
-                        S F X _DISPATCHER().Execute(SID_SAVEDOC,
-                                    SFX_CALLMODE_SYNCHRON);
-                        // der ReturnValue von SID_SAVEDOC ist etwas schwer verstaendlich
-                        if(IsModified())
-                            nSlot = 0;
-                    }
-                    else if( RET_CANCEL == nRet )
-                    {
-                        nSlot = 0;
-                    }
-                }*/
                 if(nSlot)
                     pViewFrm->GetDispatcher()->Execute(nSlot, SFX_CALLMODE_SYNCHRON);
                 if(bSetModified)
@@ -1260,7 +1228,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     nHelpIds[7] = 0;
 
                     aDlgHelper.SetControlHelpIds( nControlIds, nHelpIds );
-//                    aDlgHelper.SetDialogHelpId( bCreateHtml ? HID_SEND_HTML_DIALOG : HID_SEND_MASTER_DIALOG );
 
                     uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
 
@@ -1302,44 +1269,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     {
                         uno::Reference<XFilePickerControlAccess> xCtrlAcc(xFP, UNO_QUERY);
 
-                //#removed by zhaojianwei
-
-        //             const USHORT nCount = pDoc->GetTxtFmtColls()->Count();
-        //                Sequence<OUString> aListBoxEntries(nCount);
-        //                OUString* pEntries = aListBoxEntries.getArray();
-        //                sal_Int32 nIdx = 0;
-        //                sal_Int16 nSelect = 0;
-        //                OUString sStartTemplate;
-        //                SwTxtFmtColl *pFnd = 0, *pAny = 0;
-        //                for(USHORT i = 0; i < nCount; ++i)
-        //                {
-        //                    SwTxtFmtColl &rTxtColl =
-        //                                    *pDoc->GetTxtFmtColls()->GetObject( i );
-        //                    if( !rTxtColl.IsDefault() && rTxtColl.IsAtDocNodeSet() )
-        //                    {
-        //                        //if( MAXLEVEL >= rTxtColl.GetOutlineLevel() && ( !pFnd ||			//#outline level,zhaojianwei
-                                //if(  rTxtColl.IsAssignedToListLevelOfOutlineStyle()  && ( !pFnd ||	//<-end,zhaojianwei
-        //                            pFnd->GetAssignedOutlineStyleLevel() > rTxtColl.GetAssignedOutlineStyleLevel() ))
-        //                        {
-        //                                nSelect = (sal_Int16)nIdx;
-        //                                pFnd = &rTxtColl;
-        //                                sStartTemplate = rTxtColl.GetName();
-        //                        }
-        //                        else if( !pAny )
-        //                            pAny = &rTxtColl;
-        //                        //pEntries[nIdx++] = rTxtColl.GetName();			//#outline level,remove by zhaojianwei
-        //                        pEntries[nIdx++] = sStyles + rTxtColl.GetName();	//#outline level,add by zhaojianwei
-        //                    }
-        //                }
-        //                if(!sStartTemplate.getLength() && pAny)
-        //                    sStartTemplate = pAny->GetName();
-        //                aListBoxEntries.realloc(nIdx);
-                //<-end,zhaojianwei
-
-
-                    //#outline level,add by zhaojianwei
-                    /////////////////////////////////////////////////////////////////////
-
                         bool	bOutline[MAXLEVEL] = {false};
                         const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
                         if( rOutlNds.Count() )
@@ -1378,8 +1307,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
                         aListBoxEntries.realloc(nIdx);
                         sal_Int16 nSelect = 0;
-                     /////////////////////////////////////////////////////////////////////
-                    //<-end,zhaojianwei
 
                         try
                         {
@@ -1409,8 +1336,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                 ListboxControlActions::GET_SELECTED_ITEM );
                             OUString sTmpl;
                             aTemplateValue >>= sTmpl;
-                            //aTemplateName = sTmpl;	//#outline level,removed by zhaojianwei
-                            //#outline level,add by zhaojianwei
 
                             sal_Int32 nColonPos = sTmpl.indexOf( sal_Unicode(':') );
                             OUString sPrefix = sTmpl.copy( 0L, nColonPos );
@@ -1423,7 +1348,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                 nTemplateOutlineLevel =	( sTmpl.copy( 15L )).toInt32();	//get string behind "Outline: Leve  ";
                                 bCreateByOutlineLevel = true;
                             }
-                            //<-end,zhaojianwei
 
                             if ( aFileName.Len() )
                             {
@@ -1435,22 +1359,15 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     }
                 }
 
-                //const SwTxtFmtColl* pSplitColl = 0;		//#outline level,removed by zhaojianwei
-    //            if ( aTemplateName.Len() )
-    //                pSplitColl = pDoc->FindTxtFmtCollByName(aTemplateName);
-                                                            //<-end,zhaojianwei
                 if( aFileName.Len() )
                 {
                     if( PrepareClose( FALSE ) )
                     {
                         SwWait aWait( *this, TRUE );
 
-                        //bDone = bCreateHtml			//#outline level,removed by zhaojianwei
-                        //	? pDoc->GenerateHTMLDoc( aFileName, pSplitColl )
-                        //	: pDoc->GenerateGlobalDoc( aFileName, pSplitColl );
-                        if ( bCreateByOutlineLevel )	//add by zhaojianwei
+                        if ( bCreateByOutlineLevel )
                         {
-                            bDone = bCreateHtml			//#outline level,removed by zhaojianwei
+                            bDone = bCreateHtml
                                 ? pDoc->GenerateHTMLDoc( aFileName, nTemplateOutlineLevel )
                                 : pDoc->GenerateGlobalDoc( aFileName, nTemplateOutlineLevel );
                         }
@@ -1459,11 +1376,10 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             const SwTxtFmtColl* pSplitColl = 0;
                             if ( aTemplateName.Len() )
                                 pSplitColl = pDoc->FindTxtFmtCollByName(aTemplateName);
-                            bDone = bCreateHtml			//#outline level,removed by zhaojianwei
+                            bDone = bCreateHtml
                                 ? pDoc->GenerateHTMLDoc( aFileName, pSplitColl )
                                 : pDoc->GenerateGlobalDoc( aFileName, pSplitColl );
                         }
-                        //<-end,zhaojianwei
                         if( bDone )
                         {
                             SfxStringItem aName( SID_FILE_NAME, aFileName );
@@ -1647,7 +1563,6 @@ void SwDocShell::UpdateChildWindows()
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
-// --> OD 2005-08-02 #i48748#
 class SwReloadFromHtmlReader : public SwReader
 {
     public:
@@ -1659,7 +1574,7 @@ class SwReloadFromHtmlReader : public SwReader
             SetBaseURL( _rFilename );
         }
 };
-// <--
+
 void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView )
 {
     BOOL bModified = IsModified();
@@ -1766,9 +1681,6 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
         pDoc->ResetModified();
 }
 
-/* -----------------------------14.12.99 16:52--------------------------------
-
- ---------------------------------------------------------------------------*/
 void    SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView )
 {
     GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet );
@@ -1851,7 +1763,6 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL,
     SwPaM* pPam = 0;
 
     // Filter bestimmen:
-//  const SfxFilter* pFlt = SwIoSystem::GetFileFilter( rURL, aEmptyStr );
     String sFactory(String::CreateFromAscii(SwDocShell::Factory().GetShortName()));
     SfxFilterMatcher aMatcher( sFactory );
 
@@ -1882,9 +1793,6 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL,
     }
     else if( pFlt )
     {
-//      if( pFlt->GetUserData().EqualsAscii( FILTER_SWG ) ||
-//          pFlt->GetUserData().EqualsAscii( FILTER_SWGV ))
-//          pRead = ReadSwg;
         pReader = new SwReader( aMed, rURL, pDoc );
     }
 
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 4b0e357..8be7009 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -91,7 +91,6 @@
 #include <swerror.h>
 #include <globals.hrc>
 
-// #i18732#
 #include <fmtfollowtextflow.hxx>
 
 #include <unochart.hxx>
@@ -105,9 +104,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-/*-----------------21.09.96 15.29-------------------
-
---------------------------------------------------*/
 
 
 /*--------------------------------------------------------------------
@@ -133,13 +129,6 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);		// Globaldokument
 
 
-/*
-        //JP 12.07.95: so einfach waere es fuer die neu Mimik
-        pDoc->SetDefault( SvxTabStopItem( 1,
-                    GetStar Writer App()->GetUsrPref()->GetDefTabDist(),
-                    SVX_TAB_ADJUST_DEFAULT,
-                    RES_PARATR_TABSTOP));
-*/
         if ( GetCreateMode() ==  SFX_CREATE_MODE_EMBEDDED )
             SwTransferable::InitOle( this, *pDoc );
 
@@ -458,9 +447,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
 
     delete pOLEChildList;
 }
-/* -----------------------------10.09.2001 15:59------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SwDocShell::Init_Impl()
 {
     SetPool(&SW_MOD()->GetPool());
@@ -591,9 +578,6 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
         sal_uInt32 nErr = ERR_SWG_READ_ERROR;
         switch( GetCreateMode() )
         {
-//		case SFX_CREATE_MODE_INTERNAL:
-//			nErr = 0;
-//			break;
 
         case SFX_CREATE_MODE_ORGANIZER:
             {
@@ -662,17 +646,11 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
         SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
         bRet = !IsError( nErr );
 
-        // --> OD 2006-11-07 #i59688#
-//        // StartFinishedLoading rufen.
-//        if( bRet && !pDoc->IsInLoadAsynchron() &&
-//            GetCreateMode() == SFX_CREATE_MODE_STANDARD )
-//            StartLoadFinishedTimer();
         if ( bRet && !pDoc->IsInLoadAsynchron() &&
              GetCreateMode() == SFX_CREATE_MODE_STANDARD )
         {
             LoadingFinished();
         }
-        // <--
 
         // SfxProgress unterdruecken, wenn man Embedded ist
         SW_MOD()->SetEmbeddedLoadSave( sal_False );
@@ -697,7 +675,6 @@ sal_Bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
 
     do {		// middle check loop
         sal_uInt32 nErr = ERR_SWG_READ_ERROR;
-        //const String& rNm = pStor->GetName();
         String aStreamName;
         aStreamName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("styles.xml"));
         uno::Reference < container::XNameAccess > xAccess( rMedium.GetStorage(), uno::UNO_QUERY );
@@ -720,24 +697,6 @@ sal_Bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
         else
         {
             DBG_ERROR("Code removed!");
-        /*
-        //TODO/LATER: looks like some binary stuff?!
-            // sollte es sich um eine 2. Vrolage handeln ??
-            if( SvStorage::IsStorageFile( rNm ) )
-                break;
-
-            const SfxFilter* pFltr = SwIoSystem::GetFileFilter( rNm, aEmptyStr );
-            if( !pFltr || !pFltr->GetUserData().EqualsAscii( FILTER_SWG ))
-                break;
-
-            SfxMedium aMed( rNm, STREAM_STD_READ, FALSE );
-            if( 0 == ( nErr = aMed.GetInStream()->GetError() ) )
-            {
-                SwWait aWait( *this, sal_True );
-                SwReader aRead( aMed, rNm, pDoc );
-                nErr = aRead.Read( *ReadSwg );
-            }
-         */
         }
 
         SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 487d83b..0849b42 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -79,9 +79,8 @@
 #include "app.hrc"
 #include <fmtui.hrc>
 #include "swabstdlg.hxx"
-// --> OD 2008-03-27 #refactorlists#
+
 #include <list.hxx>
-// <--
 
 #include <paratr.hxx>	//#outline level,add by zhaojianwei
 
@@ -635,18 +634,6 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
         xTmp->MergeIndentAttrsOfListStyle( rSet );
         // <--
     }
-/*	else if( SFX_STYLE_FAMILY_FRAME == nFamily )
-    {
-        // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-        SfxItemSet& rSet = aTmp.GetItemSet();
-        if( SFX_ITEM_SET != rSet.GetItemState( RES_FRM_SIZE ))
-        {
-            // dann sollten wir spaetesten hier eines anlegen
-            SwFrmValid aFrmDefValues;
-            rSet.Put( SwFmtFrmSize( ATT_VAR_SIZE, aFrmDefValues.nWidth,
-                                    aFrmDefValues.nHeight ));
-        }
-    }*/
     else if( SFX_STYLE_FAMILY_CHAR == nFamily )
     {
         SfxItemSet& rSet = xTmp->GetItemSet();
@@ -759,8 +746,6 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
         {
             if( bNew )
             {
-                // #116530#
-                //pBasePool->Erase( &aTmp );
                 GetWrtShell()->Undo(UNDO_EMPTY, 1);
                 pDoc->ClearRedo();
             }
@@ -1052,10 +1037,8 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
                 0 != ( pCurRule = pCurrWrtShell->GetCurNumRule() ))
             {
                 SwNumRule aRule( *pCurRule );
-                // --> OD 2008-07-08 #i91400#
                 aRule.SetName( pStyle->GetNumRule()->GetName(),
                                *(pCurrWrtShell->GetDoc()) );
-                // <--
                 pCurrWrtShell->ChgNumRuleFmts( aRule );
             }
         }
@@ -1144,20 +1127,6 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
                 SwFrmFmt* pFFmt = pCurrWrtShell->GetCurFrmFmt();
                 pFrm->SetDerivedFrom( pFFmt );
 
-                // JP 10.06.98: nur automatische Orientierungen uebernehmen
-/*				#61359# jetzt auch wieder alle Orientierungen
-                const SfxPoolItem* pItem;
-                if( SFX_ITEM_SET == aSet.GetItemState( RES_VERT_ORIENT,
-                    FALSE, &pItem ) &&
-                    text::VertOrientation::NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient())
-                    aSet.ClearItem( RES_VERT_ORIENT );
-
-                if( SFX_ITEM_SET == aSet.GetItemState( RES_HORI_ORIENT,
-                    FALSE, &pItem ) &&
-                    text::HoriOrientation::NONE == ((SwFmtHoriOrient*)pItem)->GetHoriOrient())
-                    aSet.ClearItem( RES_HORI_ORIENT );
- */
-
                 pFrm->SetFmtAttr( aSet );
                     // Vorlage auch anwenden, um harte Attributierung
                     // zu entfernen
@@ -1212,10 +1181,8 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
 
             SwNumRule aRule( *pCurrWrtShell->GetCurNumRule() );
             String sOrigRule( aRule.GetName() );
-            // --> OD 2008-07-08 #i91400#
             aRule.SetName( pStyle->GetNumRule()->GetName(),
                            *(pCurrWrtShell->GetDoc()) );
-            // <--
             pCurrWrtShell->ChgNumRuleFmts( aRule );
 
             pCurrWrtShell->ReplaceNumRule( sOrigRule, aRule.GetName() );
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index b368f2f..b30b41d 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -37,9 +37,7 @@
 #include <unotools/syslocale.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/numitem.hxx>
-// --> OD 2008-02-13 #newlistlevelattrs#
 #include <editeng/lrspitem.hxx>
-// <--
 #include <fmtcol.hxx>
 #include <uitool.hxx>
 #include <swmodule.hxx>
@@ -66,10 +64,8 @@
 #include <numrule.hxx>
 #include <fmthdft.hxx>
 #include <svx/svxids.hrc>
-// --> OD 2008-02-12 #newlistlevelattrs#
 #include <SwRewriter.hxx>
 #include <undobj.hxx>
-// <--
 
 // MD 06.02.95: Die Formatnamen in der Liste aller Namen haben als
 // erstes Zeichen die Familie:
@@ -393,8 +389,6 @@ void SwPoolFmtList::Erase()
     DeleteAndDestroy( 0, Count() );
 }
 
-/*  */
-
 /*--------------------------------------------------------------------
     Beschreibung:  UI-seitige implementierung von StyleSheets
                    greift auf die Core-Engine zu
@@ -417,9 +411,7 @@ SwDocStyleSheet::SwDocStyleSheet(	SwDoc&			rDocument,
     aCoreSet(GetPool().GetPool(),
             RES_CHRATR_BEGIN,		RES_CHRATR_END - 1,
             RES_PARATR_BEGIN,       RES_PARATR_END - 1,
-            // --> OD 2008-02-25 #refactorlists#
             RES_PARATR_LIST_BEGIN,  RES_PARATR_LIST_END - 1,
-            // <--
             RES_FRMATR_BEGIN, 		RES_FRMATR_END - 1,
             RES_UNKNOWNATR_BEGIN, 	RES_UNKNOWNATR_END-1,
             SID_ATTR_PAGE, 			SID_ATTR_PAGE_EXT1,
@@ -758,9 +750,6 @@ String  SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
     }
     else if( SFX_STYLE_FAMILY_PSEUDO == nFamily )
     {
-//		if( pNumRule )
-//			return pNumRule->GetName();
-        //os: was sollte man bei Numerierungen schon anzeigen?
         return aEmptyStr;
     }
 
@@ -839,7 +828,6 @@ BOOL  SwDocStyleSheet::SetName( const String& rStr)
                 //PageDesc setzen - mit vorherigem kopieren - ist fuer das
                 //setzen des Namens wohl nicht notwendig. Deshalb erlauben
                 //wir hier mal einen cast.
-                // -> #116530#
                 SwPageDesc aPageDesc(*((SwPageDesc*)pDesc));
                 String aOldName(aPageDesc.GetName());
 
@@ -849,7 +837,6 @@ BOOL  SwDocStyleSheet::SetName( const String& rStr)
                 rDoc.DoUndo(aOldName.Len() > 0);
                 rDoc.ChgPageDesc(aOldName, aPageDesc);
                 rDoc.DoUndo(bDoesUndo);
-                // <- #116530#
 
                 rDoc.SetModified();
                 bChg = TRUE;
@@ -858,7 +845,6 @@ BOOL  SwDocStyleSheet::SetName( const String& rStr)
         case SFX_STYLE_FAMILY_PSEUDO:
             ASSERT(pNumRule, "NumRule fehlt!");
 
-            // -> #106897#
             if (pNumRule)
             {
                 String aOldName = pNumRule->GetName();
@@ -876,15 +862,12 @@ BOOL  SwDocStyleSheet::SetName( const String& rStr)
                 }
                 else
                 {
-                    // --> OD 2008-07-08 #i91400#
                     ((SwNumRule*)pNumRule)->SetName( rStr, rDoc );
-                    // <--
                     rDoc.SetModified();
 
                     bChg = TRUE;
                 }
             }
-            // <- #106897#
 
             break;
 
@@ -1089,7 +1072,6 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
     return aCoreSet;
 }
 
-// --> OD 2008-02-13 #newlistlevelattrs#
 void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet )
 {
     if ( nFamily != SFX_STYLE_FAMILY_PARA )
@@ -1120,13 +1102,11 @@ void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet )
         }
     }
 }
-// <--
 
 /*--------------------------------------------------------------------
     Beschreibung:	ItemSet setzen
  --------------------------------------------------------------------*/
 
-// --> OD 2008-02-12 #newlistlevelattrs#
 // handling of parameter <bResetIndentAttrsAtParagraphStyle>
 void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                                   const bool bResetIndentAttrsAtParagraphStyle )
@@ -1139,14 +1119,12 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
 
     ASSERT( &rSet != &aCoreSet, "SetItemSet mit eigenem Set ist nicht erlaubt" );
 
-    // --> OD 2008-02-12 #newlistlevelattrs#
     if ( rDoc.DoesUndo() )
     {
         SwRewriter aRewriter;
         aRewriter.AddRule( UNDO_ARG1, GetName() );
         rDoc.StartUndo( UNDO_INSFMTATTR, &aRewriter );
     }
-    // <--
 
     SwFmt* pFmt = 0;
     SwPageDesc* pNewDsc = 0;
@@ -1205,11 +1183,10 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 if( pColl != &pColl->GetNextTxtFmtColl() )
                     pCColl->SetNextTxtFmtColl( pColl->GetNextTxtFmtColl() );
 
-                //pCColl->SetOutlineLevel( pColl->GetOutlineLevel() );//#outline level,zhaojianwei
                 if( pColl->IsAssignedToListLevelOfOutlineStyle())
                     pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
                 else
-                    pCColl->DeleteAssignmentToListLevelOfOutlineStyle();//<--end,zhaojianwei
+                    pCColl->DeleteAssignmentToListLevelOfOutlineStyle();
                 
 
 
@@ -1229,7 +1206,6 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 rDoc.DelTxtFmtColl( pColl );
                 pColl = pCColl;
             }
-            // --> OD 2008-02-12 #newlistlevelattrs#
             if ( bResetIndentAttrsAtParagraphStyle &&
                  rSet.GetItemState( RES_PARATR_NUMRULE, FALSE, 0 ) == SFX_ITEM_SET &&
                  rSet.GetItemState( RES_LR_SPACE, FALSE, 0 ) != SFX_ITEM_SET &&
@@ -1237,7 +1213,6 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             {
                 rDoc.ResetAttrAtFormat( RES_LR_SPACE, *pColl );
             }
-            // <--
 
             // #i56252: If a standard numbering style is assigned to a standard paragraph style
             // we have to create a physical instance of the numbering style. If we do not and
@@ -1312,7 +1287,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     // copy of the page style
                     const sal_Bool bDoesUndo( rDoc.DoesUndo() );
                     rDoc.DoUndo( sal_False );
-                    rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983#
+                    rDoc.CopyPageDesc(*pDesc, *pNewDsc);
                     rDoc.DoUndo( bDoesUndo );
                     // <--
 
@@ -1335,7 +1310,6 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                 {
                     SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule();
                     pSetRule->UnLinkGraphics();
-                    //SwNumRule aSetRule(rDoc.GetUniqueNumRuleName());
                     SwNumRule aSetRule(*pNumRule);
                     aSetRule.SetSvxRule(*pSetRule, &rDoc);
                     rDoc.ChgNumRuleFmts( aSetRule );
@@ -1345,12 +1319,8 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     // NumRule auf default Werte
                     // was sind die default Werte?
                     {
-                        // --> OD 2008-02-11 #newlistlevelattrs#
                         SwNumRule aRule( pNumRule->GetName(),
-                                         // --> OD 2008-06-06 #i89178#
                                          numfunc::GetDefaultPositionAndSpaceMode() );
-                                         // <--
-                        // <--
                         rDoc.ChgNumRuleFmts( aRule );
                     }
                     break;
@@ -1370,10 +1340,8 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
         {
             if( IsInvalidItem( pItem ) )			// Clearen
             {
-                // --> OD 2008-02-12 #newlistlevelattrs#
                 // use method <SwDoc::ResetAttrAtFormat(..)> in order to
                 // create an Undo object for the attribute reset.
-//                pFmt->ResetAttr( rSet.GetWhichByPos(aIter.GetCurPos()));
                 rDoc.ResetAttrAtFormat( rSet.GetWhichByPos(aIter.GetCurPos()),
                                         *pFmt );
             }
@@ -1392,7 +1360,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             ::ItemSetToPageDesc( aSet, *pNewDsc );
             rDoc.ChgPageDesc( nPgDscPos, *pNewDsc );
             pDesc = &const_cast<const SwDoc &>(rDoc).GetPageDesc( nPgDscPos );
-            rDoc.PreDelPageDesc(pNewDsc); // #i7983#
+            rDoc.PreDelPageDesc(pNewDsc);
             delete pNewDsc;
         }
         else
@@ -1403,17 +1371,15 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
         aCoreSet.ClearItem();
         if( pNewDsc ) 			// den muessen wir noch vernichten!!
         {
-            rDoc.PreDelPageDesc(pNewDsc); // #i7983#
+            rDoc.PreDelPageDesc(pNewDsc);
             delete pNewDsc;
         }
     }
 
-    // --> OD 2008-02-12 #newlistlevelattrs#
     if ( rDoc.DoesUndo() )
     {
         rDoc.EndUndo( UNDO_INSFMTATTR, NULL );
     }
-    // <--
 }
 
 void lcl_SaveStyles( USHORT nFamily, SvPtrarr& rArr, SwDoc& rDoc )
@@ -1801,19 +1767,13 @@ void SwDocStyleSheet::Create()
                 if( !aName.Len() )
                     sTmpNm = rDoc.GetUniqueNumRuleName();
 
-                // --> OD 2008-02-11 #newlistlevelattrs#
                 SwNumRule* pRule = rDoc.GetNumRuleTbl()[
                     rDoc.MakeNumRule( sTmpNm, 0, FALSE,
-                                      // --> OD 2008-06-06 #i89178#
                                       numfunc::GetDefaultPositionAndSpaceMode() ) ];
-                                      // <--
-                // <--
                 pRule->SetAutoRule( FALSE );
                 if( !aName.Len() )
                 {
-                    // --> OD 2008-07-08 #i91400#
                     pRule->SetName( aName, rDoc );
-                    // <--
                 }
                 pNumRule = pRule;
             }
@@ -2026,7 +1986,6 @@ static String sTemplateHelpFile = String::CreateFromAscii("swrhlppi.hlp");
         const String *pTemplate = rDoc.GetDocPattern( nFileId );
         if( pTemplate )
         {
-//			const String aHelpPath(MakeHelpPath(*pTemplate));
             rFile = *pTemplate;
         }
     }
@@ -2075,9 +2034,6 @@ void  SwDocStyleSheet::SetHelpId( const String& r, ULONG nId )
     }
 }
 
-
-/*  */
-
 /*--------------------------------------------------------------------
     Beschreibung:	Methoden fuer den DocStyleSheetPool
  --------------------------------------------------------------------*/
@@ -2441,8 +2397,6 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName,
     return bFnd ? mxStyleSheet.get() : 0;
 }
 
-/*  */
-
 SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
                                 SfxStyleFamily eFam, USHORT n )
     : SfxStyleSheetIterator( pBase, eFam, n ),
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index fa13048..6c61b34 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -95,10 +95,6 @@ Resource RID_SW_ERRHDL
     };
     String ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Diese Datei wurde mit der WinWord-Option 'Schnellspeichern' gespeichert. Bitte schalten Sie in WinWord die Option 'Schnellspeichern zulassen' aus und speichern sie die Datei erneut mit WinWord : Diese Datei wurde mit der WinWord-Option ''Schnellspeichern'' gespeichert. Bitte schalten Sie in WinWord die Option ''Schnellspeichern zulassen'' aus und speichern sie die Datei erneut mit WinWord */
-        /* ### ACHTUNG: Neuer Text in Resource? Diese Datei wurde mit der WinWord-Option 'Schnellspeichern' gespeichert. Bitte schalten Sie in WinWord die Option 'Schnellspeichern zulassen' aus und speichern sie die Datei erneut mit WinWord : Diese Datei wurde mit der WinWord-Option ''Schnellspeichern'' gespeichert. Bitte schalten Sie in WinWord die Option ''Schnellspeichern zulassen'' aus und speichern sie die Datei erneut mit WinWord */
-        /* ### ACHTUNG: Neuer Text in Resource? Diese Datei wurde mit der WinWord-Option 'Schnellspeichern' gespeichert. Bitte schalten Sie in WinWord die Option 'Schnellspeichern zulassen' aus und speichern sie die Datei erneut mit WinWord : Diese Datei wurde mit der WinWord-Option ''Schnellspeichern'' gespeichert. Bitte schalten Sie in WinWord die Option ''Schnellspeichern zulassen'' aus und speichern sie die Datei erneut mit WinWord */
-        /* ### ACHTUNG: Neuer Text in Resource? Diese Datei wurde mit der WinWord-Option 'Schnellspeichern' gespeichert. Bitte schalten Sie in WinWord die Option 'Schnellspeichern zulassen' aus und speichern sie die Datei erneut mit WinWord : Diese Datei wurde mit der WinWord-Option ''Schnellspeichern'' gespeichert. Bitte schalten Sie in WinWord die Option ''Schnellspeichern zulassen'' aus und speichern sie die Datei erneut mit WinWord */
         Text [ en-US ] = "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ;
     };
     String ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL )
@@ -149,12 +145,10 @@ Resource RID_SW_ERRHDL
     };
     String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Zellen können nicht mehr geteilt werden : Zellen k÷nnen nicht mehr geteilt werden */
         Text [ en-US ] = "Cells cannot be further split." ;
     };
     String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? weitere Spalten können nicht eingefügt werden : weitere Spalten k÷nnen nicht eingef³gt werden */
         Text [ en-US ] = "Additional columns cannot be inserted." ;
     };
     String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR )
@@ -180,22 +174,18 @@ Resource RID_SW_ERRHDL
     };
     String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Einige OLE-Objekte konnten nur als Grafiken übernommen werden : Einige OLE-Objekte konnten nur als Grafiken ³bernommen werden */
         Text [ en-US ] = "Some OLE objects could only be loaded as graphics." ;
     };
     String WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Einige OLE-Objekte konnten nur als Grafiken übernommen werden : Einige OLE-Objekte konnten nur als Grafiken ³bernommen werden */
         Text [ en-US ] = "Some OLE objects could only be saved as graphics." ;
     };
     String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Dokument konnte nicht vollständig geladen werden : Dokument konnte nicht vollstõndig geladen werden */
         Text [ en-US ] = "Document could not be completely loaded." ;
     };
     String WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD )
     {
-        /* ### ACHTUNG: Neuer Text in Resource? Dokument konnte nicht vollständig gespeichert werden : Dokument konnte nicht vollstõndig gespeichert werden */
         Text [ en-US ] = "Document could not be completely saved." ;
     };
     String WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS)
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index aeb8fca..f9f6f1b 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -71,9 +71,7 @@
         Identifier = MN_CELL ; \
         HelpID = MN_CELL ; \
         Command = ".uno:CellMenu" ; \
-        /* ### ACHTUNG: Neuer Text in Resource? Ze~lle : Zelle */\
         Text [ en-US ] = "~Cell" ; \
-        /* ### ACHTUNG: Neuer Text in Resource? Einstellungen für die Tabellenzelle : Einstellungen f³r die Tabellenzelle */\
         SubMenu = Menu\
         {\
             ItemList = \
@@ -114,7 +112,6 @@
                 {\
                     Identifier = FN_TABLE_SET_READ_ONLY_CELLS ; \
                     HelpID = FN_TABLE_SET_READ_ONLY_CELLS ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Schützen : ~Sch³tzen */\
                     Text [ en-US ] = "~Protect" ; \
                 };\
                 MenuItem\
@@ -133,9 +130,7 @@
         Identifier = MN_SUB_TBLROW ; \
         HelpID = HID_MN_SUB_TBLROW ; \
         Command = ".uno:RowMenu" ;  \
-        /* ### ACHTUNG: Neuer Text in Resource? Ze~ile : Zeile */\
         Text [ en-US ] = "~Row" ; \
-        /* ### ACHTUNG: Neuer Text in Resource? Einstellungen für die Tabellenzeile : Einstellungen f³r die Tabellenzeile */\
         SubMenu = Menu\
         {\
             ItemList = \
@@ -144,7 +139,6 @@
                 {\
                     Identifier = FN_TABLE_SET_ROW_HEIGHT ; \
                     HelpID = FN_TABLE_SET_ROW_HEIGHT ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Höhe... : ~H÷he... */\
                     Text [ en-US ] = "~Height..." ; \
                 };\
                 MenuItem\
@@ -157,14 +151,12 @@
                 {\
                     Identifier = FN_TABLE_OPTIMAL_HEIGHT ; \
                     HelpID = FN_TABLE_OPTIMAL_HEIGHT ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Optimale Höhe : ~Optimale H÷he */\
                     Text [ en-US ] = "~Optimal Height" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_BALANCE_ROWS ; \
                     HelpID = FN_TABLE_BALANCE_ROWS ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
                 SEPARATOR ; \
@@ -172,22 +164,18 @@
                 {\
                     Identifier = FN_TABLE_SELECT_ROW ; \
                     HelpID = FN_TABLE_SELECT_ROW ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\
-                    /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\
                     Text [ en-US ] = "~Select" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_ROW_DLG ; \
                     HelpID = FN_TABLE_INSERT_ROW_DLG ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_ROW ; \
                     HelpID = FN_TABLE_DELETE_ROW ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\
                     Text [ en-US ] = "~Delete" ; \
                 };\
             };\
@@ -199,7 +187,6 @@
         HelpID = HID_MN_SUB_TBLCOL ; \
         Command = ".uno:ColumnMenu" ; \
         Text [ en-US ] = "Colu~mn" ; \
-        /* ### ACHTUNG: Neuer Text in Resource? Einstellungen für die Tabellenspalte : Einstellungen f³r die Tabellenspalte */\
         SubMenu = Menu\
         {\
             ItemList = \
@@ -220,7 +207,6 @@
                 {\
                     Identifier = FN_TABLE_BALANCE_CELLS ; \
                     HelpID = FN_TABLE_BALANCE_CELLS ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
                 SEPARATOR ; \
@@ -228,22 +214,18 @@
                 {\
                     Identifier = FN_TABLE_SELECT_COL ; \
                     HelpID = FN_TABLE_SELECT_COL ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\
-                    /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\
                     Text [ en-US ] = "~Select" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_COL_DLG ; \
                     HelpID = FN_TABLE_INSERT_COL_DLG ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_COL ; \
                     HelpID = FN_TABLE_DELETE_COL ; \
-                    /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\
                     Text [ en-US ] = "~Delete" ; \
                 };\
             };\
@@ -276,7 +258,6 @@
         Text [ en-US ] = "Name..." ; \
     };
 
-// #i68101#
 #define MN_TITLE_DESCRIPTION_SHAPE\
     MenuItem\
     {\
@@ -504,12 +485,10 @@ Menu MN_TAB_POPUPMENU
             ITEM_FORMAT_PARA_DLG
         };
         ITEM_TRANSLITERATE_MENU
-         //     MN_BB
         SEPARATOR ;
         MN_TAB1
         MN_TAB2
         MN_FRM_CAPTION_ITEM
-         //		SEPARATOR;
         MenuItem
         {
             Identifier = FN_VIEW_TABLEGRID ;
@@ -749,11 +728,9 @@ Menu MN_DRAW_POPUPMENU
             ITEM_FORMAT_ATTR_TRANSFORM
         };
 
-        //-#i68101#----------------------
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
         MN_NAME_SHAPE
-        //-#i68101#----------------------
 
         SEPARATOR ;
         MN_DRAW5
@@ -779,11 +756,9 @@ Menu MN_DRAWFORM_POPUPMENU
             ITEM_FORMAT_ATTR_TRANSFORM
         };
 
-        //-#i68101#----------------------
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
         MN_NAME_SHAPE
-        //-#i68101#----------------------
 
         SEPARATOR ;
         MN_FORM
@@ -828,9 +803,6 @@ Menu MN_ANNOTATION_POPUPMENU
 {
     ItemList =
     {
-        //MN_RESET
-        //SEPARATOR ;
-        //MN_TEXT_ATTR
         MenuItem\
                 {\
                     ITEM_FORMAT_ATTR_CHAR_WEIGHT\
@@ -848,13 +820,8 @@ Menu MN_ANNOTATION_POPUPMENU
                     ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
                 };\
         SEPARATOR ;
-        //ITEM_TRANSLITERATE_MENU
-        //SEPARATOR ;
-        //MN_DRWTXT
-        //MN_FRM_CAPTION_ITEM
         SEPARATOR ;
         MN_ANNOTATIONS
-        //MN_REDCOMMENT
     };
 };
 
@@ -960,10 +927,8 @@ Menu MN_GRF_POPUPMENU
     {
         MN_ALIGN_FRAME
         MN_MOUSE_FRAME_WITH_CONTOUR
-        // --> OD 2009-07-14 #i73249#
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
-        // <--
         SEPARATOR ;
         MenuItem
         {
@@ -997,10 +962,8 @@ Menu MN_OLE_POPUPMENU
     {
         MN_ALIGN_FRAME
         MN_MOUSE_FRAME_WITH_CONTOUR
-        // --> OD 2009-07-14 #i73249#
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
-        // <--
         SEPARATOR ;
         MenuItem
         {
@@ -1025,10 +988,8 @@ Menu MN_FRM_POPUPMENU
     {
         MN_ALIGN_FRAME
         MN_MOUSE_FRAME_WITHOUT_CONTOUR
-        // --> OD 2009-07-07 #i73249#
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
-        // <--
         SEPARATOR ;
         MN_FRM
         MN_FRM_CAPTION_ITEM
@@ -1054,13 +1015,11 @@ Menu MN_PPREVIEW_POPUPMENU
         {
             Identifier = FN_PAGEDOWN ;
             HelpID = FN_PAGEDOWN ;
-            /* ### ACHTUNG: Neuer Text in Resource? Nächste Seite : Nõchste Seite */
             Text [ en-US ] = "Next Page" ;
         };
         MenuItem
         {
             ITEM_VIEW_ATTR_ZOOM
-            /* ### ACHTUNG: Neuer Text in Resource? Schließt die Seitenvorschau : Schlie˜t die Seitenvorschau */
         };
         SEPARATOR ;
         MenuItem
@@ -1093,11 +1052,9 @@ Menu MN_MEDIA_POPUPMENU
             ITEM_FORMAT_ATTR_TRANSFORM
         };
 
-        //-#i68101#----------------------
         SEPARATOR ;
         MN_TITLE_DESCRIPTION_SHAPE
         MN_NAME_SHAPE
-        //-#i68101#----------------------
 
         SEPARATOR ;
         MN_DRAW6
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 1927c66..c95c7c2 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -80,9 +80,6 @@ using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::lang;
 
 
-/*-----------------08/28/97 08:41pm-----------------
-
---------------------------------------------------*/
 void lcl_SetUIPrefs(const SwViewOption* pPref, SwView* pView, ViewShell* pSh )
 {
     // in FrameSets kann die tatsaechliche Sichtbarkeit von der Einstellung der ViewOptions abweichen
@@ -231,12 +228,9 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
     lcl_SetUIPrefs(pViewOpt, pCurrView, pSh);
 
     // zum Schluss wird das Idle-Flag wieder gesetzt
-    // #42510#
     pPref->SetIdle(sal_True);
 }
-/* -----------------------------28.09.00 12:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwModule::ApplyUserMetric( FieldUnit eMetric, BOOL bWeb )
 {
         SwMasterUsrPref* pPref;
@@ -272,9 +266,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, BOOL bWeb )
             pTmpView = SwModule::GetNextView(pTmpView);
         }
 }
-/*-- 12.11.2008 14:47:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwModule::ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb )
 {
     SwMasterUsrPref* pPref;
@@ -373,9 +365,6 @@ void SwModule::ApplyUserCharUnit(BOOL bApplyChar, BOOL bWeb)
     }
 }
 
-/*-----------------13.11.96 11.57-------------------
-
---------------------------------------------------*/
 
 SwNavigationConfig*  SwModule::GetNavigationConfig()
 {
@@ -386,9 +375,6 @@ SwNavigationConfig*  SwModule::GetNavigationConfig()
     return pNavigationConfig;
 }
 
-/*-----------------05.02.97 08.03-------------------
-
---------------------------------------------------*/
 
 SwPrintOptions* 	SwModule::GetPrtOptions(sal_Bool bWeb)
 {
@@ -404,9 +390,6 @@ SwPrintOptions* 	SwModule::GetPrtOptions(sal_Bool bWeb)
     return bWeb ? pWebPrtOpt : pPrtOpt;
 }
 
-/*-----------------26.06.97 07.52-------------------
-
---------------------------------------------------*/
 SwChapterNumRules*	SwModule::GetChapterNumRules()
 {
     if(!pChapterNumRules)
@@ -631,9 +614,6 @@ const Color &SwModule::GetRedlineMarkColor()
     return pModuleConfig->GetMarkAlignColor();
 }
 
-/*-----------------03.03.98 16:47-------------------
-
---------------------------------------------------*/
 const SwViewOption*	SwModule::GetViewOption(sal_Bool bWeb)
 {
     return GetUsrPref( bWeb );
@@ -644,9 +624,7 @@ const String& SwModule::GetDocStatWordDelim() const
 {
     return pModuleConfig->GetWordDelimiter();
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 // Durchreichen der Metric von der ModuleConfig (fuer HTML-Export)
 sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
 {
@@ -665,9 +643,7 @@ sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
     }
     return static_cast< sal_uInt16 >(pPref->GetMetric());
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 // Update-Stati durchreichen
 sal_uInt16 SwModule::GetLinkUpdMode( sal_Bool ) const
 {
@@ -675,36 +651,28 @@ sal_uInt16 SwModule::GetLinkUpdMode( sal_Bool ) const
         GetUsrPref(sal_False);
     return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 SwFldUpdateFlags SwModule::GetFldUpdateFlags( sal_Bool ) const
 {
     if(!pUsrPref)
         GetUsrPref(sal_False);
     return pUsrPref->GetFldUpdateFlags();
 }
-/* -----------------------------28.09.00 14:18--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwModule::ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags)
 {
     if(!pUsrPref)
         GetUsrPref(sal_False);
     pUsrPref->SetFldUpdateFlags(eFldFlags);
 }
-/* -----------------------------28.09.00 14:18--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwModule::ApplyLinkMode(sal_Int32 nNewLinkMode)
 {
     if(!pUsrPref)
         GetUsrPref(sal_False);
     pUsrPref->SetUpdateLinkMode(nNewLinkMode);
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling,
         sal_Bool bIsSpellWrongAgain, sal_Bool bIsSpellAllAgain, sal_Bool bSmartTags )
 {
@@ -727,8 +695,6 @@ void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling,
                     pViewShell->GetWin()->Invalidate();
             }
         }
-//		pSpell->SetSpellWrongAgain( sal_False );
-//		pSpell->SetSpellAllAgain( sal_False );
     }
 }
 
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 569e068..545dea1 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -149,7 +149,6 @@
 #include <barcfg.hxx>
 #endif
 #include <svx/rubydialog.hxx>
-// OD 14.02.2003 #107424#
 #include <svtools/colorcfg.hxx>
 
 #include <editeng/acorrcfg.hxx>
@@ -394,7 +393,6 @@ void SwDLL::RegisterControls()
     SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod );
 
     SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod );
-//	SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod );
     SvxFontColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod );
     SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2, pMod );
     SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND, pMod );
@@ -441,7 +439,6 @@ void SwDLL::RegisterControls()
     SwRedlineAcceptChild::RegisterChildWindow( sal_False, pMod );
     SwSyncChildWin::RegisterChildWindow( sal_True, pMod );
     SwMailMergeChildWindow::RegisterChildWindow( sal_False, pMod );
-//    SwSendMailChildWindow::RegisterChildWindow( sal_False, pMod );
     SwInsertIdxMarkWrapper::RegisterChildWindow( sal_False, pMod );
     SwInsertAuthMarkWrapper::RegisterChildWindow( sal_False, pMod );
     SvxRubyChildWindow::RegisterChildWindow( sal_False, pMod);
@@ -481,18 +478,13 @@ void SwDLL::RegisterControls()
 |*
 \************************************************************************/
 
-/* -----------------20.04.99 10:46-------------------
- *
- * --------------------------------------------------*/
 void	SwModule::InitAttrPool()
 {
     DBG_ASSERT(!pAttrPool, "Pool ist schon da!");
     pAttrPool = new SwAttrPool(0);
     SetPool(pAttrPool);
 }
-/* -----------------20.04.99 10:46-------------------
- *
- * --------------------------------------------------*/
+
 void	SwModule::RemoveAttrPool()
 {
     SetPool(0);
-- 
1.7.0.4


--------------090507060805050502000909--


More information about the LibreOffice mailing list