Remove bogus comment in sw

39 files changed, 60 insertions, 2023 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index bfd7f4ca9b90..aa0bc5c34297 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -87,9 +87,7 @@ using namespace ::rtl;
 //typedef SharedUNOComponent< XConnection >   SharedConnection;
 
 static const char* cUTF8 = "UTF-8";
-/*-- 07.05.2004 14:11:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 struct AddressUserData_Impl
 {
     uno::Reference<XDataSource>             xSource;
@@ -105,6 +103,7 @@ struct AddressUserData_Impl
         nTableAndQueryCount(-1)
         {}
 };
+
 ::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties )
 {
     ::rtl::OUString sURL;
@@ -150,9 +149,7 @@ struct AddressUserData_Impl
     }
     return sURL;
 }
-/*-- 07.04.2004 16:35:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_ADDRESSLISTDIALOG)),
 #ifdef MSC
@@ -280,9 +277,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
     m_aListLB.SetSelectHdl(LINK(this, SwAddressListDialog, ListBoxSelectHdl_Impl));
     TableSelectHdl_Impl(NULL);
 }
-/*-- 07.04.2004 16:35:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddressListDialog::~SwAddressListDialog()
 {
     SvLBoxEntry* pEntry = m_aListLB.First();
@@ -293,9 +288,7 @@ SwAddressListDialog::~SwAddressListDialog()
         pEntry = m_aListLB.Next( pEntry );
     }
 }
-/*-- 07.04.2004 16:35:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG)
 {
     SvLBoxEntry* pSelect = m_aListLB.FirstSelected();
@@ -361,9 +354,7 @@ IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG)
     }
     return 0;
 }
-/*-- 07.04.2004 16:35:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, LoadHdl_Impl,   PushButton*, EMPTYARG)
 {
     String sNewSource = SwNewDBMgr::LoadAndRegisterDataSource();
@@ -375,9 +366,7 @@ IMPL_LINK(SwAddressListDialog, LoadHdl_Impl,   PushButton*, EMPTYARG)
     }
     return 0;
 }
-/*-- 07.04.2004 16:35:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
 {
     String sInputURL;
@@ -467,9 +456,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
     delete pDlg;
     return 0;
 }
-/*-- 22.04.2004 10:30:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
 {
     SvLBoxEntry* pEntry = m_aListLB.FirstSelected();
@@ -501,9 +488,7 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
     }
     return 0;
 };
-/*-- 19.04.2004 09:41:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTabListBox*, EMPTYARG)
 {
     SvLBoxEntry* pSelect = m_aListLB.FirstSelected();
@@ -511,6 +496,7 @@ IMPL_LINK(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTabListBox*, EMPTYARG)
                                                 StaticListBoxSelectHdl_Impl ), pSelect );
     return 0;
 }
+
 IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*, pSelect)
 {
     //prevent nested calls of the select handler
@@ -657,9 +643,6 @@ void SwAddressListDialog::DetectTablesAndQueries(
     }
 }
 
-/*-- 13.05.2004 12:55:40---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton)
 {
     EnterWait();
@@ -680,18 +663,12 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton)
     return 0;
 }
 
-/*-- 08.04.2004 14:52:11---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressListDialog, OKHdl_Impl, PushButton*, EMPTYARG)
 {
     EndDialog(TRUE);
     return 0;
 }
 
-/*-- 07.05.2004 14:17:47---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 uno::Reference< XDataSource>  SwAddressListDialog::GetSource()
 {
     uno::Reference< XDataSource>  xRet;
@@ -704,9 +681,7 @@ uno::Reference< XDataSource>  SwAddressListDialog::GetSource()
     return xRet;
 
 }
-/*-- 07.05.2004 14:17:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SharedConnection    SwAddressListDialog::GetConnection()
 {
     SharedConnection xRet;
@@ -718,9 +693,7 @@ SharedConnection    SwAddressListDialog::GetConnection()
     }
     return xRet;
 }
-/*-- 07.05.2004 14:17:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier()
 {
     uno::Reference< XColumnsSupplier> xRet;
@@ -732,9 +705,7 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier()
     }
     return xRet;
 }
-/*-- 14.05.2004 15:04:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwAddressListDialog::GetFilter()
 {
     ::rtl::OUString sRet;
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index c4a6a37f148c..b39480a8a002 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -58,9 +58,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
 using ::rtl::OUString;
 
-/*-- 19.04.2004 12:19:50---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class SwAddressControl_Impl : public Control
 {
     ScrollBar                       m_aScrollBar;
@@ -98,9 +95,6 @@ public:
     void        SetCursorTo(sal_uInt32 nElement);
 };
 
-/*-- 13.04.2004 10:09:42---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, const ResId& rResId ) :
     Control(pParent, rResId),
 #ifdef MSC
@@ -124,9 +118,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, const ResId& rResI
     m_aScrollBar.EnableDrag();
 
 }
-/*-- 13.04.2004 10:09:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddressControl_Impl::~SwAddressControl_Impl()
 {
     ::std::vector<FixedText*>::iterator aTextIter;
@@ -136,9 +128,7 @@ SwAddressControl_Impl::~SwAddressControl_Impl()
     for(aEditIter = m_aEdits.begin(); aEditIter != m_aEdits.end(); ++aEditIter)
         delete *aEditIter;
 }
-/*-- 19.04.2004 12:22:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressControl_Impl::SetData(SwCSVData& rDBData)
 {
     m_pData = &rDBData;
@@ -236,9 +226,7 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData)
 
     }
 }
-/*-- 21.04.2004 11:37:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet)
 {
     if(m_bNoDataSet || m_nCurrentDataSet != nSet)
@@ -260,9 +248,6 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet)
     }
 }
 
-/*-- 19.04.2004 14:17:50---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll)
 {
     long nThumb = pScroll->GetThumbPos();
@@ -270,9 +255,7 @@ IMPL_LINK(SwAddressControl_Impl, ScrollHdl_Impl, ScrollBar*, pScroll)
 
     return 0;
 }
-/*-- 19.04.2004 16:16:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Edit*, pEdit)
 {
     if(0 != (GETFOCUS_TAB & pEdit->GetGetFocusFlags()))
@@ -282,9 +265,7 @@ IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Edit*, pEdit)
     }
     return 0;
 }
-/*-- 21.04.2004 14:56:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressControl_Impl::MakeVisible(const Rectangle & rRect)
 {
     long nThumb = m_aScrollBar.GetThumbPos();
@@ -305,6 +286,7 @@ void SwAddressControl_Impl::MakeVisible(const Rectangle & rRect)
         ScrollHdl_Impl(&m_aScrollBar);
     }
 }
+
 /*-- 19.04.2004 16:16:25---------------------------------------------------
     copy data changes into database
   -----------------------------------------------------------------------*/
@@ -320,9 +302,7 @@ IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, Edit*, pEdit)
     }
     return 0;
 }
-/*-- 21.04.2004 14:51:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressControl_Impl::SetCursorTo(sal_uInt32 nElement)
 {
     if(nElement < m_aEdits.size())
@@ -334,9 +314,7 @@ void SwAddressControl_Impl::SetCursorTo(sal_uInt32 nElement)
     }
 
 }
-/*-- 19.04.2004 16:16:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressControl_Impl::Command( const CommandEvent& rCEvt )
 {
     switch ( rCEvt.GetCommand() )
@@ -356,9 +334,7 @@ void SwAddressControl_Impl::Command( const CommandEvent& rCEvt )
             Control::Command(rCEvt);
     }
 }
-/*-- 19.04.2004 16:16:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     if(rNEvt.GetType() == EVENT_COMMAND)
@@ -373,9 +349,7 @@ long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt )
     }
     return Control::PreNotify(rNEvt);
 }
-/*-- 13.04.2004 10:08:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCreateAddressListDialog::SwCreateAddressListDialog(
         Window* pParent, const String& rURL, SwMailMergeConfigItem& rConfig) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_CREATEADDRESSLIST)),
@@ -498,15 +472,14 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
     m_aSetNoNF.SetMax(m_pCSVData->aDBData.size());
     UpdateButtons();
 }
-/*-- 13.04.2004 10:08:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCreateAddressListDialog::~SwCreateAddressListDialog()
 {
     delete m_pAddressControl;
     delete m_pCSVData;
     delete m_pFindDlg;
 }
+
 /*-- 13.04.2004 10:08:59---------------------------------------------------
     add a new data set of empty strings and set the address input control
     to that new set
@@ -526,9 +499,7 @@ IMPL_LINK(SwCreateAddressListDialog, NewHdl_Impl, PushButton*, EMPTYARG)
     UpdateButtons();
     return 0;
 }
-/*-- 13.04.2004 10:09:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCreateAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG)
 {
     sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet();
@@ -550,9 +521,7 @@ IMPL_LINK(SwCreateAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG)
     UpdateButtons();
     return 0;
 }
-/*-- 13.04.2004 10:09:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCreateAddressListDialog, FindHdl_Impl, PushButton*, EMPTYARG)
 {
     if(!m_pFindDlg)
@@ -570,9 +539,7 @@ IMPL_LINK(SwCreateAddressListDialog, FindHdl_Impl, PushButton*, EMPTYARG)
         m_pFindDlg->Show(!m_pFindDlg->IsVisible());
     return 0;
 }
-/*-- 13.04.2004 10:09:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, PushButton*, pButton)
 {
     SwCustomizeAddressListDialog* pDlg = new SwCustomizeAddressListDialog(pButton, *m_pCSVData);
@@ -598,6 +565,7 @@ IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
+
 /*-- 23.04.2004 09:02:51---------------------------------------------------
     writes the data into a .csv file
     encoding is UTF8, separator is tab, strings are enclosed into "
@@ -675,9 +643,7 @@ IMPL_LINK(SwCreateAddressListDialog, OkHdl_Impl, PushButton*, EMPTYARG)
 
     return 0;
 }
-/*-- 13.04.2004 10:09:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, PushButton*, pButton)
 {
     sal_uInt32 nValue = static_cast< sal_uInt32 >(m_aSetNoNF.GetValue());
@@ -703,18 +669,14 @@ IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
-/*-- 21.04.2004 12:06:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCreateAddressListDialog, DBNumCursorHdl_Impl, NumericField*, EMPTYARG)
 {
     m_pAddressControl->SetCurrentDataSet( static_cast< sal_uInt32 >(m_aSetNoNF.GetValue() - 1) );
     UpdateButtons();
     return 0;
 }
-/*-- 21.04.2004 13:22:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwCreateAddressListDialog::UpdateButtons()
 {
     sal_uInt32 nCurrent = static_cast< sal_uInt32 >(m_aSetNoNF.GetValue() );
@@ -725,9 +687,7 @@ void SwCreateAddressListDialog::UpdateButtons()
     m_aEndPB.Enable(nCurrent != nSize);
     m_aDeletePB.Enable(nSize > 0);
 }
-/*-- 21.04.2004 13:22:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwCreateAddressListDialog::Find(const String& rSearch, sal_Int32 nColumn)
 {
     OUString sSearch = rSearch;
@@ -772,9 +732,7 @@ void SwCreateAddressListDialog::Find(const String& rSearch, sal_Int32 nColumn)
         m_pAddressControl->SetCursorTo(nElement);
     }
 }
-/*-- 13.04.2004 13:48:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent) :
     ModelessDialog(pParent, SW_RES(DLG_MM_FIND_ENTRY)),
 #ifdef MSC
@@ -797,15 +755,11 @@ SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent) :
     m_aFindED.SetModifyHdl(LINK(this, SwFindEntryDialog, FindEnableHdl_Impl));
     m_aCancel.SetClickHdl(LINK(this, SwFindEntryDialog, CloseHdl_Impl));
 }
-/*-- 13.04.2004 13:48:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwFindEntryDialog::~SwFindEntryDialog()
 {
 }
-/*-- 21.04.2004 13:37:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwFindEntryDialog, FindHdl_Impl, PushButton*, EMPTYARG)
 {
     sal_Int32 nColumn = -1;
@@ -815,17 +769,13 @@ IMPL_LINK(SwFindEntryDialog, FindHdl_Impl, PushButton*, EMPTYARG)
         m_pParent->Find(m_aFindED.GetText(), nColumn);
     return 0;
 }
-/*-- 21.04.2004 13:37:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwFindEntryDialog, FindEnableHdl_Impl, Edit*, EMPTYARG)
 {
     m_aFindPB.Enable(m_aFindED.GetText().Len() > 0);
     return 0;
 }
-/*-- 21.04.2004 15:36:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwFindEntryDialog, CloseHdl_Impl, PushButton*, EMPTYARG)
 {
     Show(FALSE);
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index f5191fe0fe55..856222b8db17 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -40,11 +40,6 @@
 #include <dbui.hrc>
 #include <helpid.h>
 
-
-
-/*-- 13.04.2004 14:27:21---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
         Window* pParent, const SwCSVData& rOldData) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_CUSTOMIZE_ADDRESS_LIST)),
@@ -86,24 +81,17 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
     m_aFieldsLB.SelectEntryPos(0);
     UpdateButtons();
 }
-/*-- 13.04.2004 14:34:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCustomizeAddressListDialog::~SwCustomizeAddressListDialog()
 {
 }
 
-/*-- 12.08.2004 12:58:00---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox*, EMPTYARG)
 {
     UpdateButtons();
     return 0;
 }
-/*-- 13.04.2004 15:02:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton)
 {
     bool bRename = pButton == &m_aRenamePB;
@@ -147,9 +135,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton)
     UpdateButtons();
     return 0;
 }
-/*-- 13.04.2004 15:02:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG)
 {
     USHORT nPos = m_aFieldsLB.GetSelectEntryPos();
@@ -166,9 +152,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, DeleteHdl_Impl, PushButton*, EMPTYARG)
     UpdateButtons();
     return 0;
 }
-/*-- 13.04.2004 15:02:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton)
 {
     USHORT nPos;
@@ -196,9 +180,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton)
     UpdateButtons();
     return 0;
 }
-/*-- 19.04.2004 14:51:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwCustomizeAddressListDialog::UpdateButtons()
 {
     USHORT nPos = m_aFieldsLB.GetSelectEntryPos();
@@ -208,17 +190,12 @@ void SwCustomizeAddressListDialog::UpdateButtons()
     m_aDeletePB.Enable(nEntries > 0);
     m_aRenamePB.Enable(nEntries > 0);
 }
-/*-- 19.04.2004 14:51:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCSVData*    SwCustomizeAddressListDialog::GetNewData()
 {
     return m_pNewData;
 }
 
-/*-- 13.04.2004 13:48:41---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwAddRenameEntryDialog::SwAddRenameEntryDialog(
         Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& rCSVHeader) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_ADD_RENAME_ENTRY)),
@@ -243,15 +220,11 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog(
     m_aFieldNameED.SetModifyHdl(LINK(this, SwAddRenameEntryDialog, ModifyHdl_Impl));
     ModifyHdl_Impl( &m_aFieldNameED );
 }
-/*-- 13.04.2004 13:48:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddRenameEntryDialog::~SwAddRenameEntryDialog()
 {
 }
-/*-- 19.04.2004 15:31:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
 {
     ::rtl::OUString sEntry = pEdit->GetText();
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 9e62f7a4de36..9c83b9ce6f00 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -107,7 +107,6 @@
 #include <unomid.h>
 #include <IDocumentMarkAccess.hxx>
 
-
 namespace swui
 {
     SwAbstractDialogFactory * GetFactory();
@@ -210,15 +209,11 @@ private:
     _DB_ColumnConfigData& operator =( const _DB_ColumnConfigData& );
 };
 
-/*  */
-
 int SwInsDBColumn::operator<( const SwInsDBColumn& rCmp ) const
 {
     return 0 > GetAppCollator().compareString( sColumn, rCmp.sColumn );
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
         Reference<XDataSource> xDataSource,
         Reference<sdbcx::XColumnsSupplier> xColSupp,
@@ -453,9 +448,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     // Controls initialisieren:
     PageHdl( aRbAsTable.IsChecked() ? &aRbAsTable : &aRbAsField );
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
 {
     delete pTblSet;
@@ -464,9 +457,7 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
 //  delete pConfig;
     delete pTAutoFmt;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton )
 {
     BOOL bShowTbl = pButton == &aRbAsTable;
@@ -500,9 +491,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton )
 
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
 {
     USHORT nFndPos;
@@ -521,9 +510,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
 
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 {
     BOOL bChgEnable = TRUE, bEnableTo = TRUE, bEnableFrom = TRUE;
@@ -670,9 +657,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
 {
     Button* pButton = 0;
@@ -688,9 +673,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
 
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
 {
     SwWrtShell& rSh = pView->GetWrtShell();
@@ -809,9 +792,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
 
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton )
 {
     SwAbstractDialogFactory* pFact = swui::GetFactory();
@@ -824,9 +805,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton )
     delete pDlg;
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
 {
     ListBox* pGetBox = pBox == &aLbDbFmtFromUsr
@@ -888,9 +867,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
     }
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton )
 {
     if( pButton == &aCbTableHeadon )
@@ -902,9 +879,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton )
     }
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 static void lcl_InsTextInArr( const String& rTxt, _DB_Columns& rColArr )
 {
     _DB_Column* pNew;
@@ -926,9 +901,7 @@ static void lcl_InsTextInArr( const String& rTxt, _DB_Columns& rColArr )
         rColArr.Insert( pNew, rColArr.Count() );
     }
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwInsertDBColAutoPilot::SplitTextToColArr( const String& rTxt,
                                 _DB_Columns& rColArr,
                                 BOOL bInsField )
@@ -1004,9 +977,7 @@ BOOL SwInsertDBColAutoPilot::SplitTextToColArr( const String& rTxt,
 
     return 0 != rColArr.Count();
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
     Reference< XDataSource> xSource,
     Reference< XConnection> xConnection,
@@ -1487,6 +1458,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
     if ( bDisposeResultSet )
         ::comphelper::disposeComponent(xResultSet);
 }
+
 void SwInsertDBColAutoPilot::SetTabSet()
 {
     SwWrtShell& rSh = pView->GetWrtShell();
@@ -1534,14 +1506,8 @@ void SwInsertDBColAutoPilot::SetTabSet()
     rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
 }
 
-/*  */
-
-
 _DB_ColumnConfigData::~_DB_ColumnConfigData() {}
 
-/* -----------------------------05.12.00 16:15--------------------------------
-
- ---------------------------------------------------------------------------*/
 static Sequence<rtl::OUString> lcl_createSourceNames(const String& rNodeName)
 {
     Sequence<rtl::OUString> aSourceNames(11);
@@ -1573,9 +1539,7 @@ static Sequence<rtl::OUString> lcl_createSourceNames(const String& rNodeName)
                             RTL_CONSTASCII_STRINGPARAM( "/IsEmptyHeadline" ));
     return aSourceNames;
 }
-/* -----------------------------05.12.00 16:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 static Sequence<rtl::OUString> lcl_CreateSubNames( const String& rSubNodeName )
 {
     Sequence<rtl::OUString> aSubSourceNames(6);
@@ -1596,9 +1560,7 @@ static Sequence<rtl::OUString> lcl_CreateSubNames( const String& rSubNodeName )
                             RTL_CONSTASCII_STRINGPARAM( "/NumberFormatLocale" ));
     return aSubSourceNames;
 }
-/* -----------------------------06.12.00 13:03--------------------------------
 
- ---------------------------------------------------------------------------*/
 static rtl::OUString lcl_CreateUniqueName(const Sequence<rtl::OUString>& aNames)
 {
     sal_Int32 nIdx = aNames.getLength();
@@ -1622,9 +1584,7 @@ static rtl::OUString lcl_CreateUniqueName(const Sequence<rtl::OUString>& aNames)
     }
     return sRet;
 }
-/* -----------------------------05.12.00 15:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >&  ) {}
 
 void SwInsertDBColAutoPilot::Commit()
@@ -1760,9 +1720,7 @@ void SwInsertDBColAutoPilot::Commit()
         SetSetProperties(sColumnNode, aSubValues);
     }
 }
-/* -----------------------------05.12.00 15:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwInsertDBColAutoPilot::Load()
 {
     Sequence <rtl::OUString> aNames = GetNodeNames(rtl::OUString());
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index cf894f8728c4..0c433ba12ffc 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -215,9 +215,6 @@ void lcl_CopyCompatibilityOptions( SwWrtShell& rSourceShell, SwWrtShell& rTarget
     rTargetShell.SetUseFormerTextWrapping( pIDsa->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING));
 }
 }
-/* -----------------09.12.2002 12:35-----------------
- *
- * --------------------------------------------------*/
 
 class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
 < lang::XEventListener >
@@ -230,7 +227,7 @@ public:
     ~SwConnectionDisposedListener_Impl();
 
 };
-// -----------------------------------------------------------------------------
+
 struct SwNewDBMgr_Impl
 {
     SwDSParam*          pMergeData;
@@ -243,9 +240,7 @@ struct SwNewDBMgr_Impl
        ,xDisposeListener(new SwConnectionDisposedListener_Impl(rDBMgr))
         {}
 };
-/*-- 24.10.2003 15:54:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSource> xSource)
 {
     uno::Reference<XMultiServiceFactory> xMgr = ::comphelper::getProcessServiceFactory();
@@ -276,9 +271,7 @@ void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSource> xSou
         }
     }
 }
-/* -----------------------------17.07.00 17:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
 {
     BOOL bRet = FALSE;
@@ -298,9 +291,7 @@ BOOL lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
     }
     return bRet;
 }
-/* -----------------------------17.07.00 17:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL lcl_GetColumnCnt(SwDSParam* pParam,
     const String& rColumnName, long nLanguage, String& rResult, double* pNumber)
 {
@@ -334,6 +325,7 @@ BOOL lcl_GetColumnCnt(SwDSParam* pParam,
     rResult = SwNewDBMgr::GetDBField( xColumnProps, aFormatData, pNumber);
     return TRUE;
 };
+
 /*--------------------------------------------------------------------
     Beschreibung: Daten importieren
  --------------------------------------------------------------------*/
@@ -473,8 +465,6 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
 /*--------------------------------------------------------------------
     Beschreibung: Daten importieren
  --------------------------------------------------------------------*/
-
-
 BOOL SwNewDBMgr::Merge(SwWrtShell* pSh)
 {
     pSh->StartAllAction();
@@ -487,9 +477,6 @@ BOOL SwNewDBMgr::Merge(SwWrtShell* pSh)
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 void SwNewDBMgr::ImportFromConnection(  SwWrtShell* pSh )
 {
     if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
@@ -523,9 +510,6 @@ void SwNewDBMgr::ImportFromConnection(  SwWrtShell* pSh )
         }
     }
 }
-/*-----------------24.02.97 10.30-------------------
-
---------------------------------------------------*/
 
 String  lcl_FindColumn(const String& sFormatStr,USHORT  &nUsedPos, BYTE &nSeparator)
 {
@@ -558,9 +542,6 @@ String  lcl_FindColumn(const String& sFormatStr,USHORT  &nUsedPos, BYTE &nSepara
     return sReturn;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
 {
     if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
@@ -630,6 +611,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
         }
     }
 }
+
 /*--------------------------------------------------------------------
     Beschreibung: Listbox mit Tabellenliste fuellen
  --------------------------------------------------------------------*/
@@ -715,9 +697,7 @@ BOOL SwNewDBMgr::GetColumnNames(ListBox* pListBox,
     }
     return(TRUE);
 }
-/* -----------------------------08.06.01 15:11--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwNewDBMgr::GetColumnNames(ListBox* pListBox,
         uno::Reference< XConnection> xConnection,
         const String& rTableName, BOOL bAppend)
@@ -742,7 +722,6 @@ BOOL SwNewDBMgr::GetColumnNames(ListBox* pListBox,
 /*--------------------------------------------------------------------
     Beschreibung: CTOR
  --------------------------------------------------------------------*/
-
 SwNewDBMgr::SwNewDBMgr() :
             nMergeType(DBMGR_INSERT),
             bInitDBFields(FALSE),
@@ -753,9 +732,7 @@ SwNewDBMgr::SwNewDBMgr() :
             pMergeEvtSrc(NULL)
 {
 }
-/* -----------------------------18.07.00 08:56--------------------------------
 
- ---------------------------------------------------------------------------*/
 SwNewDBMgr::~SwNewDBMgr()
 {
     for(USHORT nPos = 0; nPos < aDataSourceParams.Count(); nPos++)
@@ -792,6 +769,7 @@ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageD
         ++nDocNo;
     }while(true);
 }
+
 void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget )
 {
     USHORT __FAR_DATA aRangeOfDefaults[] = {
@@ -822,6 +800,7 @@ void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget )
     if( aNewDefaults.Count() )
         rTarget.SetDefault( aNewDefaults );
 }
+
 void lcl_CopyFollowPageDesc(
                             SwWrtShell& rTargetShell,
                             const SwPageDesc& rSourcePageDesc,
@@ -1372,10 +1351,6 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
     return bLoop;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
-  --------------------------------------------------------------------*/
-
 IMPL_LINK_INLINE_START( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
 {
     pButton->GetParent()->Hide();
@@ -1384,12 +1359,10 @@ IMPL_LINK_INLINE_START( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
 }
 IMPL_LINK_INLINE_END( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Numberformat der Spalte ermitteln und ggfs. in
                     den uebergebenen Formatter uebertragen
   --------------------------------------------------------------------*/
-
 ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
                                 const String& rTableName,
                                 const String& rColNm,
@@ -1469,9 +1442,7 @@ ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
     }
     return nRet;
 }
-/* -----------------------------07.06.01 15:43--------------------------------
 
- ---------------------------------------------------------------------------*/
 ULONG SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
                         uno::Reference< XConnection> xConnection,
                         uno::Reference< XPropertySet> xColumn,
@@ -1553,9 +1524,6 @@ ULONG SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
     return nRet;
 }
 
-/* -----------------------------17.07.00 09:47--------------------------------
-
- ---------------------------------------------------------------------------*/
 sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName,
                           const String& rTableName,
                           const String& rColNm )
@@ -1601,9 +1569,6 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName,
     return nRet;
 }
 
-/* -----------------------------03.07.00 17:12--------------------------------
-
- ---------------------------------------------------------------------------*/
 uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rDataSource,
                                                     uno::Reference<XDataSource>& rxSource)
 {
@@ -1624,9 +1589,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData
 
     return xConnection;
 }
-/* -----------------------------03.07.00 17:12--------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
                                     const String& rTableOrQuery,
                                     BYTE    eTableOrQuery)
@@ -1675,9 +1638,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe
 
     return xRet;
 }
-/* -----------------------------05.07.00 13:44--------------------------------
 
- ---------------------------------------------------------------------------*/
 String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
                         const SwDBFormatData& rDBFormatData,
                         double* pNumber)
@@ -1769,6 +1730,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
 
     return sRet;
 }
+
 /* -----------------------------06.07.00 14:28--------------------------------
     releases the merge data source table or query after merge is completed
  ---------------------------------------------------------------------------*/
@@ -1779,6 +1741,7 @@ void    SwNewDBMgr::EndMerge()
     delete pImpl->pMergeData;
     pImpl->pMergeData = 0;
 }
+
 /* -----------------------------06.07.00 14:28--------------------------------
     checks if a desired data source table or query is open
  ---------------------------------------------------------------------------*/
@@ -1805,6 +1768,7 @@ BOOL    SwNewDBMgr::IsDataSourceOpen(const String& rDataSource,
     }
     return sal_False;
 }
+
 /* -----------------------------17.07.00 16:44--------------------------------
     read column data a a specified position
  ---------------------------------------------------------------------------*/
@@ -1870,6 +1834,7 @@ BOOL SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTableNam
     }
     return bRet;
 }
+
 /* -----------------------------06.07.00 16:47--------------------------------
     reads the column data at the current position
  ---------------------------------------------------------------------------*/
@@ -1885,17 +1850,13 @@ BOOL    SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, USHORT nLanguag
     BOOL bRet = lcl_GetColumnCnt(pImpl->pMergeData, rColumnName, nLanguage, rResult, pNumber);
     return bRet;
 }
-/* -----------------------------07.07.00 14:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwNewDBMgr::ToNextMergeRecord()
 {
     DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
     return ToNextRecord(pImpl->pMergeData);
 }
-/* -----------------------------10.07.01 14:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwNewDBMgr::ToNextRecord(
     const String& rDataSource, const String& rCommand, sal_Int32 /*nCommandType*/)
 {
@@ -1914,9 +1875,7 @@ BOOL SwNewDBMgr::ToNextRecord(
     }
     return ToNextRecord(pFound);
 }
-/* -----------------------------10.07.01 14:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwNewDBMgr::ToNextRecord(SwDSParam* pParam)
 {
     BOOL bRet = TRUE;
@@ -1969,9 +1928,7 @@ BOOL SwNewDBMgr::ExistsNextRecord() const
 {
     return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB;
 }
-/* -----------------------------13.07.00 10:41--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_uInt32  SwNewDBMgr::GetSelectedRecordId()
 {
     sal_uInt32  nRet = 0;
@@ -1987,9 +1944,7 @@ sal_uInt32  SwNewDBMgr::GetSelectedRecordId()
     }
     return nRet;
 }
-/* -----------------------------13.07.00 10:58--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet)
 {
     DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
@@ -2007,9 +1962,6 @@ sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet)
     return bRet;
 }
 
-/* -----------------------------17.07.00 14:17--------------------------------
-
- ---------------------------------------------------------------------------*/
 BOOL SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTableOrQuery,
             sal_Int32 nCommandType, bool bCreate)
 {
@@ -2070,9 +2022,7 @@ BOOL SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTableO
     }
     return pFound->xResultSet.is();
 }
-/* -----------------------------14.08.2001 10:26------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(rtl::OUString& rDataSource)
 {
     SwDSParam* pFound = SwNewDBMgr::FindDSConnection(rDataSource, TRUE);
@@ -2092,9 +2042,7 @@ uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(rtl::OUString& rData
     }
     return pFound->xConnection;
 }
-/* -----------------------------17.07.00 15:55--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_uInt32      SwNewDBMgr::GetSelectedRecordId(
     const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType)
 {
@@ -2158,9 +2106,7 @@ void    SwNewDBMgr::CloseAll(BOOL bIncludingMerge)
         }
     }
 }
-/* -----------------------------17.07.00 14:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, BOOL bCreate)
 {
     //prefer merge data if available
@@ -2209,9 +2155,6 @@ SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, BOOL bCreate)
     }
     return pFound;
 }
-/* -----------------------------14.08.2001 10:27------------------------------
-
- ---------------------------------------------------------------------------*/
 
 SwDSParam*  SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, BOOL bCreate)
 {
@@ -2249,16 +2192,11 @@ SwDSParam*  SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, BOOL
     return pFound;
 }
 
-/* -----------------------------17.07.00 14:34--------------------------------
-
- ---------------------------------------------------------------------------*/
 const SwDBData& SwNewDBMgr::GetAddressDBName()
 {
     return SW_MOD()->GetDBConfig()->GetAddressSource();
 }
-/* -----------------------------18.07.00 13:13--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<rtl::OUString> SwNewDBMgr::GetExistingDatabaseNames()
 {
     uno::Reference<XNameAccess> xDBContext;
@@ -2274,9 +2212,7 @@ Sequence<rtl::OUString> SwNewDBMgr::GetExistingDatabaseNames()
     }
     return Sequence<rtl::OUString>();
 }
-/*-- 26.05.2004 14:33:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String SwNewDBMgr::LoadAndRegisterDataSource()
 {
     sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
@@ -2467,9 +2403,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
     return sFind;
 
 }
-/* -----------------------------10.11.00 17:10--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
                         const Sequence<PropertyValue>& rProperties,
                         BOOL bWithDataSourceBrowser)
@@ -2623,9 +2557,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
     }
     DELETEZ(pImpl->pMergeDialog);
 }
-/* -----------------------------13.11.00 08:20--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNewDBMgr::InsertText(SwWrtShell& rSh,
                         const Sequence< PropertyValue>& rProperties)
 {
@@ -2700,9 +2632,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
     delete pDlg;
 
 }
-/* -----------------------------30.08.2001 12:00------------------------------
 
- ---------------------------------------------------------------------------*/
 SwDbtoolsClient* SwNewDBMgr::pDbtoolsClient = NULL;
 
 SwDbtoolsClient& SwNewDBMgr::GetDbtoolsClient()
@@ -2711,17 +2641,13 @@ SwDbtoolsClient& SwNewDBMgr::GetDbtoolsClient()
         pDbtoolsClient = new SwDbtoolsClient;
     return *pDbtoolsClient;
 }
-/* -----------------13.05.2003 15:34-----------------
 
- --------------------------------------------------*/
 void SwNewDBMgr::RemoveDbtoolsClient()
 {
     delete pDbtoolsClient;
     pDbtoolsClient = 0;
 }
-/* -----------------------------20.08.2002 12:00------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName)
 {
     uno::Reference<XDataSource> xSource;
@@ -2739,9 +2665,7 @@ uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Referen
     }
     return xSource;
 }
-/* -----------------------------20.08.2002 12:00------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Reference<XResultSet> SwNewDBMgr::createCursor(const ::rtl::OUString& _sDataSourceName,
                                        const ::rtl::OUString& _sCommand,
                                        sal_Int32 _nCommandType,
@@ -2781,11 +2705,11 @@ uno::Reference<XResultSet> SwNewDBMgr::createCursor(const ::rtl::OUString& _sDat
     }
     return xResultSet;
 }
+
 /*-- 13.05.2004 16:14:15---------------------------------------------------
     merge all data into one resulting document and return the number of
     merged documents
   -----------------------------------------------------------------------*/
-
 sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                             SwView& rSourceView )
 {
@@ -3039,20 +2963,16 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     bInMerge = FALSE;
     return nRet;
 }
-/* -----------------09.12.2002 12:38-----------------
- *
- * --------------------------------------------------*/
+
 SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr) :
     rDBMgr(rMgr)
-{};
-/* -----------------09.12.2002 12:39-----------------
- *
- * --------------------------------------------------*/
+{
+};
+
 SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl()
-{};
-/* -----------------09.12.2002 12:39-----------------
- *
- * --------------------------------------------------*/
+{
+};
+
 void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
         throw (RuntimeException)
 {
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index bec584234fc5..9a4e9e0f6d43 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -53,9 +53,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::rtl;
 
-/*-- 08.04.2004 15:12:24---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_DBTABLEPREVIEWDIALOG)),
 #ifdef MSC
@@ -127,9 +124,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< b
 
 
 }
-/*-- 08.04.2004 15:12:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwDBTablePreviewDialog::~SwDBTablePreviewDialog()
 {
     if(m_xFrame.is())
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 2e4e2cb50370..e145b63c0c40 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -71,9 +71,6 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::beans;
 
-/* -----------------------------17.07.01 13:10--------------------------------
-
- ---------------------------------------------------------------------------*/
 struct SwConnectionData
 {
     ::rtl::OUString                sSourceName;
@@ -83,9 +80,7 @@ struct SwConnectionData
 typedef SwConnectionData* SwConnectionDataPtr;
 SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32, 32 )
 SV_IMPL_PTRARR( SwConnectionArr, SwConnectionDataPtr )
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
 {
     Reference< XNameAccess > xDBContext;
@@ -108,9 +103,7 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
     Reference< XNameAccess >    GetContext() {return xDBContext;}
     Reference<XConnection>      GetConnection(const rtl::OUString& rSourceName);
 };
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 SwDBTreeList_Impl::~SwDBTreeList_Impl()
 {
     Reference<XContainer> xContainer(xDBContext, UNO_QUERY);
@@ -125,16 +118,12 @@ SwDBTreeList_Impl::~SwDBTreeList_Impl()
         m_refCount--;
     }
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDBTreeList_Impl::elementInserted( const ContainerEvent&  ) throw (RuntimeException)
 {
     // information not needed
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
@@ -154,23 +143,17 @@ void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (Ru
         }
     }
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDBTreeList_Impl::disposing( const EventObject&  ) throw (RuntimeException)
 {
     xDBContext = 0;
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent ) throw (RuntimeException)
 {
     elementRemoved(rEvent);
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwDBTreeList_Impl::HasContext()
 {
     if(!xDBContext.is())
@@ -189,9 +172,7 @@ BOOL SwDBTreeList_Impl::HasContext()
     }
     return xDBContext.is();
 }
-/* -----------------------------17.07.01 13:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XConnection>  SwDBTreeList_Impl::GetConnection(const rtl::OUString& rSourceName)
 {
     Reference<XConnection>  xRet;
@@ -213,9 +194,7 @@ Reference<XConnection>  SwDBTreeList_Impl::GetConnection(const rtl::OUString& rS
     }
     return xRet;
 }
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
+
 SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
                         SwWrtShell* pSh,
                         const String& rDefDBName, const BOOL bShowCol):
@@ -234,19 +213,11 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
         InitTreeList();
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
 SwDBTreeList::~SwDBTreeList()
 {
     delete pImpl;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
 void SwDBTreeList::InitTreeList()
 {
     if(!pImpl->HasContext() && pImpl->GetWrtShell())
@@ -285,9 +256,7 @@ void SwDBTreeList::InitTreeList()
 
     bInitialized = TRUE;
 }
-/*-- 27.05.2004 09:19:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SwDBTreeList::AddDataSource(const String& rSource)
 {
     Image aImg = aImageList.GetImage(IMG_DB);
@@ -297,9 +266,6 @@ void    SwDBTreeList::AddDataSource(const String& rSource)
     SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
     SvTreeListBox::Select(pEntry);
 }
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
 
 void SwDBTreeList::ShowColumns(BOOL bShowCol)
 {
@@ -333,10 +299,6 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol)
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void  SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
 {
     if (!pParent->HasChilds())
@@ -470,10 +432,6 @@ void  SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData )
 {
     SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight );
@@ -484,10 +442,6 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData )
     return DefaultCompare(pData);   // Sonst Basisklasse rufen
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 String  SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* pbIsTable)
 {
     String sDBName;
@@ -513,8 +467,6 @@ String  SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* p
 /*------------------------------------------------------------------------
  Beschreibung:  Format: Datenbank.Tabelle
 ------------------------------------------------------------------------*/
-
-
 void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName)
 {
     SvLBoxEntry* pParent;
@@ -557,10 +509,6 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
 {
     String sTableName, sColumnName;
@@ -596,16 +544,11 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
 sal_Int8 SwDBTreeList::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
-/*-- 07.10.2003 13:28:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SwDBTreeList::SetWrtShell(SwWrtShell& rSh)
 {
     pImpl->SetWrtShell(rSh);
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index 2203f70c3404..7d8919d9e4fb 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -103,7 +103,6 @@ namespace /* private */
 
 } // namespace private
 
-
 MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) :
     mailserver_ (mailserver),
     run_(false),
@@ -285,9 +284,7 @@ void MailDispatcher::run()
         }
     } // end for        SSH ALI
 }
-/*-- 27.08.2004 12:04:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void MailDispatcher::onTerminated()
 {
     //keep the reference until the end of onTerminated() because of the call order in the
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 758f52840230..ec7f1abb60c6 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -59,10 +59,6 @@ using namespace ::com::sun::star;
 SFX_IMPL_FLOATINGWINDOW( SwMailMergeChildWindow, FN_MAILMERGE_CHILDWINDOW )
 //SFX_IMPL_FLOATINGWINDOW( SwSendMailChildWindow, FN_MAILMERGE_SENDMAIL_CHILDWINDOW )
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
                                 USHORT nId,
                                 SfxBindings* pBindings,
@@ -89,10 +85,6 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
     pWindow->Show();
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
                             SfxChildWindow* pChild,
                             Window *pParent) :
@@ -114,36 +106,23 @@ SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
     m_aBackTB.Show();
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 SwMailMergeChildWin::~SwMailMergeChildWin()
 {
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SwMailMergeChildWin, BackHdl, ToolBox *, EMPTYARG )
 {
     GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SFX_CALLMODE_ASYNCHRON);
     return 0;
 }
 
-/*-- 26.05.2004 10:12:44---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void    SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
 {
     SfxFloatingWindow::FillInfo(rInfo);
     rInfo.aWinState.Erase();
     rInfo.bVisible = sal_False;
 }
-/*-- 21.05.2004 14:07:37---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 struct SwSendMailDialog_Impl
 {
     friend class SwSendMailDialog;
@@ -190,9 +169,6 @@ const SwMailDescriptor* SwSendMailDialog_Impl::GetNextDescriptor()
     return 0;
 }
 
-/*-- 23.06.2004 10:19:55---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class SwMailDispatcherListener_Impl : public IMailDispatcherListener
 {
     SwSendMailDialog* m_pSendMailDialog;
@@ -212,43 +188,30 @@ public:
     static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
 };
 
-/*-- 23.06.2004 10:04:48---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg) :
     m_pSendMailDialog(&rParentDlg)
 {
 }
-/*-- 23.06.2004 10:04:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailDispatcherListener_Impl::~SwMailDispatcherListener_Impl()
 {
 }
-/*-- 23.06.2004 10:04:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::started(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
 {
 }
-/*-- 23.06.2004 10:04:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::stopped(
                         ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
 {
 }
-/*-- 23.06.2004 10:04:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::idle(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
     m_pSendMailDialog->AllMailsSent();
 }
-/*-- 23.06.2004 10:04:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::mailDelivered(
                         ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
                         uno::Reference< mail::XMailMessage> xMailMessage)
@@ -257,9 +220,7 @@ void SwMailDispatcherListener_Impl::mailDelivered(
     m_pSendMailDialog->DocumentSent( xMailMessage, true, 0 );
     DeleteAttachments( xMailMessage );
 }
-/*-- 23.06.2004 10:04:51---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::mailDeliveryError(
                 ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
                 uno::Reference< mail::XMailMessage> xMailMessage,
@@ -269,9 +230,7 @@ void SwMailDispatcherListener_Impl::mailDeliveryError(
     m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage );
     DeleteAttachments( xMailMessage );
 }
-/*-- 23.06.2004 12:30:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage )
 {
     uno::Sequence< mail::MailAttachment > aAttachments = xMessage->getAttachments();
@@ -295,9 +254,7 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa
         }
     }
 }
-/*-- 07.07.2004 13:45:51---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwSendWarningBox_Impl : public ModalDialog
 {
     FixedImage      aWarningImageIM;
@@ -311,9 +268,7 @@ public:
     SwSendWarningBox_Impl(Window* pParent, const String& rDetails);
     ~SwSendWarningBox_Impl();
 };
-/*-- 07.07.2004 13:52:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String& rDetails) :
     ModalDialog(pParent, SW_RES( DLG_MM_SENDWARNING )),
     aWarningImageIM(this, SW_RES( IM_WARNING         )),
@@ -327,16 +282,11 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const String& rDet
     aWarningImageIM.SetImage(WarningBox::GetStandardImage());
     aDetailED.SetText(rDetails);
 }
-/*-- 07.07.2004 13:52:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSendWarningBox_Impl::~SwSendWarningBox_Impl()
 {
 }
 
-/*-- 21.05.2004 14:10:39---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 #define ITEMID_TASK     1
 #define ITEMID_STATUS   2
 
@@ -426,9 +376,7 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     DetailsHdl_Impl( &m_aDetailsPB );
     UpdateTransferStatus();
 }
-/*-- 21.05.2004 14:10:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSendMailDialog::~SwSendMailDialog()
 {
     if(m_pImpl->xMailDispatcher.is())
@@ -456,9 +404,7 @@ SwSendMailDialog::~SwSendMailDialog()
     }
     delete m_pImpl;
 }
-/*-- 21.05.2004 14:10:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc )
 {
     ::osl::MutexGuard aGuard(m_pImpl->aDescriptorMutex);
@@ -470,26 +416,20 @@ void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc )
     }
 
 }
-/*-- 31.01.2005 08:59:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments )
 {
     m_pImpl->nDocumentCount = nAllDocuments;
     UpdateTransferStatus();
 }
-/*-- 21.05.2004 14:10:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void lcl_Move(Control& rCtrl, long nYOffset)
 {
     Point aPos(rCtrl.GetPosPixel());
     aPos.Y() += nYOffset;
     rCtrl.SetPosPixel(aPos);
 }
-/*-- 21.05.2004 14:10:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwSendMailDialog, DetailsHdl_Impl, PushButton*, EMPTYARG )
 {
     long nMove = 0;
@@ -514,9 +454,7 @@ IMPL_LINK( SwSendMailDialog, DetailsHdl_Impl, PushButton*, EMPTYARG )
 
     return 0;
 }
-/*-- 21.05.2004 14:10:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
 {
     m_bCancel = true;
@@ -537,25 +475,19 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
     }
     return 0;
 }
-/*-- 21.05.2004 14:10:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwSendMailDialog, CloseHdl_Impl, PushButton*, EMPTYARG )
 {
     ModelessDialog::Show( sal_False );
     return 0;
 }
-/*-- 14.06.2004 09:48:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog )
 {
     pDialog->SendMails();
     return 0;
 }
-/*-- 14.06.2004 09:48:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
 {
     if( pThis->m_pImpl->xMailDispatcher.is() )
@@ -578,9 +510,7 @@ IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer )
     }
     return 0;
 }
-/*-- 07.07.2004 14:34:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*, pDialog )
 {
     if(pDialog->m_pImpl->xMailDispatcher.is() &&
@@ -592,9 +522,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SwSendMailDialog, StopSendMails, SwSendMailDialog*,
     }
     return 0;
 }
-/*-- 14.06.2004 10:38:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwSendMailDialog::SendMails()
 {
     if(!m_pConfigItem)
@@ -626,9 +554,7 @@ void  SwSendMailDialog::SendMails()
         m_pImpl->xMailDispatcher->start();
     }
 }
-/* -----------------28.01.2005 10:17-----------------
 
- --------------------------------------------------*/
 void  SwSendMailDialog::IterateMails()
 {
     const SwMailDescriptor* pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
@@ -707,18 +633,14 @@ void  SwSendMailDialog::IterateMails()
     }
     UpdateTransferStatus();
 }
-/*-- 27.08.2004 10:50:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::ShowDialog()
 {
     Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
                                                 StartSendMails ), this );
     ModelessDialog::Show();
 }
-/*-- 27.08.2004 10:50:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwSendMailDialog::StateChanged( StateChangedType nStateChange )
 {
     ModelessDialog::StateChanged( nStateChange );
@@ -730,9 +652,6 @@ void  SwSendMailDialog::StateChanged( StateChangedType nStateChange )
     }
 }
 
-/*-- 23.06.2004 10:14:22---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessage,
                                         bool bResult,
                                         const ::rtl::OUString* pError )
@@ -766,9 +685,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag
         delete pDlg;
     }
 }
-/*-- 23.06.2004 11:25:31---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::UpdateTransferStatus()
 {
     String sStatus( m_sTransferStatus );
@@ -785,9 +702,7 @@ void SwSendMailDialog::UpdateTransferStatus()
     else
         m_aProgressBar.SetValue(0);
 }
-/*-- 23.06.2004 11:18:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSendMailDialog::AllMailsSent()
 {
     m_aStopPB.Enable(sal_False);
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 0214054b7c4e..f37dfe7858dd 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -63,9 +63,6 @@ using rtl::OUString;
 namespace SwMailMergeHelper
 {
 
-/*-- 14.06.2004 12:29:19---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 String  CallSaveAsDialog(String& rFilter)
 {
     ErrCode nRet;
@@ -84,6 +81,7 @@ String  CallSaveAsDialog(String& rFilter)
     }
     return sRet;
 }
+
 /*-- 20.08.2004 09:39:18---------------------------------------------------
     simple address check: check for '@'
                             for at least one '.' after the '@'
@@ -102,9 +100,6 @@ bool CheckMailAddress( const ::rtl::OUString& rMailAddress )
     return true;
 }
 
-/*-- 28.12.2004 10:16:02---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
         SwMailMergeConfigItem& rConfigItem,
         uno::Reference< mail::XMailService >&  rxInMailService,
@@ -189,9 +184,6 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
 
 } //namespace
 
-/*-- 06.04.2004 10:31:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwBoldFixedInfo::SwBoldFixedInfo(Window* pParent, const ResId& rResId) :
     FixedInfo(pParent, rResId)
 {
@@ -199,12 +191,11 @@ SwBoldFixedInfo::SwBoldFixedInfo(Window* pParent, const ResId& rResId) :
     aFont.SetWeight( WEIGHT_BOLD );
     SetFont( aFont );
 }
-/*-- 06.04.2004 10:31:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwBoldFixedInfo::~SwBoldFixedInfo()
 {
 }
+
 struct  SwAddressPreview_Impl
 {
     ::std::vector< ::rtl::OUString >    aAdresses;
@@ -221,9 +212,7 @@ struct  SwAddressPreview_Impl
     {
     }
 };
-/*-- 27.04.2004 14:01:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddressPreview::SwAddressPreview(Window* pParent, const ResId rResId) :
     Window( pParent, rResId ),
     aVScrollBar(this, WB_VSCROLL),
@@ -238,31 +227,23 @@ SwAddressPreview::SwAddressPreview(Window* pParent, const ResId rResId) :
     aVScrollBar.SetPosPixel(aSrollPos);
     Show();
 }
-/*-- 27.04.2004 14:01:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAddressPreview::~SwAddressPreview()
 {
 }
-/*-- 25.06.2004 11:50:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAddressPreview, ScrollHdl, ScrollBar*, EMPTYARG)
 {
     Invalidate();
     return 0;
 }
-/*-- 27.04.2004 14:01:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::AddAddress(const ::rtl::OUString& rAddress)
 {
     pImpl->aAdresses.push_back(rAddress);
     UpdateScrollBar();
 }
-/*-- 27.04.2004 14:01:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::SetAddress(const ::rtl::OUString& rAddress)
 {
     pImpl->aAdresses.clear();
@@ -270,17 +251,13 @@ void SwAddressPreview::SetAddress(const ::rtl::OUString& rAddress)
     aVScrollBar.Show(FALSE);
     Invalidate();
 }
-/*-- 27.04.2004 14:01:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt16   SwAddressPreview::GetSelectedAddress()const
 {
     DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid");
     return pImpl->nSelectedAddress;
 }
-/*-- 25.06.2004 10:32:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::SelectAddress(sal_uInt16 nSelect)
 {
     DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid");
@@ -291,26 +268,20 @@ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect)
     if( (nSelectRow < nStartRow) || (nSelectRow >= (nStartRow + pImpl->nRows) ))
         aVScrollBar.SetThumbPos( nSelectRow );
 }
-/*-- 25.06.2004 11:00:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::Clear()
 {
     pImpl->aAdresses.clear();
     pImpl->nSelectedAddress = 0;
     UpdateScrollBar();
 }
-/*-- 28.04.2004 12:05:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::ReplaceSelectedAddress(const ::rtl::OUString& rNew)
 {
     pImpl->aAdresses[pImpl->nSelectedAddress] = rNew;
     Invalidate();
 }
-/*-- 25.06.2004 11:30:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::RemoveSelectedAddress()
 {
     pImpl->aAdresses.erase(pImpl->aAdresses.begin() + pImpl->nSelectedAddress);
@@ -319,25 +290,19 @@ void SwAddressPreview::RemoveSelectedAddress()
     UpdateScrollBar();
     Invalidate();
 }
-/*-- 27.04.2004 14:01:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns)
 {
     pImpl->nRows = nRows;
     pImpl->nColumns = nColumns;
     UpdateScrollBar();
 }
-/*-- 25.06.2004 13:54:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::EnableScrollBar(bool bEnable)
 {
     pImpl->bEnableScrollBar = bEnable;
 }
-/*-- 25.06.2004 11:55:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::UpdateScrollBar()
 {
     if(pImpl->nColumns)
@@ -351,9 +316,7 @@ void SwAddressPreview::UpdateScrollBar()
             aVScrollBar.SetThumbPos(nResultingRows);
     }
 }
-/*-- 27.04.2004 14:01:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::Paint(const Rectangle&)
 {
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
@@ -398,9 +361,6 @@ void SwAddressPreview::Paint(const Rectangle&)
     SetClipRegion();
 }
 
-/*-- 07.06.2004 15:44:15---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void  SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Window::MouseButtonDown(rMEvt);
@@ -427,9 +387,7 @@ void  SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt )
         Invalidate();
     }
 }
-/*-- 01.07.2004 12:33:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwAddressPreview::KeyInput( const KeyEvent& rKEvt )
 {
     USHORT nKey = rKEvt.GetKeyCode().GetCode();
@@ -469,18 +427,14 @@ void  SwAddressPreview::KeyInput( const KeyEvent& rKEvt )
     else
         Window::KeyInput(rKEvt);
 }
-/*-- 05.07.2004 12:02:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::StateChanged( StateChangedType nStateChange )
 {
     if(nStateChange == STATE_CHANGE_ENABLE)
         Invalidate();
     Window::StateChanged(nStateChange);
 }
-/*-- 27.04.2004 14:01:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAddressPreview::DrawText_Impl(
         const ::rtl::OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected)
 {
@@ -503,9 +457,7 @@ void SwAddressPreview::DrawText_Impl(
         aStart.Y() += nHeight;
     }
 }
-/*-- 29.04.2004 11:24:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String SwAddressPreview::FillData(
         const ::rtl::OUString& rAddress,
         SwMailMergeConfigItem& rConfigItem,
@@ -605,9 +557,6 @@ String SwAddressPreview::FillData(
     return sAddress;
 }
 
-/*-- 11.05.2004 15:42:08---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMergeAddressItem   SwAddressIterator::Next()
 {
     //currently the string may either start with a '<' then it's a column
@@ -658,22 +607,16 @@ SwMergeAddressItem   SwAddressIterator::Next()
     return aRet;
 
 }
-/*-- 21.05.2004 10:36:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAuthenticator::~SwAuthenticator()
 {
 }
-/*-- 21.05.2004 10:36:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OUString SwAuthenticator::getUserName( ) throw (RuntimeException)
 {
     return m_aUserName;
 }
-/*-- 21.05.2004 10:36:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OUString SwAuthenticator::getPassword(  ) throw (RuntimeException)
 {
     if(m_aUserName.getLength() && !m_aPassword.getLength() && m_pParentWindow)
@@ -686,9 +629,7 @@ OUString SwAuthenticator::getPassword(  ) throw (RuntimeException)
     }
     return m_aPassword;
 }
-/*-- 25.08.2004 12:53:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwConnectionContext::SwConnectionContext(
         const ::rtl::OUString& rMailServer, sal_Int16 nPort,
         const ::rtl::OUString& rConnectionType) :
@@ -697,15 +638,11 @@ SwConnectionContext::SwConnectionContext(
     m_sConnectionType(rConnectionType)
 {
 }
-/*-- 25.08.2004 12:53:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwConnectionContext::~SwConnectionContext()
 {
 }
-/*-- 25.08.2004 12:53:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Any SwConnectionContext::getValueByName( const ::rtl::OUString& rName )
                                                 throw (uno::RuntimeException)
 {
@@ -718,38 +655,28 @@ uno::Any SwConnectionContext::getValueByName( const ::rtl::OUString& rName )
         aRet <<= m_sConnectionType;
     return aRet;
 }
-/*-- 21.05.2004 10:45:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwConnectionListener::~SwConnectionListener()
 {
 }
-/*-- 21.05.2004 10:45:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwConnectionListener::connected(const lang::EventObject& /*aEvent*/)
     throw (uno::RuntimeException)
 {
     //OSL_ENSURE(false, "Connection opened");
 }
-/*-- 21.05.2004 10:45:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwConnectionListener::disconnected(const lang::EventObject& /*aEvent*/)
     throw (uno::RuntimeException)
 {
     //OSL_ENSURE(false, "Connection closed");
 }
-/*-- 21.05.2004 10:45:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/)
     throw(uno::RuntimeException)
 {
 }
-/*-- 21.05.2004 10:17:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< uno::XComponentContext> getCurrentCmpCtx(
                         uno::Reference<lang::XMultiServiceFactory> rSrvMgr)
 {
@@ -760,9 +687,7 @@ uno::Reference< uno::XComponentContext> getCurrentCmpCtx(
     aAny >>= rCmpCtx;
     return rCmpCtx;
 }
-/*-- 13.07.2004 09:07:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType) :
     cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex),
     m_aMimeType( rMimeType ),
@@ -770,9 +695,7 @@ SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OU
     m_bIsBody( true )
 {
 }
-/*-- 13.07.2004 09:07:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailTransferable::SwMailTransferable(const rtl::OUString& rURL,
                 const rtl::OUString& rName, const rtl::OUString& rMimeType) :
     cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex),
@@ -782,15 +705,11 @@ SwMailTransferable::SwMailTransferable(const rtl::OUString& rURL,
     m_bIsBody( false )
 {
 }
-/*-- 13.07.2004 09:07:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailTransferable::~SwMailTransferable()
 {
 }
-/*-- 13.07.2004 09:07:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*aFlavor*/ )
                             throw (datatransfer::UnsupportedFlavorException,
                             io::IOException, uno::RuntimeException)
@@ -815,9 +734,7 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*
     }
     return aRet;
 }
-/*-- 13.07.2004 09:07:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFlavors(  )
                             throw (uno::RuntimeException)
 {
@@ -834,33 +751,25 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla
     }
     return aRet;
 }
-/*-- 13.07.2004 09:07:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailTransferable::isDataFlavorSupported(
             const datatransfer::DataFlavor& aFlavor )
                             throw (uno::RuntimeException)
 {
     return (aFlavor.MimeType == ::rtl::OUString(m_aMimeType));
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return uno::Reference< beans::XPropertySetInfo >();
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailTransferable::setPropertyValue( const ::rtl::OUString& , const uno::Any& )
     throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
           lang::WrappedTargetException, uno::RuntimeException)
 {
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyName )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -869,35 +778,27 @@ uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyN
         aRet <<= m_aURL;
     return aRet;
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailTransferable::addPropertyChangeListener(
     const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >&  )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailTransferable::removePropertyChangeListener(
     const ::rtl::OUString&,
     const uno::Reference< beans::XPropertyChangeListener >& )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailTransferable::addVetoableChangeListener(
     const ::rtl::OUString&,
     const uno::Reference< beans::XVetoableChangeListener >& )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
 }
-/*-- 28.04.2004 09:52:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailTransferable::removeVetoableChangeListener(
     const ::rtl::OUString& ,
     const uno::Reference< beans::XVetoableChangeListener >&  )
@@ -905,89 +806,64 @@ void SwMailTransferable::removeVetoableChangeListener(
 {
 }
 
-/*-- 22.06.2004 16:46:05---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMessage::SwMailMessage() :
         cppu::WeakComponentImplHelper1< mail::XMailMessage>(m_aMutex)
 {
 }
-/*-- 22.06.2004 16:46:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMessage::~SwMailMessage()
 {
 }
-/*-- 02.07.2007 16:00:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString SwMailMessage::getSenderName() throw (uno::RuntimeException)
 {
     return m_sSenderName;
 }
-/*-- 22.06.2004 16:46:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException)
 {
     return m_sSenderAddress;
 }
-/*-- 22.06.2004 16:46:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException)
 {
     return m_sReplyToAddress;
 }
-/*-- 22.06.2004 16:46:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMessage::setReplyToAddress( const ::rtl::OUString& _replytoaddress ) throw (uno::RuntimeException)
 {
     m_sReplyToAddress = _replytoaddress;
 }
-/*-- 22.06.2004 16:46:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString SwMailMessage::getSubject() throw (uno::RuntimeException)
 {
     return m_sSubject;
 }
-/*-- 22.06.2004 16:46:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMessage::setSubject( const ::rtl::OUString& _subject ) throw (uno::RuntimeException)
 {
     m_sSubject = _subject;
 }
-/*-- 13.07.2004 09:57:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Reference< datatransfer::XTransferable > SwMailMessage::getBody() throw (uno::RuntimeException)
 {
     return m_xBody;
 }
-/*-- 13.07.2004 09:57:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMessage::setBody(
         const uno::Reference< datatransfer::XTransferable >& rBody )
                                                 throw (uno::RuntimeException)
 {
     m_xBody = rBody;
 }
-/*-- 22.06.2004 16:46:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMessage::addRecipient( const ::rtl::OUString& rRecipientAddress )
         throw (uno::RuntimeException)
 {
     m_aRecipients.realloc(m_aRecipients.getLength() + 1);
     m_aRecipients[m_aRecipients.getLength() - 1] = rRecipientAddress;
 }
-/*-- 22.06.2004 16:46:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress )
         throw (uno::RuntimeException)
 {
@@ -995,47 +871,35 @@ void  SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress )
     m_aCcRecipients[m_aCcRecipients.getLength() - 1] = rRecipientAddress;
 
 }
-/*-- 22.06.2004 16:46:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMessage::addBccRecipient( const ::rtl::OUString& rRecipientAddress ) throw (uno::RuntimeException)
 {
     m_aBccRecipients.realloc(m_aBccRecipients.getLength() + 1);
     m_aBccRecipients[m_aBccRecipients.getLength() - 1] = rRecipientAddress;
 }
-/*-- 22.06.2004 16:46:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString > SwMailMessage::getRecipients(  ) throw (uno::RuntimeException)
 {
     return m_aRecipients;
 }
-/*-- 22.06.2004 16:46:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString > SwMailMessage::getCcRecipients(  ) throw (uno::RuntimeException)
 {
     return m_aCcRecipients;
 }
-/*-- 22.06.2004 16:46:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString > SwMailMessage::getBccRecipients(  ) throw (uno::RuntimeException)
 {
     return m_aBccRecipients;
 }
-/*-- 13.07.2004 09:59:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMessage::addAttachment( const mail::MailAttachment& rMailAttachment )
             throw (uno::RuntimeException)
 {
     m_aAttachments.realloc(m_aAttachments.getLength() + 1);
     m_aAttachments[m_aAttachments.getLength() - 1] = rMailAttachment;
 }
-/*-- 13.07.2004 09:59:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< mail::MailAttachment > SwMailMessage::getAttachments(  )
                                             throw (uno::RuntimeException)
 {
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 5176779ba3b8..d5d31439ee00 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -57,9 +57,7 @@
 
 using namespace svt;
 using namespace ::com::sun::star;
-/*-- 01.04.2004 16:52:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem) :
         RoadmapWizard(&rView.GetViewFrame()->GetWindow(),
                         SW_RES(DLG_MAILMERGEWIZARD),
@@ -118,15 +116,11 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem
     ActivatePage();
     UpdateRoadmap();
 }
-/*-- 01.04.2004 16:52:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeWizard::~SwMailMergeWizard()
 {
 }
-/*-- 01.04.2004 16:52:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OWizardPage*    SwMailMergeWizard::createPage(WizardState _nState)
 {
     OWizardPage* pRet = 0;
@@ -144,9 +138,7 @@ OWizardPage*    SwMailMergeWizard::createPage(WizardState _nState)
     DBG_ASSERT(pRet, "no page created in ::createPage");
     return pRet;
 }
-/*-- 04.06.2004 13:18:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeWizard::enterState( WizardState _nState )
 {
     ::svt::RoadmapWizard::enterState( _nState );
@@ -197,9 +189,7 @@ void SwMailMergeWizard::enterState( WizardState _nState )
 
     UpdateRoadmap();
 }
-/*-- 04.06.2004 12:54:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String  SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
 {
     String sRet;
@@ -305,16 +295,12 @@ void SwMailMergeWizard::CreateTargetDocument()
     if( m_rConfigItem.GetTargetView() )
         m_rConfigItem.GetTargetView()->GetViewFrame()->GetFrame().Appear();
 }
-/*-- 23.08.2004 08:51:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeWizard::updateRoadmapItemLabel( WizardState _nState )
 {
     svt::RoadmapWizard::updateRoadmapItemLabel( _nState );
 }
 
-// ------------------------------------------------------------------------
-
 short SwMailMergeWizard::Execute()
 {
     DBG_ERROR( "SwMailMergeWizard cannot be executed via Dialog::Execute!\n"
@@ -324,8 +310,6 @@ short SwMailMergeWizard::Execute()
     return RET_CANCEL;
 }
 
-// ------------------------------------------------------------------------
-
 void SwMailMergeWizard::StartExecuteModal( const Link& rEndDialogHdl )
 {
     ::svt::RoadmapWizard::StartExecuteModal( rEndDialogHdl );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index a35b0727c1ed..77d6d999bc7e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -54,16 +54,13 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 
-//-------------------------------------------------------------------------
 void lcl_Move(Control* pCtrl, long nYOffset)
 {
     Point aPos(pCtrl->GetPosPixel());
     aPos.Y() += nYOffset;
     pCtrl->SetPosPixel(aPos);
 }
-/*-- 02.04.2004 12:46:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage(_pParent, SW_RES(DLG_MM_ADDRESSBLOCK_PAGE)),
 #ifdef MSC
@@ -112,22 +109,16 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP
     m_aPrevSetIB.SetClickHdl(aLink);
     m_aNextSetIB.SetClickHdl(aLink);
 }
-/*-- 02.04.2004 12:46:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage()
 {
 }
-/*-- 05.07.2004 13:55:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeAddressBlockPage::canAdvance() const
 {
     return m_pWizard->GetConfigItem().GetResultSet().is();
 }
-/*-- 16.06.2004 12:34:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeAddressBlockPage::ActivatePage()
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -172,18 +163,14 @@ void SwMailMergeAddressBlockPage::ActivatePage()
         InsertDataHdl_Impl(0);
     }
 }
-/*-- 27.05.2004 13:59:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool    SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
 {
     if ( ::svt::WizardTypes::eTravelForward == _eReason && !m_pWizard->GetConfigItem().GetResultSet().is() )
         return sal_False;
     return sal_True;
 }
-/*-- 07.04.2004 16:19:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl, PushButton*, EMPTYARG)
 {
     SwAddressListDialog* pAddrDialog = new SwAddressListDialog(this);
@@ -204,9 +191,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl, PushButton*, EMPTYAR
     delete pAddrDialog;
     return 0;
 }
-/*-- 07.04.2004 16:19:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
 {
     SwSelectAddressBlockDialog* pDlg =
@@ -233,9 +218,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
     GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
     return 0;
 }
-/*-- 07.04.2004 16:19:31---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -253,9 +236,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
     delete pDlg;
     return 0;
 }
-/*-- 11.06.2004 13:37:22---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeAddressBlockPage::EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective)
 {
     m_aSettingsFI.Enable(bAll);
@@ -273,9 +254,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(sal_Bool bAll, sal_Bool bSe
     m_aPrevSetIB.Enable(bSelective);
     m_aNextSetIB.Enable(bSelective);
 }
-/*-- 28.04.2004 12:45:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox)
 {
     EnableAddressBlock(pBox->IsEnabled(), pBox->IsChecked());
@@ -284,9 +263,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox)
     m_pWizard->UpdateRoadmap();
     return 0;
 }
-/*-- 08.06.2004 13:00:29---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, SwAddressPreview*, EMPTYARG)
 {
     sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress();
@@ -299,9 +276,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, SwAddressPrev
     GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
     return 0;
 }
-/*-- 31.08.2005 15:34:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, CheckBox*, pBox)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -309,7 +284,6 @@ IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, CheckBox*, pBox)
     return 0;
 }
 
-// ------------------------------------------------------------------------------
 IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton)
 {
     //if no pButton is given, the first set has to be pre-set
@@ -366,9 +340,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
     EnableAddressBlock(bHasResultSet, m_aAddressCB.IsChecked());
     return 0;
 }
-/*-- 13.04.2004 16:01:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
                 Window* pParent, SwMailMergeConfigItem& rConfig) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTADDRESSBLOCK)),
@@ -409,15 +381,11 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
     m_aPreview.SetLayout(2, 2);
     m_aPreview.EnableScrollBar();
 }
-/*-- 13.04.2004 16:01:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog()
 {
 }
-/*-- 28.04.2004 11:48:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OUString>& rBlocks,
         sal_uInt16 nSelectedAddress)
 {
@@ -426,6 +394,7 @@ void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OU
         m_aPreview.AddAddress(m_aAddressBlocks[nAddress]);
     m_aPreview.SelectAddress(nSelectedAddress);
 }
+
 /*-- 25.06.2004 10:51:36---------------------------------------------------
     return the address blocks and put the selected one to the first position
   -----------------------------------------------------------------------*/
@@ -451,9 +420,7 @@ const uno::Sequence< ::rtl::OUString >&    SwSelectAddressBlockDialog::GetAddres
     }
     return m_aAddressBlocks;
 }
-/*-- 28.04.2004 11:48:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSelectAddressBlockDialog::SetSettings(
         sal_Bool bIsCountry, ::rtl::OUString rCountry)
 {
@@ -466,9 +433,7 @@ void SwSelectAddressBlockDialog::SetSettings(
         m_aNeverRB.Check();
     m_aDeletePB.Enable(m_aAddressBlocks.getLength() > 1);
 }
-/*-- 10.05.2004 11:17:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwSelectAddressBlockDialog::GetCountry() const
 {
     ::rtl::OUString sRet;
@@ -477,9 +442,6 @@ void SwSelectAddressBlockDialog::SetSettings(
     return sRet;
 }
 
-/*-- 13.04.2004 16:02:32---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton)
 {
     if(m_aAddressBlocks.getLength())
@@ -500,9 +462,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
-/*-- 13.04.2004 16:02:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton)
 {
     bool bCustomize = pButton == &m_aCustomizePB;
@@ -537,24 +497,17 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton
     delete pDlg;
     return 0;
 }
-/*-- 13.04.2004 16:02:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, RadioButton*, pButton)
 {
     m_aCountryED.Enable(&m_aDependentRB == pButton);
     return 0;
 }
 
-/* -----------------------------28.02.05 09:00--------------------------------
-
- ---------------------------------------------------------------------------*/
 SwRestrictedComboBox::~SwRestrictedComboBox()
 {
 }
-/* -----------------------------28.02.05 09:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
 {
     BOOL bCallParent = TRUE;
@@ -567,9 +520,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
     if(bCallParent)
         ComboBox::KeyInput(rEvt);
 }
-/* -----------------------------28.02.05 09:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwRestrictedComboBox::Modify()
 {
     Selection aSel = GetSelection();
@@ -590,9 +541,6 @@ void SwRestrictedComboBox::Modify()
         GetModifyHdl().Call(this);
 }
 
-/*-- 13.04.2004 16:01:08---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 #define USER_DATA_SALUTATION        -1
 #define USER_DATA_PUNCTUATION       -2
 #define USER_DATA_TEXT              -3
@@ -694,23 +642,17 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
     m_aDownIB.SetClickHdl(aImgButtonHdl);
     UpdateImageButtons_Impl();
 }
-/*-- 13.04.2004 16:01:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCustomizeAddressBlockDialog::~SwCustomizeAddressBlockDialog()
 {
 }
-/*-- 07.06.2004 13:51:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, OKHdl_Impl, OKButton*, EMPTYARG)
 {
     EndDialog(RET_OK);
     return 0;
 }
-/*-- 24.06.2004 11:36:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox)
 {
     sal_Int32 nUserData = (sal_Int32)(sal_IntPtr)pBox->FirstSelected()->GetUserData();
@@ -718,9 +660,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox
     m_aInsertFieldIB.Enable(nUserData >= 0 || !HasItem_Impl(nUserData));
     return 0;
 }
-/*-- 25.06.2004 11:21:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, AddressMultiLineEdit*, EMPTYARG)
 {
     String sAddress = SwAddressPreview::FillData(
@@ -730,9 +670,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, AddressMultiLineEdi
     UpdateImageButtons_Impl();
     return 0;
 }
-/*-- 25.06.2004 12:14:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pButton)
 {
     if(&m_aInsertFieldIB == pButton)
@@ -764,9 +702,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pBut
     UpdateImageButtons_Impl();
     return 0;
 }
-/*-- 01.07.2004 09:27:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
 {
     sal_Int32 nRet = USER_DATA_NONE;
@@ -784,9 +720,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
         }
     return nRet;
 }
-/*-- 01.07.2004 10:01:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool   SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData)
 {
     //get the entry from the ListBox
@@ -808,9 +742,7 @@ bool   SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData)
     bool bRet = sText.Search(sEntry) != STRING_NOTFOUND;
     return bRet;
 }
-/*-- 25.06.2004 13:10:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit*, pEdit)
 {
     // called in case the selection of the edit field changes.
@@ -863,9 +795,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiL
     bOnEntry = false;
     return 0;
 }
-/*-- 25.06.2004 13:36:29---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, ComboBox*, EMPTYARG)
 {
     //changing the field content changes the related members, too
@@ -888,9 +818,6 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, ComboBox*, EMPTYAR
     return 0;
 }
 
-/*-- 25.06.2004 12:35:51---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
 {
     sal_uInt16 nMove = m_aDragED.IsCurrentItemMoveable();
@@ -903,18 +830,14 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
     m_aInsertFieldIB.Enable( pEntry &&
             (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || m_aFieldCB.GetText().Len()));
 }
-/*-- 28.04.2004 12:04:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
 {
     m_aDragED.SetText( rAddress );
     UpdateImageButtons_Impl();
     m_aDragED.Modify();
 }
-/*-- 28.04.2004 12:04:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString SwCustomizeAddressBlockDialog::GetAddress()
 {
     String sAddress(m_aDragED.GetAddress());
@@ -938,9 +861,7 @@ void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
     }
     return sAddress;
 }
-/*-- 28.02.2005 11:03:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext )
 {
     ::std::vector< Window* > aControls;
@@ -1007,9 +928,7 @@ void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext )
     }
 
 }
-/*-- 13.04.2004 17:49:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwAssignFieldsControl : public Control
 {
     friend class SwAssignFieldsDialog;
@@ -1048,10 +967,7 @@ public:
                     m_aModifyHdl.Call(this);
                 }
 };
-/*-- 13.04.2004 17:51:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
-//-------------------------------------------------------------------------
 SwAssignFieldsControl::SwAssignFieldsControl(
         Window* pParent, const ResId& rResId, SwMailMergeConfigItem& rConfigItem) :
     Control(pParent, rResId),
@@ -1167,9 +1083,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
     m_aVScroll.SetSizePixel(Size(m_aVScroll.GetSizePixel().Width(), aOutputSize.Height() - nHBHeight));
 
 }
-/*-- 13.04.2004 17:51:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAssignFieldsControl::~SwAssignFieldsControl()
 {
     ::std::vector<FixedInfo*>::iterator aFIIter;
@@ -1182,9 +1096,6 @@ SwAssignFieldsControl::~SwAssignFieldsControl()
         delete *aFIIter;
 }
 
-/*-- 07.05.2004 13:11:26---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwAssignFieldsControl::Command( const CommandEvent& rCEvt )
 {
     switch ( rCEvt.GetCommand() )
@@ -1204,9 +1115,7 @@ void SwAssignFieldsControl::Command( const CommandEvent& rCEvt )
             Control::Command(rCEvt);
     }
 }
-/*-- 07.05.2004 13:11:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt )
 {
     if(rNEvt.GetType() == EVENT_COMMAND)
@@ -1221,9 +1130,7 @@ long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt )
     }
     return Control::PreNotify(rNEvt);
 }
-/*-- 03.09.2004 13:19:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex )
 {
     long nThumb = m_aVScroll.GetThumbPos();
@@ -1236,9 +1143,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex )
         return;
     ScrollHdl_Impl( &m_aVScroll );
 }
-/*-- 30.04.2004 16:10:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
 {
     long nThumb = pScroll->GetThumbPos();
@@ -1263,9 +1168,6 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
     return 0;
 }
 
-/*-- 03.05.2004 15:37:52---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
 {
     String sColumn = pBox->GetSelectEntry();
@@ -1301,9 +1203,7 @@ IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
     m_aModifyHdl.Call(0);
     return 0;
 }
-/*-- 03.09.2004 13:16:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox)
 {
     if(0 != (GETFOCUS_TAB & pBox->GetGetFocusFlags()))
@@ -1321,9 +1221,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox)
     }
     return 0;
 }
-/*-- 13.04.2004 17:44:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAssignFieldsDialog::SwAssignFieldsDialog(
         Window* pParent, SwMailMergeConfigItem& rConfigItem,
         const ::rtl::OUString& rPreview,
@@ -1375,16 +1273,12 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
 
     m_aOK.SetClickHdl(LINK(this, SwAssignFieldsDialog, OkHdl_Impl));
 }
-/*-- 13.04.2004 17:44:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwAssignFieldsDialog::~SwAssignFieldsDialog()
 {
     delete m_pFieldsControl;
 }
-/*-- 05.05.2004 14:39:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
 {
     uno::Sequence< ::rtl::OUString > aAssignments(
@@ -1404,9 +1298,7 @@ uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
     }
     return aAssignments;
 }
-/*-- 03.05.2004 18:04:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG)
 {
     m_rConfigItem.SetColumnAssignment(
@@ -1415,9 +1307,7 @@ IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG)
     EndDialog(RET_OK);
     return 0;
 }
-/*-- 05.05.2004 14:37:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, void*, EMPTYARG)
 {
     uno::Sequence< ::rtl::OUString > aAssignments = CreateAssignments();
@@ -1427,9 +1317,6 @@ IMPL_LINK(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, void*, EMPTYARG)
     return 0;
 }
 
-/*-- 26.05.2004 11:20:11---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId) :
         SvTreeListBox(pParent, rResId),
         m_pParentDialog(pParent)
@@ -1446,15 +1333,11 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId)
     Show();
 
 }
-/*-- 26.05.2004 11:20:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 DDListBox::~DDListBox()
 {
 }
-/*-- 26.05.2004 11:20:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
 {
     SvLBoxEntry* pEntry = GetCurEntry();
@@ -1482,9 +1365,7 @@ void  DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
         }
     }
 }
-/*-- 26.05.2004 13:14:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 AddressMultiLineEdit::AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId& rResId) :
     MultiLineEdit(pParent, rResId),
     m_pParentDialog(pParent)
@@ -1495,16 +1376,12 @@ AddressMultiLineEdit::AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParen
     //DisableSelectionOnFocus();
     EnableFocusSelectionHide(FALSE);
 }
-/*-- 26.05.2004 13:14:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 AddressMultiLineEdit::~AddressMultiLineEdit()
 {
     EndListening(*GetTextEngine());
 }
-/*-- 25.06.2004 13:02:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if(rHint.ISA(TextHint) &&
@@ -1514,9 +1391,7 @@ void    AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rH
         m_aSelectionLink.Call(this);
     }
 }
-/*-- 26.05.2004 13:45:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 long  AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
 {
     long nHandled = 0;
@@ -1541,9 +1416,7 @@ long  AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 
 }
-/*-- 25.06.2004 08:20:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void AddressMultiLineEdit::SetText( const String& rStr )
 {
     MultiLineEdit::SetText(rStr);
@@ -1588,7 +1461,6 @@ void AddressMultiLineEdit::SetText( const String& rStr )
 
 /*-- 25.06.2004 12:32:41---------------------------------------------------
     Insert the new entry in front of the entry at the beginning of the selection
-
   -----------------------------------------------------------------------*/
 void AddressMultiLineEdit::InsertNewEntry( const String& rStr )
 {
@@ -1626,9 +1498,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition( const String& rStr, ULONG n
     pTextView->SetSelection(aEntrySel);
     m_aSelectionLink.Call(this);
 }
-/*-- 25.06.2004 12:32:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void AddressMultiLineEdit::RemoveCurrentEntry()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1648,9 +1518,7 @@ void AddressMultiLineEdit::RemoveCurrentEntry()
         Modify();
     }
 }
-/*-- 25.06.2004 12:32:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove)
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1723,9 +1591,7 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove)
         Modify();
     }
 }
-/*-- 25.06.2004 12:32:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt16  AddressMultiLineEdit::IsCurrentItemMoveable()
 {
     sal_uInt16 nRet = 0;
@@ -1747,9 +1613,7 @@ sal_uInt16  AddressMultiLineEdit::IsCurrentItemMoveable()
     }
     return nRet;
 }
-/*-- 25.06.2004 12:32:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool AddressMultiLineEdit::HasCurrentItem()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1760,9 +1624,7 @@ bool AddressMultiLineEdit::HasCurrentItem()
             (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex()
                             && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex()));
 }
-/*-- 01.07.2004 09:07:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String AddressMultiLineEdit::GetCurrentItem()
 {
     String sRet;
@@ -1780,9 +1642,7 @@ String AddressMultiLineEdit::GetCurrentItem()
     }
     return sRet;
 }
-/*-- 05.07.2004 14:29:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void AddressMultiLineEdit::SelectCurrentItem()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1824,4 +1684,3 @@ String AddressMultiLineEdit::GetAddress()
     }
     return sRet;
 }
-
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 3c4fc31bb157..52103af18862 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -78,9 +78,6 @@ const char* cDataCommandType            = "DataSource/DataCommandType";
 #define DEFAULT_PORT    25
 #define POP_PORT        110
 
-/*-- 16.04.2004 09:41:36---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 struct DBAddressDataAssignment
 {
     SwDBData                            aDBData;
@@ -95,9 +92,6 @@ struct DBAddressDataAssignment
         {}
 };
 
-/*-- 16.04.2004 09:43:29---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class SwMailMergeConfigItem_Impl : public utl::ConfigItem
 {
     friend class SwMailMergeConfigItem;
@@ -198,9 +192,6 @@ public:
 
 };
 
-/*-- 06.05.2004 12:51:54---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
     ConfigItem(C2U("Office.Writer/MailMergeWizard"), 0),
         nResultSetCursorPos(-1),
@@ -368,15 +359,11 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
     }
 
 }
-/*-- 06.05.2004 12:51:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem_Impl::~SwMailMergeConfigItem_Impl()
 {
 }
-/*-- 13.03.2006 12:12:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
 {
     if(aAddressBlocks.size() >= sal::static_int_cast<sal_uInt32, sal_Int32>(nSet))
@@ -385,9 +372,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
         SetModified();
     }
 }
-/*-- 16.04.2004 13:06:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
 {
     const OUString* pNames = rAssignments.getConstArray();
@@ -416,7 +401,7 @@ OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
     rAssignments.getArray()[rAssignments.getLength() - 1] = sNewName;
     return sNewName;
 }
-// --------------------------------------------------------------------------------
+
 void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
 {
     //convert the strings used for UI to numbers used for the configuration
@@ -433,7 +418,7 @@ void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
     }
     rBlock = sBlock;
 }
-// --------------------------------------------------------------------------------
+
 void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
 {
     //convert the numbers used for the configuration to strings used for UI to numbers
@@ -468,9 +453,6 @@ void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
     rBlock = sBlock;
 }
 
-/*--------------------------------------------------------------------
-
- --------------------------------------------------------------------*/
 const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -528,9 +510,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
     }
     return aNames;
 }
-/*-- 15.04.2004 08:48:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
 
 void  SwMailMergeConfigItem_Impl::Commit()
@@ -655,9 +635,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
 
     bUserSettingWereOverwritten = sal_False;
 }
-/*-- 06.05.2004 13:04:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
         sal_Bool bConvertToConfig) const
 {
@@ -671,9 +649,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
     }
     return aRet;
 }
-/*-- 06.05.2004 13:04:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetAddressBlocks(
         const Sequence< ::rtl::OUString>& rBlocks,
         sal_Bool bConvertFromConfig)
@@ -689,9 +665,7 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks(
     nCurrentAddressBlock = 0;
     SetModified();
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
         SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const
 {
@@ -709,9 +683,7 @@ const Sequence< ::rtl::OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
     }
     return aRet;
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem_Impl::SetGreetings(
         SwMailMergeConfigItem::Gender eType,
         const Sequence< ::rtl::OUString>& rSetGreetings,
@@ -732,9 +704,7 @@ void  SwMailMergeConfigItem_Impl::SetGreetings(
     }
     SetModified();
 }
-/*-- 11.05.2004 13:13:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
                             SwMailMergeConfigItem::Gender eType) const
 {
@@ -747,9 +717,7 @@ sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
     }
     return nRet;
 }
-/*-- 11.05.2004 13:13:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
         SwMailMergeConfigItem::Gender eType, sal_Int32 nIndex)
 {
@@ -775,9 +743,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
 static SwMailMergeConfigItem_Impl* pOptions = NULL;
 static sal_Int32            nRefCount = 0;
 static ::osl::Mutex aMutex;
-/*-- 15.04.2004 08:42:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem::SwMailMergeConfigItem() :
     m_bAddressInserted(false),
     m_bMergeDone(false),
@@ -795,9 +761,7 @@ SwMailMergeConfigItem::SwMailMergeConfigItem() :
     ++nRefCount;
     m_pImpl = pOptions;
 }
-/*-- 15.04.2004 08:43:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem::~SwMailMergeConfigItem()
 {
     // Global access, must be guarded (multithreading)
@@ -807,46 +771,34 @@ SwMailMergeConfigItem::~SwMailMergeConfigItem()
         DELETEZ( pOptions );
     }
 }
-/*-- 06.05.2004 14:18:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::Commit()
 {
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
 }
-/*-- 06.05.2004 12:59:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ResStringArray&   SwMailMergeConfigItem::GetDefaultAddressHeaders() const
 {
     return m_pImpl->m_AddressHeaderSA;
 }
-/*-- 27.04.2004 14:34:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetAddressBlocks(
         const Sequence< ::rtl::OUString>& rBlocks)
 {
     m_pImpl->SetAddressBlocks(rBlocks);
 }
-/*-- 27.04.2004 14:34:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetAddressBlocks() const
 {
     return m_pImpl->GetAddressBlocks();
 }
-/*-- 11.05.2004 17:08:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsAddressBlock()const
 {
     return m_pImpl->bIsAddressBlock && IsOutputToLetter();
 }
-/*-- 11.05.2004 17:08:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
 {
     m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -857,16 +809,11 @@ void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
     }
 }
 
-/*-- 30.08.2005 15:09:46---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsHideEmptyParagraphs() const
 {
     return m_pImpl->bIsHideEmptyParagraphs;
 }
-/*-- 30.08.2005 15:09:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
 {
     if(m_pImpl->bIsHideEmptyParagraphs != bSet)
@@ -875,23 +822,17 @@ void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const
 {
     return m_pImpl->bIncludeCountry;
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 rtl::OUString& SwMailMergeConfigItem::GetExcludeCountry() const
 {
     return m_pImpl->sExcludeCountry;
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUString& rCountry)
 {
     if(m_pImpl->sExcludeCountry != rCountry ||
@@ -903,9 +844,6 @@ void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUStrin
     }
 }
 
-/*-- 28.04.2004 15:35:16---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentConnection(
         Reference< XDataSource>       xSource,
         SharedConnection              xConnection,
@@ -920,23 +858,17 @@ void SwMailMergeConfigItem::SetCurrentConnection(
         m_pImpl->nResultSetCursorPos = 0;
         m_pImpl->SetModified();
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XDataSource>  SwMailMergeConfigItem::GetSource()
 {
     return m_pImpl->xSource;
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SharedConnection SwMailMergeConfigItem::GetConnection()
 {
     return m_pImpl->xConnection;
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
 {
     if(!m_pImpl->xColumnsSupplier.is() && m_pImpl->xConnection.is())
@@ -948,17 +880,12 @@ Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
     }
     return m_pImpl->xColumnsSupplier;
 }
-/*-- 30.04.2004 14:30:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SwDBData&    SwMailMergeConfigItem::GetCurrentDBData() const
 {
     return m_pImpl->aDBData;
 }
 
-/*-- 17.06.2004 13:18:47---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
 {
     if(m_pImpl->aDBData != rDBData)
@@ -970,9 +897,7 @@ void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
         m_pImpl->SetModified();
     }
 }
-/*-- 29.04.2004 11:34:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XResultSet>   SwMailMergeConfigItem::GetResultSet() const
 {
     if(!m_pImpl->xConnection.is() && m_pImpl->aDBData.sDataSource.getLength())
@@ -1019,9 +944,7 @@ Reference< XResultSet>   SwMailMergeConfigItem::GetResultSet() const
     }
     return m_pImpl->xResultSet;
 }
-/*-- 13.08.2004 11:49:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::DisposeResultSet()
 {
     m_pImpl->xConnection.clear();
@@ -1030,16 +953,12 @@ void SwMailMergeConfigItem::DisposeResultSet()
         ::comphelper::disposeComponent( m_pImpl->xResultSet );
     }
 }
-/*-- 14.05.2004 15:07:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString&    SwMailMergeConfigItem::GetFilter() const
 {
     return m_pImpl->sFilter;
 }
-/*-- 14.05.2004 15:07:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
 {
     if(m_pImpl->sFilter != rFilter)
@@ -1063,9 +982,7 @@ void  SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
         }
     }
 }
-/*-- 29.04.2004 11:55:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
 {
     if(!m_pImpl->xResultSet.is())
@@ -1100,9 +1017,6 @@ sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
     return m_pImpl->nResultSetCursorPos;
 }
 
-/*-- 27.05.2004 13:56:18---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast)
 {
     bool bRet = false;
@@ -1122,16 +1036,12 @@ bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast)
     }
     return bRet;
 }
-/*-- 29.04.2004 11:55:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() const
 {
     return m_pImpl->nResultSetCursorPos;
 }
-/*-- 27.05.2004 14:49:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
 {
     bool bRet = false;
@@ -1143,9 +1053,7 @@ bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
     }
     return bRet;
 }
-/*-- 27.05.2004 14:49:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
 {
     //nRecord is based on 1
@@ -1184,9 +1092,7 @@ void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
         }
     }
 }
-/*-- 27.05.2004 15:08:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Sequence< Any > SwMailMergeConfigItem::GetSelection() const
 {
     Sequence< Any > aRet(m_aSelection.getLength());
@@ -1204,17 +1110,13 @@ Sequence< Any > SwMailMergeConfigItem::GetSelection() const
     aRet.realloc(nRetIndex);
     return aRet;
 }
-/*-- 16.06.2004 15:15:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const uno::Sequence< ::rtl::OUString>&
                     SwMailMergeConfigItem::GetSavedDocuments() const
 {
     return m_pImpl->aSavedDocuments;
 }
-/*-- 16.06.2004 15:15:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
 {
     const ::rtl::OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray();
@@ -1233,16 +1135,12 @@ void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
         m_pImpl->aSavedDocuments[m_pImpl->aSavedDocuments.getLength() - 1] = rName;
     }
 }
-/*-- 28.04.2004 16:15:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsOutputToLetter()const
 {
     return m_pImpl->bIsOutputToLetter || !IsMailAvailable();
 }
-/*-- 28.04.2004 16:15:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
 {
     if(m_pImpl->bIsOutputToLetter != bSet)
@@ -1251,18 +1149,14 @@ void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsIndividualGreeting(sal_Bool bInEMail) const
 {
     return bInEMail ?
             m_pImpl->bIsIndividualGreetingLineInMail :
             m_pImpl->bIsIndividualGreetingLine;
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetIndividualGreeting(
                                         sal_Bool bSet, sal_Bool bInEMail)
 {
@@ -1283,16 +1177,12 @@ void     SwMailMergeConfigItem::SetIndividualGreeting(
         }
     }
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsGreetingLine(sal_Bool bInEMail) const
 {
     return bInEMail ? m_pImpl->bIsGreetingLineInMail : m_pImpl->bIsGreetingLine;
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail)
 {
     m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -1313,48 +1203,35 @@ void     SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail
         }
     }
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString>   SwMailMergeConfigItem::GetGreetings(
         Gender eType ) const
 {
     return m_pImpl->GetGreetings(eType);
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetGreetings(
         Gender eType, const Sequence< ::rtl::OUString>& rSetGreetings)
 {
     m_pImpl->SetGreetings( eType, rSetGreetings);
 }
 
-/*-- 11.05.2004 13:10:54---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetCurrentGreeting(
                         SwMailMergeConfigItem::Gender eType) const
 {
     return m_pImpl->GetCurrentGreeting(eType);
 }
-/*-- 11.05.2004 13:10:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentGreeting(Gender eType, sal_Int32 nIndex)
 {
     m_pImpl->SetCurrentGreeting(eType, nIndex);
 }
-/*-- 12.05.2004 12:29:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ::rtl::OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const
 {
     return m_pImpl->sFemaleGenderValue;
 }
-/*-- 12.05.2004 12:29:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
 {
     if( m_pImpl->sFemaleGenderValue != rValue )
@@ -1364,9 +1241,6 @@ void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
     }
 }
 
-/*-- 30.04.2004 13:25:41---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
                 const SwDBData& rDBData ) const
 {
@@ -1383,6 +1257,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
     }
     return aRet;
 }
+
 /*-- 21.05.2004 12:31:31---------------------------------------------------
     returns the name that is assigned as e-mail column of the current data base
   -----------------------------------------------------------------------*/
@@ -1396,9 +1271,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
         sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn);
     return sRet;
 }
-/*-- 30.04.2004 13:25:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
                             const Sequence< ::rtl::OUString>& rList)
 {
@@ -1429,9 +1302,6 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
     m_pImpl->SetModified();
 }
 
-/*-- 07.09.2005 11:50:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
 {
     bool bResult = true;
@@ -1477,9 +1347,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
     }
     return bResult;
 }
-/*-- 07.09.2005 11:50:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
 {
     bool bResult = true;
@@ -1538,16 +1406,12 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
     }
     return bResult;
 }
-/*-- 05.05.2004 16:10:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailDisplayName() const
 {
     return m_pImpl->sMailDisplayName;
 }
-/*-- 05.05.2004 16:10:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
 {
     if(m_pImpl->sMailDisplayName != rName)
@@ -1556,16 +1420,12 @@ void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailAddress() const
 {
     return m_pImpl->sMailAddress;
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
 {
     if(m_pImpl->sMailAddress != rAddress )
@@ -1575,16 +1435,11 @@ void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
     }
 }
 
-/*-- 07.05.2004 12:40:59---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsMailReplyTo() const
 {
     return m_pImpl->bIsMailReplyTo;
 }
-/*-- 07.05.2004 12:40:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
 {
     if(m_pImpl->bIsMailReplyTo != bSet)
@@ -1593,16 +1448,12 @@ void  SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailReplyTo() const
 {
     return m_pImpl->sMailReplyTo;
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
 {
     if(m_pImpl->sMailReplyTo != rReplyTo)
@@ -1611,16 +1462,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString  SwMailMergeConfigItem::GetMailServer() const
 {
     return m_pImpl->sMailServer;
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
 {
     if(m_pImpl->sMailServer != rAddress)
@@ -1629,18 +1476,14 @@ void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int16 SwMailMergeConfigItem::GetMailPort() const
 {
     return m_pImpl->bIsDefaultPort ?
              (m_pImpl->bIsSecureConnection ? SECURE_PORT : DEFAULT_PORT) :
              m_pImpl->nMailPort;
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
 {
     if(m_pImpl->nMailPort != nSet || m_pImpl->bIsDefaultPort)
@@ -1650,16 +1493,12 @@ void     SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsSecureConnection() const
 {
     return m_pImpl->bIsSecureConnection;
 }
-/*-- 05.05.2004 16:10:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
 {
     if(m_pImpl->bIsSecureConnection != bSet)
@@ -1668,16 +1507,12 @@ void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsAuthentication() const
 {
     return m_pImpl->bIsAuthentication;
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
 {
     if(m_pImpl->bIsAuthentication != bSet)
@@ -1686,16 +1521,12 @@ void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailUserName() const
 {
     return m_pImpl->sMailUserName;
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
 {
     if(m_pImpl->sMailUserName != rName)
@@ -1704,16 +1535,12 @@ void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailPassword() const
 {
     return m_pImpl->sMailPassword;
 }
-/*-- 05.05.2004 16:10:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
 {
     if(m_pImpl->sMailPassword != rPassword)
@@ -1722,16 +1549,12 @@ void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsSMTPAfterPOP() const
 {
     return m_pImpl->bIsSMPTAfterPOP;
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
 {
     if( m_pImpl->bIsSMPTAfterPOP != bSet)
@@ -1740,16 +1563,12 @@ void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerName() const
 {
     return m_pImpl->sInServerName;
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
 {
     if(m_pImpl->sInServerName != rServer)
@@ -1758,16 +1577,12 @@ void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int16           SwMailMergeConfigItem::GetInServerPort() const
 {
     return m_pImpl->nInServerPort;
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
 {
     if( m_pImpl->nInServerPort != nSet)
@@ -1776,16 +1591,12 @@ void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 20.08.2004 08:52:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsInServerPOP() const
 {
     return m_pImpl->bInServerPOP;
 }
-/*-- 20.08.2004 08:52:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
 {
     if( m_pImpl->bInServerPOP != bSet)
@@ -1794,16 +1605,12 @@ void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerUserName() const
 {
     return m_pImpl->sInServerUserName;
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
 {
     if( m_pImpl->sInServerUserName != rName)
@@ -1812,16 +1619,12 @@ void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerPassword() const
 {
     return m_pImpl->sInServerPassword;
 }
-/*-- 19.08.2004 14:45:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword)
 {
     if(m_pImpl->sInServerPassword != rPassword)
@@ -1831,9 +1634,6 @@ void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword
     }
 }
 
-/*-- 02.09.2004 14:43:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::DocumentReloaded()
 {
     m_bMergeDone = false;
@@ -1841,38 +1641,28 @@ void SwMailMergeConfigItem::DocumentReloaded()
     m_bAddressInserted = false;
     m_rAddressBlockFrame = ::rtl::OUString();
 }
-/*-- 16.06.2004 12:24:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsMailAvailable() const
 {
     return m_pImpl->bIsEMailSupported;
 }
-/*-- 21.05.2004 12:20:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo)
 {
     m_pImpl->aMergeInfos.push_back(rInfo);
 }
-/*-- 21.05.2004 12:20:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwDocMergeInfo& SwMailMergeConfigItem::GetDocumentMergeInfo(sal_uInt32 nDocument)
 {
     DBG_ASSERT(m_pImpl->aMergeInfos.size() > nDocument,"invalid document index");
     return m_pImpl->aMergeInfos[nDocument];
 }
-/*-- 14.06.2004 11:46:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt32 SwMailMergeConfigItem::GetMergedDocumentCount() const
 {
     return m_pImpl->aMergeInfos.size();
 }
-/*-- 11.06.2004 10:38:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView* lcl_ExistsView(SwView* pView)
 {
     const TypeId aType(TYPE(SwView));
@@ -1886,9 +1676,7 @@ SwView* lcl_ExistsView(SwView* pView)
     }
     return 0;
 }
-/*-- 16.06.2004 15:02:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView*  SwMailMergeConfigItem::GetTargetView()
 {
     //make sure that the pointer is really valid - the document may have been closed manually
@@ -1898,9 +1686,7 @@ SwView*  SwMailMergeConfigItem::GetTargetView()
     }
     return m_pTargetView;
 }
-/*-- 02.09.2004 17:04:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetTargetView(SwView* pView)
 {
     m_pTargetView = pView;
@@ -1910,17 +1696,13 @@ void  SwMailMergeConfigItem::SetTargetView(SwView* pView)
         m_pImpl->aMergeInfos.clear();
     }
 }
-/*-- 16.06.2004 15:02:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView* SwMailMergeConfigItem::GetSourceView()
 {
     m_pSourceView = lcl_ExistsView(m_pSourceView);
     return m_pSourceView;
 }
 
-/*-- 04.11.2004 19:53 ---------------------------------------------------
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetSourceView(SwView* pView)
 {
     m_pSourceView = pView;
@@ -1966,16 +1748,11 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView)
     }
 }
 
-/*-- 13.03.2006 12:15:06---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentAddressBlockIndex( sal_Int32 nSet )
 {
     m_pImpl->SetCurrentAddressBlockIndex( nSet );
 }
-/*-- 13.03.2006 12:15:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetCurrentAddressBlockIndex() const
 {
     return m_pImpl->GetCurrentAddressBlockIndex();
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index ec21bc830097..5803faf6178b 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -59,9 +59,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace svt;
 
-/*-- 02.04.2004 09:40:14---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent ) :
     svt::OWizardPage(_pParent, SW_RES(DLG_MM_DOCSELECT_PAGE)),
 #ifdef MSC
@@ -112,16 +109,10 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent
     }
 }
 
-/*-- 02.04.2004 09:40:14---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
 {
 }
 
-/*-- 05.04.2004 14:21:48---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, RadioButton*, pButton)
 {
     m_aRecentDocLB.Enable(&m_aRecentDocRB == pButton);
@@ -131,9 +122,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, RadioButton*, pButton)
 
     return 0;
 }
-/*-- 05.04.2004 14:25:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
 {
     bool bTemplate = &m_aBrowseTemplatePB == pButton;
@@ -192,9 +181,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
     return 0;
 }
 
-/*-- 06.04.2004 12:52:24---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
 {
     sal_Bool bReturn = sal_False;
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 7281880c593d..b6a84721977e 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -47,7 +47,7 @@
 using namespace svt;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-// -----------------------------------------------------------------------
+
 void lcl_FillGreetingsBox(ListBox& rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
@@ -57,7 +57,7 @@ void lcl_FillGreetingsBox(ListBox& rBox,
         rBox.InsertEntry(rEntries[nEntry]);
     rBox.SelectEntryPos((USHORT)rConfig.GetCurrentGreeting(eType));
 }
-// -----------------------------------------------------------------------
+
 void lcl_FillGreetingsBox(ComboBox& rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
@@ -67,7 +67,7 @@ void lcl_FillGreetingsBox(ComboBox& rBox,
         rBox.InsertEntry(rEntries[nEntry]);
     rBox.SelectEntryPos((USHORT)rConfig.GetCurrentGreeting(eType));
 }
-// -----------------------------------------------------------------------
+
 void lcl_StoreGreetingsBox(ListBox& rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
@@ -79,7 +79,7 @@ void lcl_StoreGreetingsBox(ListBox& rBox,
     rConfig.SetGreetings(eType, aEntries);
     rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
 }
-// -----------------------------------------------------------------------
+
 void lcl_StoreGreetingsBox(ComboBox& rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
@@ -91,9 +91,7 @@ void lcl_StoreGreetingsBox(ComboBox& rBox,
     rConfig.SetGreetings(eType, aEntries);
     rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
 }
-/*-- 30.04.2004 10:42:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwGreetingsHandler, IndividualHdl_Impl, CheckBox*, EMPTYARG)
 {
     BOOL bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked();
@@ -118,9 +116,7 @@ IMPL_LINK(SwGreetingsHandler, IndividualHdl_Impl, CheckBox*, EMPTYARG)
     UpdatePreview();
     return 0;
 }
-/*-- 30.04.2004 10:42:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton)
 {
     SwCustomizeAddressBlockDialog* pDlg =
@@ -142,16 +138,12 @@ IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton)
     delete pDlg;
     return 0;
 }
-/*-- 16.06.2004 10:56:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SwGreetingsHandler::UpdatePreview()
 {
     //the base class does nothing
 }
-/*-- 30.04.2004 10:42:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton)
 {
     String sPreview = m_aFemaleLB.GetSelectEntry();
@@ -168,17 +160,13 @@ IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton)
     delete pDlg;
     return 0;
 }
-/*-- 05.05.2004 15:25:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, ListBox*, EMPTYARG)
 {
     UpdatePreview();
     return 0;
 }
-/*-- 05.05.2004 15:23:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeGreetingsPage::UpdatePreview()
 {
     //find out which type of greeting should be selected:
@@ -233,9 +221,7 @@ void SwMailMergeGreetingsPage::UpdatePreview()
     sPreview = SwAddressPreview::FillData(sPreview, m_pWizard->GetConfigItem());
     m_aPreviewWIN.SetAddress(sPreview);
 }
-/*-- 17.05.2004 15:44:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
 {
     m_pPersonalizedCB->Enable(bContainsGreeting);
@@ -255,9 +241,7 @@ void    SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
     m_pNeutralFT->Enable(bContainsGreeting);
     m_pNeutralCB->Enable(bContainsGreeting);
 }
-/*-- 02.04.2004 14:17:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage(_pParent, SW_RES(DLG_MM_GREETINGS_PAGE)),
 #ifdef MSC
@@ -353,15 +337,11 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent)
     sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(1));
     m_aDocumentIndexFI.SetText(sTemp);
 }
-/*-- 02.04.2004 14:17:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeGreetingsPage::~SwMailMergeGreetingsPage()
 {
 }
-/*-- 18.06.2004 12:13:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeGreetingsPage::ActivatePage()
 {
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
@@ -387,9 +367,7 @@ void SwMailMergeGreetingsPage::ActivatePage()
     UpdatePreview();
     m_pWizard->enableButtons(WZB_NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE));
 }
-/*-- 11.05.2004 14:47:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool    SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason )
 {
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
@@ -421,9 +399,7 @@ sal_Bool    SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
     rConfig.SetIndividualGreeting(m_aPersonalizedCB.IsChecked(), sal_False);
     return sal_True;
 }
-/*-- 30.04.2004 10:42:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
 {
     sal_Bool bContainsGreeting = pBox->IsChecked();
@@ -439,9 +415,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
     m_pWizard->UpdateRoadmap();
     return 0;
 }
-/*-- 07.05.2004 12:56:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
 {
     //if no pButton is given, the first set has to be pre-set
@@ -473,9 +447,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
     m_aDocumentIndexFI.SetText(sTemp);
     return 0;
 }
-/*-- 17.05.2004 15:11:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_MAILBODY)),
 #ifdef MSC
@@ -570,25 +542,18 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard)
     m_aFemaleFieldCB.SetText(rConfig.GetFemaleGenderValue());
     m_aFemaleFieldCB.SaveValue();
 }
-/*-- 17.05.2004 15:13:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailBodyDialog::~SwMailBodyDialog()
 {
 }
 
-/*-- 30.04.2004 10:42:57---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, CheckBox*, pBox)
 {
     SwGreetingsHandler::Contains(pBox->IsChecked());
     m_pWizard->GetConfigItem().SetGreetingLine(pBox->IsChecked(), sal_True);
     return 0;
 }
-/*-- 28.06.2004 11:22:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailBodyDialog, OKHdl, PushButton*, EMPTYARG)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -616,4 +581,3 @@ IMPL_LINK(SwMailBodyDialog, OKHdl, PushButton*, EMPTYARG)
     EndDialog(RET_OK);
     return 0;
 }
-
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index d9ae7b9c518f..bd44b56a0805 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -84,9 +84,6 @@ using namespace ::com::sun::star::view;
 #define DEFAULT_ADDRESS_WIDTH  (MM50*15)// 7,5 cm
 #define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
 
-/*-- 15.04.2004 08:16:35---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
 #ifdef MSC
@@ -179,18 +176,14 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
     m_aAlignToBodyCB.SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl));
     m_aAlignToBodyCB.Check();
 }
-/*-- 15.04.2004 08:17:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeLayoutPage::~SwMailMergeLayoutPage()
 {
     delete m_pExampleFrame;
     File::remove( m_sExampleURL );
 
 }
-/*-- 27.05.2004 13:41:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeLayoutPage::ActivatePage()
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -251,9 +244,7 @@ void SwMailMergeLayoutPage::ActivatePage()
 
     }
 }
-/*-- 11.05.2004 10:41:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
 {
     //now insert the frame and the greeting
@@ -270,9 +261,7 @@ sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason
     }
     return sal_True;
 }
-/*-- 24.06.2004 09:50:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwFrmFmt*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
         SwMailMergeConfigItem& rConfigItem,
         const Point& rAddressPosition,
@@ -300,9 +289,7 @@ SwFrmFmt*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
     pView->GetWrtShell().EndUndo(UNDO_INSERT);
     return pAddressBlockFormat;
 }
-/*-- 11.05.2004 12:49:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         SwWrtShell& rShell,
         SwMailMergeConfigItem& rConfigItem,
@@ -458,9 +445,6 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
     return pRet;
 }
 
-/*-- 12.05.2004 12:20:19---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample)
 {
     //set the cursor to the desired position - if no text content is here then
@@ -689,9 +673,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
 
     DBG_ASSERT(0 == rShell.GetTableFmt(), "What to do with a table here?");
 }
-/*-- 10.05.2004 09:34:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG)
 {
     m_aExampleWIN.Show( TRUE );
@@ -735,9 +717,7 @@ IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG)
     m_aTopMF.SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
     return 0;
 }
-/*-- 10.05.2004 14:05:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox)
 {
     if(m_pExampleWrtShell)
@@ -761,10 +741,6 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox)
     return 0;
 }
 
-
-/*-- 10.05.2004 15:56:51---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, MetricField*, EMPTYARG)
 {
     if(m_pExampleWrtShell && m_pAddressBlockFormat)
@@ -786,9 +762,6 @@ IMPL_LINK(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, MetricField*, EMPTYARG)
     return 0;
 }
 
-/*-- 10.05.2004 16:13:36---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
 {
     bool bDown = pButton == &m_aDownPB;
@@ -803,9 +776,7 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
 
     return 0;
 }
-/*-- 15.07.2004 16:05:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, CheckBox*, pBox)
 {
     sal_Bool bCheck = pBox->IsChecked() && pBox->IsEnabled();
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index 6f5c73edde0e..0a4e47615f66 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -42,9 +42,6 @@
 #include <svl/eitem.hxx>
 #include <swabstdlg.hxx>
 
-/*-- 02.04.2004 16:38:45---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
 #ifdef MSC
@@ -75,24 +72,18 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
     m_aFindED.SetReturnActionLink( LINK(this, SwMailMergeMergePage, EnteredFindStringHdl_Impl ));
 
 }
-/*-- 02.04.2004 16:38:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeMergePage::~SwMailMergeMergePage()
 {
 }
-/*-- 25.05.2004 16:14:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG)
 {
     m_pWizard->SetRestartPage(MM_MERGEPAGE);
     m_pWizard->EndDialog(RET_EDIT_RESULT_DOC);
     return 0;
 }
-/*-- 25.05.2004 16:14:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG)
 {
     SvxSearchItem aSearchItem( SID_SEARCH_ITEM );
@@ -114,6 +105,7 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG)
 
     return 0;
 }
+
 IMPL_LINK( SwMailMergeMergePage, EnteredFindStringHdl_Impl, void*, EMPTYARG )
 {
     m_aFindPB.GetClickHdl().Call( &m_aFindPB );
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 5a03be7dc674..646c7b63295b 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -83,9 +83,6 @@ using namespace svt;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-/*-- 01.07.2004 16:47:49---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 String lcl_GetExtensionForDocType(ULONG nDocType)
 {
     String sExtension;
@@ -99,9 +96,7 @@ String lcl_GetExtensionForDocType(ULONG nDocType)
     }
     return sExtension;
 }
-/*-- 28.06.2004 11:49:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess )
 {
     ::rtl::OUString sRet;
@@ -115,9 +110,7 @@ String lcl_GetExtensionForDocType(ULONG nDocType)
     }
     return sRet;
 }
-/*-- 21.06.2004 14:01:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwSaveWarningBox_Impl : public ModalDialog
 {
     FixedImage      aWarningImageIM;
@@ -137,9 +130,7 @@ public:
 
     String          GetFileName() const {return aFileNameED.GetText();}
 };
-/*-- 02.07.2004 08:54:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwSendQueryBox_Impl : public ModalDialog
 {
     FixedImage      aQueryImageIM;
@@ -171,9 +162,6 @@ public:
                         }
 };
 
-/*-- 21.06.2004 14:11:58---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const String& rFileName) :
     ModalDialog(pParent, SW_RES(   DLG_MM_SAVEWARNING )),
     aWarningImageIM(this,   SW_RES( IM_WARNING   )),
@@ -190,23 +178,17 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const String& rFil
     aFileNameED.SetModifyHdl(LINK(this, SwSaveWarningBox_Impl, ModifyHdl));
     ModifyHdl( &aFileNameED );
 }
-/*-- 21.06.2004 14:11:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSaveWarningBox_Impl::~SwSaveWarningBox_Impl()
 {
 }
-/*-- 21.06.2004 14:11:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit)
 {
     aOKPB.Enable(pEdit->GetText().Len() > 0);
     return 0;
 }
-/*-- 02.07.2004 09:02:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const String& rText) :
     ModalDialog(pParent, SW_RES(   DLG_MM_QUERY )),
     aQueryImageIM( this,    SW_RES( IM_QUERY     )),
@@ -223,24 +205,17 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const String& rText) :
     aTextED.SetModifyHdl(LINK(this, SwSendQueryBox_Impl, ModifyHdl));
     ModifyHdl( &aTextED );
 }
-/*-- 02.07.2004 08:58:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSendQueryBox_Impl::~SwSendQueryBox_Impl()
 {
 }
-/*-- 02.07.2004 08:58:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit*, pEdit)
 {
     aOKPB.Enable(bIsEmptyAllowed  || (pEdit->GetText().Len() > 0));
     return 0;
 }
 
-/*-- 16.04.2004 16:34:48---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class SwCopyToDialog : public SfxModalDialog
 {
     FixedInfo       m_aDescriptionFI;
@@ -267,9 +242,6 @@ public:
     void            SetBCC(const String& rSet) {m_aBCCED.SetText(rSet);}
 };
 
-/*-- 16.04.2004 16:43:18---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwCopyToDialog::SwCopyToDialog(Window* pParent) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_COPYTO)),
 #ifdef MSC
@@ -291,16 +263,11 @@ SwCopyToDialog::SwCopyToDialog(Window* pParent) :
 {
     FreeResource();
 }
-/*-- 16.04.2004 16:43:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwCopyToDialog::~SwCopyToDialog()
 {
 }
 
-/*-- 02.04.2004 13:15:54---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUT_PAGE)),
 #ifdef MSC
@@ -410,17 +377,12 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
     m_aPrintRB.Enable(!Application::GetSettings().GetMiscSettings().GetDisablePrinting());
 }
 
-/*-- 02.04.2004 13:15:44---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeOutputPage::~SwMailMergeOutputPage()
 {
     delete m_pTempPrinter;
     delete m_pDocumentPrinterCopy;
 }
-/*-- 31.01.2005 08:38:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeOutputPage::ActivatePage()
 {
     //fill printer ListBox
@@ -461,16 +423,12 @@ void SwMailMergeOutputPage::ActivatePage()
         }
     }
 }
-/*-- 05.07.2004 13:54:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeOutputPage::canAdvance() const
 {
     return false;
 }
-/*-- 02.04.2004 13:15:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
 {
     Control* aControls[] =
@@ -633,9 +591,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
     SetUpdateMode(FALSE);
     return 0;
 }
-/*-- 22.08.2005 12:15:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButton)
 {
     sal_Bool bEnableFromTo = pButton == &m_aFromRB;
@@ -645,9 +601,6 @@ IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButto
     return 0;
 }
 
-/*-- 16.04.2004 16:45:10---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton)
 {
     SwCopyToDialog* pDlg = new SwCopyToDialog(pButton);
@@ -661,9 +614,7 @@ IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton)
     delete pDlg;
     return 0;
 }
-/*-- 17.05.2004 13:51:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -703,17 +654,13 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
-/*-- 17.07.2008 08:09:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, EMPTYARG )
 {
     m_bCancelSaving = true;
     return 0;
 }
-/*-- 17.05.2004 13:51:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -901,9 +848,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
     m_pWizard->enableButtons(WZB_FINISH, sal_True);
     return 0;
 }
-/*-- 22.06.2004 11:51:30---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox)
 {
     if( m_pDocumentPrinterCopy && pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
@@ -943,9 +888,6 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox)
     return 0;
 }
 
-/*-- 17.05.2004 13:51:02---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
 {
     SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView();
@@ -1005,9 +947,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
     m_pWizard->enableButtons(WZB_FINISH, sal_True);
     return 0;
 }
-/*-- 17.05.2004 13:51:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
 {
     if( !m_pTempPrinter )
@@ -1016,9 +956,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
         m_pTempPrinter->Setup(pButton);
     return 0;
 }
-/*-- 14.06.2004 09:34:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
 {
     ULONG nDocType = (ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
@@ -1045,9 +983,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
     }
     return 0;
 }
-/*-- 17.05.2004 13:51:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton)
 {
     SwMailBodyDialog* pDlg = new SwMailBodyDialog(pButton, m_pWizard);
@@ -1058,6 +994,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
+
 /*-- 21.05.2004 12:03:25---------------------------------------------------
     Send documents as e-mail
   -----------------------------------------------------------------------*/
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 3ce7f86ab835..466719133526 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -42,9 +42,6 @@
 #include <mmoutputtypepage.hrc>
 #include <dbui.hrc>
 
-/*-- 02.04.2004 11:06:55---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUTTYPE_PAGE)),
 #ifdef MSC
@@ -88,15 +85,11 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen
     TypeHdl_Impl(&m_aLetterRB);
 
 }
-/*-- 02.04.2004 11:06:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
 {
 }
-/*-- 14.04.2004 14:44:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergeOutputTypePage, TypeHdl_Impl, RadioButton*, EMPTYARG )
 {
     bool bLetter = m_aLetterRB.IsChecked();
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 5f08b7832525..90641e96d471 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -54,9 +54,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using ::rtl::OUString;
 
-/*-- 02.04.2004 16:42:49---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)),
 #ifdef MSC
@@ -90,24 +87,18 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP
     m_ExcludeCB.SetClickHdl(LINK(this, SwMailMergePrepareMergePage, ExcludeHdl_Impl));
     aMoveLink.Call(&m_aRecordED);
 }
-/*-- 02.04.2004 16:42:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage()
 {
 }
-/*-- 13.05.2004 15:36:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergePrepareMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG)
 {
     m_pWizard->SetRestartPage(MM_PREPAREMERGEPAGE);
     m_pWizard->EndDialog(RET_EDIT_DOC);
     return 0;
 }
-/*-- 27.05.2004 14:16:37---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -166,22 +157,19 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
     rSh.GetNewDBMgr()->MergeNew(aMergeDesc);
     return 0;
 }
-/*-- 27.05.2004 14:46:28---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SwMailMergePrepareMergePage, ExcludeHdl_Impl, CheckBox*, pBox)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
     rConfigItem.ExcludeRecord( rConfigItem.GetResultSetPosition(), pBox->IsChecked());
     return 0;
 };
-/*-- 18.08.2004 10:36:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergePrepareMergePage::ActivatePage()
 {
     MoveHdl_Impl(&m_aRecordED);
 }
+
 /*-- 13.05.2004 15:38:32---------------------------------------------------
     merge the data into a new file
   -----------------------------------------------------------------------*/
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 6cb7b87336c8..7011da2e6f7e 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -57,9 +57,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 
-/*-- 08.04.2004 14:33:56---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
         const uno::Reference< sdbc::XConnection>& rConnection) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTDBTABLEDDIALOG)),
@@ -148,15 +145,11 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
         }
     }
 }
-/*-- 08.04.2004 14:33:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwSelectDBTableDialog::~SwSelectDBTableDialog()
 {
 }
-/*-- 08.04.2004 14:33:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
 {
     SvLBoxEntry* pEntry = m_aTableLB.FirstSelected();
@@ -195,18 +188,14 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
 
     return 0;
 }
-/*-- 19.04.2004 10:03:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String      SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable)
 {
     SvLBoxEntry* pEntry = m_aTableLB.FirstSelected();
     bIsTable = pEntry->GetUserData() ? false : true;
     return pEntry ? m_aTableLB.GetEntryText(pEntry, 0) : String();
 }
-/*-- 13.05.2004 12:58:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void   SwSelectDBTableDialog::SetSelectedTable(const String& rTable, bool bIsTable)
 {
     SvLBoxEntry*    pEntry = m_aTableLB.First();
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index ca50ee02d593..b8220b9ff6e7 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -35,8 +35,6 @@
 #include <osl/diagnose.h>
 #include <tools/solar.h>
 
-//........................................................................
-
 using namespace ::connectivity::simple;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdbc;
@@ -80,12 +78,11 @@ namespace
     }
     // -----------------------------------------------------------------------------
 }
-// -----------------------------------------------------------------------------
+
 SwDbtoolsClient::SwDbtoolsClient()
 {
 }
 
-//--------------------------------------------------------------------
 SwDbtoolsClient::~SwDbtoolsClient()
 {
     if(m_xDataAccessFactory.is())
@@ -98,7 +95,6 @@ SwDbtoolsClient::~SwDbtoolsClient()
     }
 }
 
-//--------------------------------------------------------------------
 extern "C" { static void SAL_CALL thisModule() {} }
 
 void SwDbtoolsClient::registerClient()
@@ -135,7 +131,6 @@ void SwDbtoolsClient::registerClient()
     }
 }
 
-//--------------------------------------------------------------------
 void SwDbtoolsClient::revokeClient()
 {
     ::osl::MutexGuard aGuard(getDbtoolsClientMutex());
@@ -147,9 +142,7 @@ void SwDbtoolsClient::revokeClient()
         getDbToolsClientModule() = NULL;
     }
 }
-/* -----------------------------30.08.2001 14:58------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDbtoolsClient::getFactory()
 {
     if(!m_xDataAccessFactory.is())
@@ -169,9 +162,7 @@ void SwDbtoolsClient::getFactory()
         }
     }
 }
-/* -----------------------------30.08.2001 11:32------------------------------
 
- ---------------------------------------------------------------------------*/
 ::rtl::Reference< ::connectivity::simple::IDataAccessTools >
     SwDbtoolsClient::getDataAccessTools()
 {
@@ -183,9 +174,7 @@ void SwDbtoolsClient::getFactory()
     }
     return m_xDataAccessTools;
 }
-/* -----------------------------30.08.2001 12:40------------------------------
 
- ---------------------------------------------------------------------------*/
 ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion >
     SwDbtoolsClient::getAccessTypeConversion()
 {
@@ -198,9 +187,6 @@ void SwDbtoolsClient::getFactory()
     return m_xAccessTypeConversion;
 }
 
-/* -----------------------------30.08.2001 11:37------------------------------
-
- ---------------------------------------------------------------------------*/
 Reference< XDataSource > SwDbtoolsClient::getDataSource(
         const ::rtl::OUString& rRegisteredName,
         const Reference< XMultiServiceFactory>& xFactory
@@ -212,9 +198,7 @@ Reference< XDataSource > SwDbtoolsClient::getDataSource(
         xRet = xAccess->getDataSource(rRegisteredName, xFactory);
     return xRet;
 }
-/* -----------------------------30.08.2001 12:06------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
         const Reference< XPropertySet >& rxColumn,
         const Reference< XNumberFormatTypes >& rxTypes,
@@ -227,9 +211,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
         nRet = xAccess->getDefaultNumberFormat( rxColumn, rxTypes, rLocale);
     return nRet;
 }
-/* -----------------------------30.08.2001 12:38------------------------------
 
- ---------------------------------------------------------------------------*/
 ::rtl::OUString SwDbtoolsClient::getValue(
         const uno::Reference< beans::XPropertySet>& _rxColumn,
         const uno::Reference< util::XNumberFormatter>& _rxFormatter,
@@ -245,4 +227,3 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
         sRet = xConversion->getValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate);
     return sRet;
 }
-
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 87c6e2e976ff..6c53fcd05199 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -89,11 +89,10 @@ typedef TextBlockInfo_Impl* TextBlockInfo_ImplPtr;
 SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0, 4 )
 SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr )
 SV_IMPL_REF( SwDocShell )
+
 /*------------------------------------------------------------------------
     Beschreibung:   Dialog fuer Bearbeiten Vorlagen
 ------------------------------------------------------------------------*/
-
-
 void SwGlossaryHdl::GlossaryDlg()
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -125,8 +124,6 @@ void SwGlossaryHdl::GlossaryDlg()
                     gerufen, wird die Gruppe temp. erzeugt fuer einen
                     schnelleren Zugriff
 ------------------------------------------------------------------------*/
-
-
 void SwGlossaryHdl::SetCurGroup(const String &rGrp, BOOL bApi, BOOL bAlwaysCreateNew )
 {
     String sGroup(rGrp);
@@ -180,21 +177,11 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, BOOL bApi, BOOL bAlwaysCreat
     }
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
-
 USHORT SwGlossaryHdl::GetGroupCnt() const
 {
     return rStatGlossaries.GetGroupCnt();
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
-
 String SwGlossaryHdl::GetGroupName( USHORT nId, String* pTitle )
 {
     String sRet = rStatGlossaries.GetGroupName(nId);
@@ -216,10 +203,6 @@ String SwGlossaryHdl::GetGroupName( USHORT nId, String* pTitle )
     }
     return sRet;
 }
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 
 BOOL SwGlossaryHdl::NewGroup(String &rGrpName, const String& rTitle)
 {
@@ -227,6 +210,7 @@ BOOL SwGlossaryHdl::NewGroup(String &rGrpName, const String& rTitle)
         FindGroupName(rGrpName);
     return rStatGlossaries.NewGroupDoc(rGrpName, rTitle);
 }
+
 /* -----------------23.11.98 13:10-------------------
  * Umbenennen eines Textbausteins
  * --------------------------------------------------*/
@@ -259,9 +243,7 @@ BOOL SwGlossaryHdl::RenameGroup(const String & rOld, String& rNew, const String&
     }
     return bRet;
 }
-/* -----------------27.11.98 13:49-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SwGlossaryHdl::CopyOrMove( const String& rSourceGroupName,  String& rSourceShortName,
                         const String& rDestGroupName, const String& rLongName, BOOL bMove )
 {
@@ -292,8 +274,6 @@ BOOL SwGlossaryHdl::CopyOrMove( const String& rSourceGroupName,  String& rSource
 /*------------------------------------------------------------------------
     Beschreibung: Loeschen einer Textbausteindatei-Gruppe
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::DelGroup(const String &rGrpName)
 {
     String sGroup(rGrpName);
@@ -315,38 +295,26 @@ BOOL SwGlossaryHdl::DelGroup(const String &rGrpName)
 /*------------------------------------------------------------------------
     Beschreibung:   Anzahl Textbausteine erfragen
 ------------------------------------------------------------------------*/
-
-
 USHORT SwGlossaryHdl::GetGlossaryCnt()
 {
     return pCurGrp ? pCurGrp->GetCount() : 0;
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
-
 String SwGlossaryHdl::GetGlossaryName( USHORT nId )
 {
     ASSERT(nId < GetGlossaryCnt(), Textbausteinarray ueberindiziert.);
     return pCurGrp->GetLongName( nId );
 }
-/* -----------------30.11.98 13:18-------------------
- *
- * --------------------------------------------------*/
+
 String  SwGlossaryHdl::GetGlossaryShortName(USHORT nId)
 {
     ASSERT(nId < GetGlossaryCnt(), Textbausteinarray ueberindiziert.);
     return pCurGrp->GetShortName( nId );
 }
 
-
 /*------------------------------------------------------------------------
     Beschreibung:   Kurzname erfragen
 ------------------------------------------------------------------------*/
-
-
 String SwGlossaryHdl::GetGlossaryShortName(const String &rName)
 {
     String sReturn;
@@ -366,8 +334,6 @@ String SwGlossaryHdl::GetGlossaryShortName(const String &rName)
 /*------------------------------------------------------------------------
  Beschreibung:  Kuerzel fuer Textbaustein bereits verwendet?
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::HasShortName(const String& rShortName) const
 {
     SwTextBlocks *pBlock = pCurGrp ? pCurGrp
@@ -378,9 +344,6 @@ BOOL SwGlossaryHdl::HasShortName(const String& rShortName) const
     return bRet;
 }
 
-/* -----------------------------20.03.01 10:52--------------------------------
-
- ---------------------------------------------------------------------------*/
 BOOL    SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
 {
     /*if( rOld.IsOld() )
@@ -403,7 +366,6 @@ BOOL    SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
 /*------------------------------------------------------------------------
     Beschreibung:   Erzeugen eines Textbausteines
 ------------------------------------------------------------------------*/
-
 BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName,
                                 BOOL bCreateGroup, BOOL bNoAttr)
 {
@@ -439,8 +401,6 @@ BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName,
 /*------------------------------------------------------------------------
     Beschreibung:   Loeschen eines Textbausteines
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::DelGlossary(const String &rShortName)
 {
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
@@ -460,8 +420,6 @@ BOOL SwGlossaryHdl::DelGlossary(const String &rShortName)
 /*------------------------------------------------------------------------
     Beschreibung: Kurzform expandieren
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::ExpandGlossary()
 {
     ASSERT(pWrtShell->CanInsert(), illegal);
@@ -642,8 +600,6 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
 /*------------------------------------------------------------------------
     Beschreibung: Textbaustein einfuegen
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::InsertGlossary(const String &rName)
 {
     ASSERT(pWrtShell->CanInsert(), illegal);
@@ -690,8 +646,6 @@ BOOL SwGlossaryHdl::InsertGlossary(const String &rName)
 /*------------------------------------------------------------------------
  Beschreibung:  Macro setzen / erfragen
 ------------------------------------------------------------------------*/
-
-
 void SwGlossaryHdl::SetMacros(const String& rShortName,
                               const SvxMacro* pStart,
                               const SvxMacro* pEnd,
@@ -745,8 +699,6 @@ void SwGlossaryHdl::GetMacros( const String &rShortName,
 /*------------------------------------------------------------------------
     Beschreibung:   ctor, dtor
 ------------------------------------------------------------------------*/
-
-
 SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh)
     : rStatGlossaries( *::GetGlossaries() ),
     aCurGrp( rStatGlossaries.GetDefName() ),
@@ -756,7 +708,6 @@ SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh)
 {
 }
 
-
 SwGlossaryHdl::~SwGlossaryHdl()
 {
     if( pCurGrp )
@@ -766,8 +717,6 @@ SwGlossaryHdl::~SwGlossaryHdl()
 /*------------------------------------------------------------------------
     Beschreibung:   Umbenennen eines Textbausteines
 ------------------------------------------------------------------------*/
-
-
 BOOL SwGlossaryHdl::Rename(const String& rOldShort, const String& rNewShortName,
                            const String& rNewName )
 {
@@ -835,9 +784,6 @@ BOOL SwGlossaryHdl::FindGroupName(String & rGroup)
     return rStatGlossaries.FindGroupName(rGroup);
 }
 
-/* -----------------29.07.99 08:34-------------------
-
- --------------------------------------------------*/
 BOOL SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh, const String& rShortName)
 {
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 79c18bb96e54..6753f17a5b56 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -67,9 +67,7 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const String &rShortName)
  dtor ueberladen
 --------------------------------------------------*/
 SwSelGlossaryDlg::~SwSelGlossaryDlg() {}
-/* -----------------25.10.99 08:33-------------------
 
- --------------------------------------------------*/
 IMPL_LINK(SwSelGlossaryDlg, DoubleClickHdl, ListBox*, /*pBox*/)
 {
     EndDialog(RET_OK);
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 8220c7ee2c8d..0b948757b95b 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -233,9 +233,6 @@ public:
     }
 };
 
-
-// -----------------------------------------------------------------------
-
 SwTransferable::SwTransferable( SwWrtShell& rSh )
     : pWrtShell( &rSh ),
     pCreatorView( 0 ),
@@ -266,8 +263,6 @@ SwTransferable::SwTransferable( SwWrtShell& rSh )
     }
 }
 
-// -----------------------------------------------------------------------
-
 SwTransferable::~SwTransferable()
 {
     Application::GetSolarMutex().acquire();
@@ -318,8 +313,6 @@ SwTransferable::~SwTransferable()
     Application::GetSolarMutex().release();
 }
 
-// -----------------------------------------------------------------------
-
 static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
 {
     SwDoc *const pDoc = rDocFac.GetDoc();
@@ -331,8 +324,6 @@ static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
     return pDoc;
 }
 
-// -----------------------------------------------------------------------
-
 void SwTransferable::ObjectReleased()
 {
     SwModule *pMod = SW_MOD();
@@ -342,8 +333,6 @@ void SwTransferable::ObjectReleased()
         pMod->pXSelection = 0;
 }
 
-// -----------------------------------------------------------------------
-
 void SwTransferable::AddSupportedFormats()
 {
     // only need if we are the current XSelection Object
@@ -354,8 +343,6 @@ void SwTransferable::AddSupportedFormats()
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SwTransferable::InitOle( SfxObjectShell* pDoc, SwDoc& rDoc )
 {
     //OleVisArea einstellen. Linke obere Ecke der Seite und Groesse
@@ -366,8 +353,6 @@ void SwTransferable::InitOle( SfxObjectShell* pDoc, SwDoc& rDoc )
     rDoc.set(IDocumentSettingAccess::BROWSE_MODE, true );
 }
 
-// -----------------------------------------------------------------------
-
 uno::Reference < embed::XEmbeddedObject > SwTransferable::FindOLEObj( sal_Int64& nAspect ) const
 {
     uno::Reference < embed::XEmbeddedObject > xObj;
@@ -387,8 +372,6 @@ uno::Reference < embed::XEmbeddedObject > SwTransferable::FindOLEObj( sal_Int64&
     return xObj;
 }
 
-// -----------------------------------------------------------------------
-
 Graphic* SwTransferable::FindOLEReplacementGraphic() const
 {
     if( pClpDocFac )
@@ -406,17 +389,12 @@ Graphic* SwTransferable::FindOLEReplacementGraphic() const
     return NULL;
 }
 
-
-// -----------------------------------------------------------------------
-
 void SwTransferable::RemoveDDELinkFormat( const Window& rWin )
 {
     RemoveFormat( SOT_FORMATSTR_ID_LINK );
     CopyToClipboard( (Window*)&rWin );
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
 {
     sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
@@ -621,8 +599,6 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
     return bOK;
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
                                     void* pObject, sal_uInt32 nObjectType,
                                     const DATA_FLAVOR& /*rFlavor*/ )
@@ -769,8 +745,6 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
     return bRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::Cut()
 {
     int nRet = Copy( TRUE );
@@ -779,8 +753,6 @@ int SwTransferable::Cut()
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 void SwTransferable::DeleteSelection()
 {
     if(!pWrtShell)
@@ -794,8 +766,6 @@ void SwTransferable::DeleteSelection()
     pWrtShell->EndUndo( UNDO_DELETE );
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::PrepareForCopy( BOOL bIsCut )
 {
     int nRet = 1;
@@ -1014,8 +984,6 @@ int SwTransferable::Copy( BOOL bIsCut )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::CalculateAndCopy()
 {
     if(!pWrtShell)
@@ -1035,8 +1003,6 @@ int SwTransferable::CalculateAndCopy()
     return 1;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
                                     const String& rStr )
 {
@@ -1089,7 +1055,6 @@ static inline uno::Reference < XTransferable > * lcl_getTransferPointer ( uno::R
 {
     return &xRef;
 }
-// -----------------------------------------------------------------------
 
 BOOL SwTransferable::IsPaste( const SwWrtShell& rSh,
                               const TransferableDataHelper& rData )
@@ -1132,8 +1097,6 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh,
     return bIsPaste;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
 {
     USHORT nEventAction, nAction=0,
@@ -1178,8 +1141,6 @@ int SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
                                         nDestination, FALSE, FALSE );
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::PasteData( TransferableDataHelper& rData,
                             SwWrtShell& rSh, USHORT nAction, ULONG nFormat,
                             USHORT nDestination, BOOL bIsPasteFmt,
@@ -1543,8 +1504,6 @@ ASSERT( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: was soll hier passieren?" );
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 USHORT SwTransferable::GetSotDestination( const SwWrtShell& rSh,
                                             const Point* pPt )
 {
@@ -1628,8 +1587,6 @@ JP 13.07.98: Bug 52637: es wird ein URL-Feld erkannt also werden nur die
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, ULONG nFmt, BOOL bMsg )
 {
@@ -1725,8 +1682,6 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
                                 ULONG nFmt, BYTE nActionFlags, BOOL bMsg )
 {
@@ -1948,11 +1903,6 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, USHORT nAction,
                                     const Point* pPt, BOOL bInsertGRF )
@@ -2032,9 +1982,6 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
     return nRet;
 }
 
-
-// -----------------------------------------------------------------------
-
 void SwTransferable::SetSelInShell( SwWrtShell& rSh, BOOL bSelectFrm,
                                         const Point* pPt )
 {
@@ -2070,8 +2017,6 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, BOOL bSelectFrm,
     }
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                                 SwWrtShell& rWrtShell, BOOL bReReadGrf,
                                 BOOL bMsg )
@@ -2236,8 +2181,6 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     return 1;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
                                     SwWrtShell& rSh, USHORT nAction,
                                     const Point* pPt, BYTE nActionFlags )
@@ -2257,8 +2200,6 @@ int SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                                 ULONG nFmt, USHORT nAction, const Point* pPt,
                                 BYTE nActionFlags, BOOL /*bMsg*/ )
@@ -2425,8 +2366,6 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
                                     SwWrtShell& rSh )
 {
@@ -2452,8 +2391,6 @@ int SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
                                         SwWrtShell& rSh, ULONG nFmt )
 {
@@ -2498,8 +2435,6 @@ int SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, ULONG nFmt,
                                     USHORT nAction, const Point* pPt,
@@ -2599,8 +2534,6 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, ULONG nFmt, BOOL bLink,
                                     const Point* pDragPt, BOOL bMsg )
@@ -2703,8 +2636,6 @@ int SwTransferable::_PasteDBData( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_PasteFileList( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, BOOL bLink,
                                     const Point* pPt, BOOL bMsg )
@@ -2744,8 +2675,6 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 BOOL SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
                                         String& rFileName, String* pTitle )
 {
@@ -2773,8 +2702,6 @@ ASSERT( !&rFileName, "how do we read today .URL - Files?" );
     return bIsURLFile;
 }
 
-// -----------------------------------------------------------------------
-
 BOOL SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
                                      const TransferableDataHelper& rData )
 {
@@ -2784,8 +2711,6 @@ BOOL SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
     return aClipboardFmtItem.Count() > 0;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::PasteFormat( SwWrtShell& rSh,
                                     TransferableDataHelper& rData,
                                     ULONG nFormat )
@@ -2828,8 +2753,6 @@ int SwTransferable::PasteFormat( SwWrtShell& rSh,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
                                         ULONG nFormat, USHORT nDestination )
 {
@@ -2846,8 +2769,6 @@ int SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
     return EXCHG_INOUT_ACTION_NONE != nAction;
 }
 
-// -----------------------------------------------------------------------
-
 /**
  * the list of formats which will be offered to the user in the 'Paste
  * Special...' dialog and the paste button menu
@@ -2870,15 +2791,12 @@ static USHORT aPasteSpecialIds[] =
     0
 };
 
-
 int SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& rData )
 {
     // Plain text == unformatted
     return SwTransferable::PasteFormat( rSh, rData, SOT_FORMAT_STRING );
 }
 
-// -----------------------------------------------------------------------
-
 int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, ULONG& rFormatUsed )
 {
     int nRet = 0;
@@ -2950,7 +2868,6 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData
     return nRet;
 }
 
-
 void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
                                 const TransferableDataHelper& rData,
                                 SvxClipboardFmtItem & rToFill )
@@ -3217,9 +3134,6 @@ void SwTransferable::DragFinished( sal_Int8 nAction )
     ((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( bOldIdle );
 }
 
-
-/*  */
-
 int SwTransferable::PrivatePaste( SwWrtShell& rShell )
 {
     // erst den SelectionType erfragen, dann Action-Klammerung !!!!
@@ -3582,9 +3496,7 @@ void SwTransferable::ClearSelection( SwWrtShell& rSh,
         TransferableHelper::ClearSelection( rSh.GetWin() );
     }
 }
-/* -----------------3/31/2003 11:46AM----------------
 
- --------------------------------------------------*/
 const Sequence< sal_Int8 >& SwTransferable::getUnoTunnelId()
 {
     static Sequence< sal_Int8 > aSeq;
@@ -3597,9 +3509,7 @@ const Sequence< sal_Int8 >& SwTransferable::getUnoTunnelId()
     }
     return aSeq;
 }
-/* -----------------3/31/2003 11:46AM----------------
 
- --------------------------------------------------*/
 sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException )
 {
     sal_Int64 nRet;
@@ -3629,10 +3539,6 @@ SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper&
 
 }
 
-/*  */
-
-// -----------------------------------------------------------------------
-
 SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
     : rTrnsfr( rTrans ), pDocShell( 0 ),
     bDelBookmrk( FALSE ), bInDisconnect( FALSE )
@@ -3688,16 +3594,12 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
     }
 }
 
-// -----------------------------------------------------------------------
-
 SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
 {
     if( refObj.Is() )
         Disconnect( TRUE );
 }
 
-// -----------------------------------------------------------------------
-
 void SwTrnsfrDdeLink::DataChanged( const String& ,
                                     const uno::Any& )
 {
@@ -3710,8 +3612,6 @@ void SwTrnsfrDdeLink::DataChanged( const String& ,
     }
 }
 
-// -----------------------------------------------------------------------
-
 BOOL SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
 {
     if( !refObj.Is() || !FindDocShell() )
@@ -3782,8 +3682,6 @@ BOOL SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
     return true;
 }
 
-// -----------------------------------------------------------------------
-
 void SwTrnsfrDdeLink::Disconnect( BOOL bRemoveDataAdvise )
 {
     //JP 29.01.96 Bug 24432:
@@ -3834,8 +3732,6 @@ void SwTrnsfrDdeLink::Disconnect( BOOL bRemoveDataAdvise )
     bInDisconnect = bOldDisconnect;
 }
 
-// -----------------------------------------------------------------------
-
 BOOL SwTrnsfrDdeLink::FindDocShell()
 {
     TypeId aType( TYPE( SwDocShell ) );
@@ -3855,8 +3751,6 @@ BOOL SwTrnsfrDdeLink::FindDocShell()
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
-
 void SwTrnsfrDdeLink::Closed()
 {
     if( !bInDisconnect && refObj.Is() )
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 0635bee92edb..cfd5b8b13df9 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -95,7 +95,6 @@
 
 using namespace ::com::sun::star;
 
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview")
 {
     SFX_VIEW_REGISTRATION(SwDocShell);
@@ -112,17 +111,13 @@ SFX_IMPL_INTERFACE(SwPagePreView, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX))
                                 SW_RES(RID_PVIEW_TOOLBOX));
 }
 
-
 TYPEINIT1(SwPagePreView,SfxViewShell)
 
 #define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT|SFX_VIEW_HAS_PRINTOPTIONS )
 
 #define MIN_PREVIEW_ZOOM 25
 #define MAX_PREVIEW_ZOOM 600
-/*  */
-/* -----------------26.11.2002 10:41-----------------
- *
- * --------------------------------------------------*/
+
 USHORT lcl_GetNextZoomStep(USHORT nCurrentZoom, BOOL bZoomIn)
 {
     static USHORT aZoomArr[] =
@@ -144,9 +139,7 @@ USHORT lcl_GetNextZoomStep(USHORT nCurrentZoom, BOOL bZoomIn)
         }
     return bZoomIn ? MAX_PREVIEW_ZOOM : MIN_PREVIEW_ZOOM;
 };
-/* -----------------02.12.2002 09:11-----------------
- *
- * --------------------------------------------------*/
+
 void lcl_InvalidateZoomSlots(SfxBindings& rBindings)
 {
     static USHORT __READONLY_DATA aInval[] =
@@ -156,12 +149,8 @@ void lcl_InvalidateZoomSlots(SfxBindings& rBindings)
     };
     rBindings.Invalidate( aInval );
 }
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 
 // erstmal der Zoom-Dialog
-
 class SwPreViewZoomDlg : public SvxStandardDialog
 {
     FixedText       aRowLbl;
@@ -180,11 +169,6 @@ public:
     ~SwPreViewZoomDlg();
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) :
     SvxStandardDialog( &rParent, SW_RES(DLG_PAGEPREVIEW_ZOOM) ),
     aRowLbl(this,SW_RES(FT_ROW)),
@@ -201,12 +185,9 @@ SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) :
     aColEdit.SetValue( rParent.GetCol() );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-SwPreViewZoomDlg::~SwPreViewZoomDlg() {}
-
+SwPreViewZoomDlg::~SwPreViewZoomDlg()
+{
+}
 
 void  SwPreViewZoomDlg::Apply()
 {
@@ -215,13 +196,7 @@ void  SwPreViewZoomDlg::Apply()
                 BYTE(aColEdit.GetValue()) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 // alles fuers SwPagePreViewWin
-
-
 SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView )
     : Window( pParent, WinBits( WB_CLIPCHILDREN) ),
     mpViewShell( 0 ),
@@ -242,22 +217,12 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView )
     mnSttPage = USHRT_MAX;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwPagePreViewWin::~SwPagePreViewWin()
 {
     if( mpViewShell )
         delete mpViewShell;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreViewWin::Paint( const Rectangle& rRect )
 {
     if( !mpViewShell || !mpViewShell->GetLayout() )
@@ -286,9 +251,6 @@ void  SwPagePreViewWin::Paint( const Rectangle& rRect )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol )
 {
     if( !mpViewShell || !mpViewShell->GetLayout() )
@@ -334,11 +296,10 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol )
     // OD 18.12.2002 #103492# - adjust scrollbars
     mrView.ScrollViewSzChg();
 }
+
 /*--------------------------------------------------------------------
     Beschreibung:, mnSttPage is Absolute
  --------------------------------------------------------------------*/
-
-
 int SwPagePreViewWin::MovePage( int eMoveMode )
 {
     // soviele Seiten hoch
@@ -443,11 +404,6 @@ int SwPagePreViewWin::MovePage( int eMoveMode )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreViewWin::SetWinSize( const Size& rNewSize )
 {
     // die Size wollen wir aber immer in Pixel-Einheiten haben
@@ -475,12 +431,6 @@ void SwPagePreViewWin::SetWinSize( const Size& rNewSize )
     maScale = GetMapMode().GetScaleX();
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreViewWin::GetStatusStr( String& rStr, USHORT nPageCnt ) const
 {
     // OD 24.03.2003 #108282# - show physical and virtual page number of
@@ -505,11 +455,6 @@ void SwPagePreViewWin::GetStatusStr( String& rStr, USHORT nPageCnt ) const
     rStr += String::CreateFromInt32( nPageCnt );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt )
 {
     const KeyCode& rKeyCode = rKEvt.GetKeyCode();
@@ -535,10 +480,6 @@ void  SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt )
         Window::KeyInput( rKEvt );
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
 void SwPagePreViewWin::Command( const CommandEvent& rCEvt )
 {
     BOOL bCallBase = TRUE;
@@ -625,8 +566,6 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt )
 /******************************************************************************
  *  Beschreibung: Userprefs bzw Viewoptions setzen
  ******************************************************************************/
-
-
 void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol )
 {
     SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(FALSE);
@@ -783,9 +722,6 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool  _bPgUp,
         _pReq->Done();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 // dann mal alles fuer die SwPagePreView
 void  SwPagePreView::Execute( SfxRequest &rReq )
 {
@@ -1053,11 +989,6 @@ MOVEPAGE:
         aViewWin.Invalidate();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreView::GetState( SfxItemSet& rSet )
 {
     SfxWhichIter aIter(rSet);
@@ -1212,11 +1143,6 @@ void  SwPagePreView::GetState( SfxItemSet& rSet )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreView::StateUndo(SfxItemSet& rSet)
 {
     SfxWhichIter aIter(rSet);
@@ -1229,11 +1155,6 @@ void  SwPagePreView::StateUndo(SfxItemSet& rSet)
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreView::Init(const SwViewOption * pPrefs)
 {
     if ( GetViewShell()->HasDrawView() )
@@ -1302,12 +1223,6 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
     pScrollFill->Show(pPrefs->IsViewVScrollBar() && pPrefs->IsViewHScrollBar());
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
     SfxViewShell( pViewFrame, SWVIEWFLAGS ),
     aViewWin( &pViewFrame->GetWindow(), *this ),
@@ -1385,13 +1300,7 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
     Init();
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
- SwPagePreView::~SwPagePreView()
+SwPagePreView::~SwPagePreView()
 {
     SetWindow( 0 );
 
@@ -1413,21 +1322,11 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
         }
 */}
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwDocShell* SwPagePreView::GetDocShell()
 {
     return PTR_CAST(SwDocShell, GetViewFrame()->GetObjectShell());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 int SwPagePreView::_CreateScrollbar( BOOL bHori )
 {
     Window *pMDI = &GetViewFrame()->GetWindow();
@@ -1463,16 +1362,6 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori )
     return 1;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 /*
  * Button-Handler
  */
@@ -1485,11 +1374,6 @@ IMPL_LINK_INLINE_START( SwPagePreView, BtnPage, Button *, pButton )
 }
 IMPL_LINK_INLINE_END( SwPagePreView, BtnPage, Button *, pButton )
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar )
 {
     Rectangle aPixVisArea( aViewWin.LogicToPixel( aVisArea ) );
@@ -1521,16 +1405,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar )
     return bChg;
 }
 
-
-/*  */
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 // ab hier alles aus der SwView uebernommen
-
-
 void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
 {
 //  const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel();
@@ -1543,11 +1418,6 @@ void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
     SetBorderPixel( rToFill );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize )
 {
     SvBorder aBorder;
@@ -1564,11 +1434,6 @@ void  SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize )
     //VisArea niemals einstellen!
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize )
 {
     SvBorder aBorder;
@@ -1592,11 +1457,6 @@ void  SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize )
         }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
 {
     const Point aTopLeft(AlignToPixel(rRect.TopLeft()));
@@ -1646,11 +1506,6 @@ void SwPagePreView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
     aViewWin.Invalidate();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar )
 {
     if(!GetViewShell())
@@ -1685,11 +1540,6 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar )
 {
     if(!GetViewShell())
@@ -1780,21 +1630,12 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar )
     }
     return 0;
 }
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 
 Point SwPagePreView::AlignToPixel(const Point &rPt) const
 {
     return aViewWin.PixelToLogic( aViewWin.LogicToPixel( rPt ) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreView::DocSzChgd( const Size &rSz )
 {
     if( aDocSz == rSz )
@@ -1817,11 +1658,6 @@ void SwPagePreView::DocSzChgd( const Size &rSz )
     // <--
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreView::ScrollViewSzChg()
 {
     if(!GetViewShell())
@@ -1891,35 +1727,17 @@ void SwPagePreView::ScrollViewSzChg()
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwPagePreView::ScrollDocSzChg()
 {
     ScrollViewSzChg();
 }
 
-
-/*  */
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 // alles zum Thema Drucken
-
 SfxPrinter*  SwPagePreView::GetPrinter( BOOL bCreate )
 {
     return aViewWin.GetViewShell()->getIDocumentDeviceAccess()->getPrinter( bCreate );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 USHORT  SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
 {
     ViewShell &rSh = *GetViewShell();
@@ -1974,22 +1792,12 @@ USHORT  SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SfxTabPage*  SwPagePreView::CreatePrintOptionsPage( Window *pParent,
                                                 const SfxItemSet &rOptions )
 {
     return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 PrintDialog*  SwPagePreView::CreatePrintDialog( Window *pParent )
 {
     PrintDialog *pDlg = ::CreatePrintDialog( pParent, 1, 0 );
@@ -1997,11 +1805,6 @@ PrintDialog*  SwPagePreView::CreatePrintDialog( Window *pParent )
     return pDlg;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 // OD 18.12.2002 #103492# - no longer needed ??
 Size  SwPagePreView::GetOptimalSizePixel() const
 {
@@ -2033,10 +1836,6 @@ Size  SwPagePreView::GetOptimalSizePixel() const
 */
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 // OD 12.12.2002 #103492#
 void SwPagePreViewWin::SetViewShell( ViewShell* pShell )
 {
@@ -2099,6 +1898,7 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor,
     }
 
 }
+
 /* -----------------04.12.2002 10:46-----------------
  * pixel scrolling - horizontally always or vertically
  * when less than the desired number of rows fits into
@@ -2144,7 +1944,6 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt )
     return bOk;
 }
 
-
 uno::Reference< ::com::sun::star::accessibility::XAccessible >
     SwPagePreViewWin::CreateAccessible()
 {
@@ -2155,34 +1954,23 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible >
     return GetViewShell()->CreateAccessiblePreview();
 }
 
-/* -----------------------------06.05.2002 13:18------------------------------
-
- ---------------------------------------------------------------------------*/
 void SwPagePreView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions)
 {
     GetViewShell()->ApplyAccessiblityOptions(rAccessibilityOptions);
 }
-/* -----------------------------2002/06/26 14:30------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwPagePreView::ShowHScrollbar(sal_Bool bShow)
 {
     pHScrollbar->Show(bShow);
     InvalidateBorder();
 }
 
-/* -----------------------------2002/06/26 14:30------------------------------
-
- ---------------------------------------------------------------------------*/
 void SwPagePreView::ShowVScrollbar(sal_Bool bShow)
 {
     pVScrollbar->Show(bShow);
     InvalidateBorder();
 }
 
-/* -----------------25.11.2002 16:36-----------------
- *
- * --------------------------------------------------*/
 void SwPagePreView::SetZoom(SvxZoomType eType, USHORT nFactor)
 {
     ViewShell& rSh = *GetViewShell();
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 667beb8ab4ca..939a4e955cc2 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -123,14 +123,11 @@ using ::com::sun::star::util::SearchOptions;
 #define BMARGPRN        1000
 #define BORDERPRN       300
 
-
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
 {
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-
 SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
@@ -142,11 +139,6 @@ SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
 
 TYPEINIT1(SwSrcView, SfxViewShell)
 
-/*-----------------18.11.96 08.05-------------------
-
---------------------------------------------------*/
-
-
 void lcl_PrintHeader( OutputDevice &rOutDev, USHORT nPages, USHORT nCurPage, const String& rTitle )
 {
     short nLeftMargin   = LMARGPRN;
@@ -200,9 +192,7 @@ void lcl_PrintHeader( OutputDevice &rOutDev, USHORT nPages, USHORT nCurPage, con
     rOutDev.SetFont( aOldFont );
     rOutDev.SetFillColor( aOldFillColor );
 }
-/* -----------------13.11.2003 16:24-----------------
 
- --------------------------------------------------*/
 rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding)
 {
     rtl_TextEncoding eRet = eLoadEncoding;
@@ -215,9 +205,6 @@ rtl_TextEncoding lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding)
     }
     return eRet;
 }
-/*-----------------18.11.96 08.21-------------------
-
---------------------------------------------------*/
 
 void lcl_ConvertTabsToSpaces( String& rLine )
 {
@@ -241,11 +228,6 @@ void lcl_ConvertTabsToSpaces( String& rLine )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
     SfxViewShell( pViewFrame, SWSRCVIEWFLAGS ),
     aEditWin( &pViewFrame->GetWindow(), this ),
@@ -256,11 +238,6 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
     Init();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwSrcView::~SwSrcView()
 {
     SwDocShell* pDocShell = GetDocShell();
@@ -281,9 +258,6 @@ SwSrcView::~SwSrcView()
     delete pSearchItem;
 }
 
-/*-----------------24.04.97 10:37-------------------
-
---------------------------------------------------*/
 void SwSrcView::SaveContentTo(SfxMedium& rMed)
 {
     SvStream* pOutStream = rMed.GetOutStream();
@@ -291,11 +265,6 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed)
     aEditWin.Write( *pOutStream );//, EE_FORMAT_TEXT);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::Init()
 {
     SetHelpId(SW_SRC_VIEWSHELL);
@@ -315,21 +284,12 @@ void SwSrcView::Init()
     StartListening(*pDocShell,TRUE);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwDocShell*     SwSrcView::GetDocShell()
 {
     SfxObjectShell* pObjShell = GetViewFrame()->GetObjectShell();
     return PTR_CAST(SwDocShell, pObjShell);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::SaveContent(const String& rTmpFile)
 {
     SfxMedium aMedium( rTmpFile,    STREAM_WRITE, TRUE);
@@ -339,11 +299,6 @@ void SwSrcView::SaveContent(const String& rTmpFile)
     aMedium.Commit();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::Execute(SfxRequest& rReq)
 {
     USHORT nSlot = rReq.GetSlot();
@@ -479,11 +434,6 @@ void SwSrcView::Execute(SfxRequest& rReq)
     aEditWin.Invalidate();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::GetState(SfxItemSet& rSet)
 {
     SfxWhichIter aIter(rSet);
@@ -613,11 +563,6 @@ void SwSrcView::GetState(SfxItemSet& rSet)
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SvxSearchItem* SwSrcView::GetSearchItem()
 {
     if(!pSearchItem)
@@ -627,22 +572,12 @@ SvxSearchItem* SwSrcView::GetSearchItem()
     return pSearchItem;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
 {
     delete pSearchItem;
     pSearchItem = (SvxSearchItem*)rItem.Clone();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                                                     BOOL bFromStart,
                                                     BOOL bApi,
@@ -725,10 +660,6 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
     return nFound;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool )
 {
     SwDocShell* pDocSh = GetDocShell();
@@ -750,18 +681,11 @@ USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate )
 {
     return  GetDocShell()->GetDoc()->getPrinter( bCreate );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 sal_Int32 SwSrcView::PrintSource(
     OutputDevice *pOutDev,
     sal_Int32 nPage,
@@ -836,12 +760,6 @@ sal_Int32 SwSrcView::PrintSource(
     return nCurPage;
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     if ( rHint.ISA(SfxSimpleHint) &&
@@ -862,9 +780,6 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     SfxViewShell::Notify(rBC, rHint);
 }
 
-/*-----------------19.04.97 10:19-------------------
-
---------------------------------------------------*/
 void SwSrcView::Load(SwDocShell* pDocShell)
 {
     SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 20dc6035dc36..0b70ea0df172 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -65,9 +65,6 @@ using namespace ::com::sun::star::scanner;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer::clipboard;
 
-/* -----------------02.06.98 15:31-------------------
- *
- * --------------------------------------------------*/
 SwView_Impl::SwView_Impl(SwView* pShell) :
         pxXTextView(new uno::Reference<view::XSelectionSupplier>),
         pView(pShell),
@@ -84,9 +81,6 @@ SwView_Impl::SwView_Impl(SwView* pShell) :
     xDisProvInterceptor = new SwXDispatchProviderInterceptor(*pView);
 }
 
-/*-----------------13.12.97 09:51-------------------
-
---------------------------------------------------*/
 SwView_Impl::~SwView_Impl()
 {
     Reference<XUnoTunnel> xDispTunnel(xDisProvInterceptor, UNO_QUERY);
@@ -114,31 +108,22 @@ SwView_Impl::~SwView_Impl()
     delete m_pRequest;
 }
 
-/*-----------------13.12.97 09:54-------------------
-
---------------------------------------------------*/
 void SwView_Impl::SetShellMode(ShellModes eSet)
 {
     eShellMode = eSet;
 }
-/*-----------------13.12.97 09:59-------------------
 
---------------------------------------------------*/
 view::XSelectionSupplier*   SwView_Impl::GetUNOObject()
 {
     return pxXTextView->get();
 }
-/* -----------------02.06.98 15:29-------------------
- *
- * --------------------------------------------------*/
+
 SwXTextView*    SwView_Impl::GetUNOObject_Impl()
 {
         view::XSelectionSupplier* pTextView = pxXTextView->get();
         return ((SwXTextView*)pTextView);
 }
-/* -----------------------------29.05.00 09:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView_Impl::ExecuteScan( SfxRequest& rReq )
 {
     USHORT nSlot = rReq.GetSlot();
@@ -218,9 +203,6 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
     }
 }
 
-/* -----------------------------29.05.00 08:26--------------------------------
-
- ---------------------------------------------------------------------------*/
 SwScannerEventListener& SwView_Impl::GetScannerEventListener()
 {
     if(!xScanEvtLstnr.is())
@@ -228,7 +210,6 @@ SwScannerEventListener& SwView_Impl::GetScannerEventListener()
     return *pScanEvtLstnr;
 }
 
-
 void SwView_Impl::AddClipboardListener()
 {
     if(!xClipEvtLstnr.is())
@@ -237,9 +218,7 @@ void SwView_Impl::AddClipboardListener()
         pClipEvtLstnr->AddRemoveListener( TRUE );
     }
 }
-/* -----------------3/31/2003 11:42AM----------------
 
- --------------------------------------------------*/
 void SwView_Impl::Invalidate()
 {
     GetUNOObject_Impl()->Invalidate();
@@ -254,9 +233,7 @@ void SwView_Impl::Invalidate()
             pTransferable->Invalidate();
     }
 }
-/* -----------------3/31/2003 12:40PM----------------
 
- --------------------------------------------------*/
 void SwView_Impl::AddTransferable(SwTransferable& rTransferable)
 {
     //prevent removing of the non-referenced SwTransferable
@@ -285,8 +262,6 @@ void SwView_Impl::InitRequest( const SfxRequest& rRequest )
     m_pRequest = new SfxRequest( rRequest );
 }
 
-// ------------------------- SwScannerEventListener ---------------------
-
 SwScannerEventListener::~SwScannerEventListener()
 {
 }
@@ -300,8 +275,6 @@ void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject
 #endif
 }
 
-// ------------------------- SwClipboardChangeListener ---------------------
-
 SwClipboardChangeListener::~SwClipboardChangeListener()
 {
 }
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 936db05bbe2b..5242984736bd 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -154,19 +154,11 @@ SearchAttrItemList* SwView::pReplList   = 0;
 
 DBG_NAME(viewhdl)
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 inline SfxDispatcher &SwView::GetDispatcher()
 {
     return *GetViewFrame()->GetDispatcher();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwView::ImpSetVerb( int nSelType )
 {
     sal_Bool bResetVerbs = bVerbsActive;
@@ -194,7 +186,6 @@ void SwView::ImpSetVerb( int nSelType )
     Description:
     called by the SwEditWin when it gets the focus
  --------------------------------------------------------------------*/
-
 void SwView::GotFocus() const
 {
     // if we got the focus, and the form shell *is* on the top of the dispatcher
@@ -225,7 +216,6 @@ void SwView::GotFocus() const
     a request to put the form shell on the top of the dispatcher
     stack
  --------------------------------------------------------------------*/
-
 IMPL_LINK( SwView, FormControlActivated, FmFormShell*, EMPTYARG )
 {
     // if a form control has been activated, and the form shell is not on the top
@@ -486,8 +476,6 @@ void SwView::SelectShell()
 //Da wir aber keine Stati mehr liefern koennen und wollen locken wir
 //stattdessen den Dispatcher.
 
-
-
 extern "C"
 {
     int lcl_CmpIds( const void *pFirst, const void *pSecond)
@@ -496,8 +484,6 @@ extern "C"
     }
 }
 
-
-
 IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
 {
      if ( GetEditWin().IsChainMode() )
@@ -563,8 +549,6 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
     return 0;
 }
 
-
-
 IMPL_LINK( SwView, TimeoutHdl, Timer *, EMPTYARG )
 {
     DBG_PROFSTART(viewhdl);
@@ -739,7 +723,6 @@ void SwView::_CheckReadonlySelection()
     }
 }
 
-
 SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     : SfxViewShell( _pFrame, SWVIEWFLAGS ),
 
@@ -1115,11 +1098,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     GetViewFrame()->GetWindow().AddChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwView::~SwView()
 {
     GetViewFrame()->GetWindow().RemoveChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
@@ -1171,8 +1149,6 @@ SwView::~SwView()
 /*--------------------------------------------------------------------
     Beschreibung:   DocShell rausgrabbeln ueber das FrameWindow
  --------------------------------------------------------------------*/
-
-
 SwDocShell* SwView::GetDocShell()
 {
     SfxObjectShell* pDocShell = GetViewFrame()->GetObjectShell();
@@ -1182,8 +1158,6 @@ SwDocShell* SwView::GetDocShell()
 /*--------------------------------------------------------------------
     Beschreibung:   CursorPos merken
  --------------------------------------------------------------------*/
-
-
 void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
 {
     //Das Browse-Flag wird vom Sfx durchgereicht, wenn Dokumente gebrowsed
@@ -1212,6 +1186,7 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
     rUserData += ';';
     rUserData += FRMTYPE_NONE == pWrtShell->GetSelFrmType() ? '0' : '1';
 }
+
 /*--------------------------------------------------------------------
     Beschreibung: CursorPos setzen
  --------------------------------------------------------------------*/
@@ -1230,7 +1205,6 @@ bool lcl_IsOwnDocument( SwView& rView )
             (!Changed.Len() && Created.Len() && Created == FullName );
 }
 
-
 void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
 {
     if ( rUserData.GetTokenCount() > 1 &&
@@ -1555,6 +1529,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
         }
     }
 }
+
 #define NUM_VIEW_SETTINGS 12
 void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSequence, sal_Bool bBrowse )
 {
@@ -1626,8 +1601,6 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
 }
 #undef NUM_VIEW_SETTINGS
 
-
-
 void SwView::ShowCursor( bool bOn )
 {
     //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area
@@ -1643,8 +1616,6 @@ void SwView::ShowCursor( bool bOn )
         pWrtShell->LockView( FALSE );
 }
 
-
-
 ErrCode SwView::DoVerb( long nVerb )
 {
     if ( !GetViewFrame()->GetFrame().IsInPlace() )
@@ -1666,18 +1637,11 @@ sal_Bool SwView::HasSelection( sal_Bool  bText ) const
                  : GetWrtShell().HasSelection();
 }
 
-/*-----------------09/16/97 09:50am-----------------
-
---------------------------------------------------*/
-
 String SwView::GetSelectionText( sal_Bool bCompleteWrds )
 {
     return GetSelectionTextParam( bCompleteWrds, sal_True );
 }
 
-/*-----------------09/16/97 09:50am-----------------
-
---------------------------------------------------*/
 String  SwView::GetSelectionTextParam( sal_Bool bCompleteWrds,
                                        sal_Bool bEraseTrail )
 {
@@ -1691,12 +1655,6 @@ String  SwView::GetSelectionTextParam( sal_Bool bCompleteWrds,
     return sReturn;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 SwGlossaryHdl* SwView::GetGlosHdl()
 {
     if(!pGlosHdl)
@@ -1704,12 +1662,6 @@ SwGlossaryHdl* SwView::GetGlosHdl()
     return pGlosHdl;
 }
 
-/*-----------------05.09.96 15.50-------------------
-
---------------------------------------------------*/
-
-
-
 void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     BOOL bCallBase = sal_True;
@@ -1801,9 +1753,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         SfxViewShell::Notify(rBC, rHint);
 }
 
-/*-----------------02.12.96 12:36-------------------
-
---------------------------------------------------*/
 #if defined WIN || defined WNT || defined UNX
 
 void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
@@ -1836,11 +1785,6 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
 }
 #endif
 
-/*-----------------04.03.97 15:07-------------------
-
---------------------------------------------------*/
-
-
 void    SwView::StopShellTimer()
 {
     if(aTimer.IsActive())
@@ -1856,9 +1800,6 @@ void    SwView::StopShellTimer()
     }
 }
 
-/*-----------------09/03/97 04:12pm-----------------
-
---------------------------------------------------*/
 sal_uInt16  SwView::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
 {
     SfxViewFrame* pVFrame = GetViewFrame();
@@ -1876,10 +1817,8 @@ sal_uInt16  SwView::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
     return SfxViewShell::PrepareClose( bUI, bForBrowsing );
 }
 
-
-
-    // status methods for clipboard.
-    // Status changes now notified from the clipboard.
+// status methods for clipboard.
+// Status changes now notified from the clipboard.
 BOOL SwView::IsPasteAllowed()
 {
     USHORT nPasteDestination = SwTransferable::GetSotDestination( *pWrtShell );
@@ -1929,9 +1868,7 @@ BOOL SwView::IsPasteSpecialAllowed()
     }
     return bPasteSpecialState;
 }
-/* -----------------------------12.07.01 13:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::NotifyDBChanged()
 {
     GetViewImpl()->GetUNOObject_Impl()->NotifyDBChanged();
@@ -1940,17 +1877,11 @@ void SwView::NotifyDBChanged()
 /*--------------------------------------------------------------------
     Beschreibung:   Drucken
  --------------------------------------------------------------------*/
-
-/* -----------------------------28.10.02 13:25--------------------------------
-
- ---------------------------------------------------------------------------*/
 SfxObjectShellRef & SwView::GetTmpSelectionDoc()
 {
     return GetViewImpl()->GetTmpSelectionDoc();
 }
-/* -----------------------------31.10.02 13:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxObjectShellRef & SwView::GetOrCreateTmpSelectionDoc()
 {
     SfxObjectShellRef &rxTmpDoc = GetViewImpl()->GetTmpSelectionDoc();
@@ -1962,16 +1893,12 @@ SfxObjectShellRef & SwView::GetOrCreateTmpSelectionDoc()
     }
     return rxTmpDoc;
 }
-/* -----------------3/31/2003 12:39PM----------------
 
- --------------------------------------------------*/
 void SwView::AddTransferable(SwTransferable& rTransferable)
 {
     GetViewImpl()->AddTransferable(rTransferable);
 }
 
-/* --------------------------------------------------*/
-
 void SwPrtOptions::MakeOptions( BOOL bWeb )
 {
     *this = *SW_MOD()->GetPrtOptions(bWeb);
@@ -1985,4 +1912,3 @@ void SwPrtOptions::MakeOptions( BOOL bWeb )
     aMulti.SelectAll();
     aMulti.Select( 0, FALSE );
 }
-
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 93a29f699f5a..0cd9f3188a2e 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -94,7 +94,6 @@
 #include "swslots.hxx"
 #include <PostItMgr.hxx>
 
-
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
@@ -104,7 +103,6 @@ using ::rtl::OUString;
 
 #include <unomid.h>
 
-
 SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
 {
     if ( SvtModuleOptions().IsWriter() )
@@ -136,24 +134,16 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
 
 TYPEINIT1(SwView,SfxViewShell)
 
-/*-----------------13.12.97 11:06-------------------
-
---------------------------------------------------*/
 ShellModes  SwView::GetShellMode()
 {
     return pViewImpl->GetShellMode();
 }
 
-/*-----------------13.12.97 11:28-------------------
-
---------------------------------------------------*/
 view::XSelectionSupplier* SwView::GetUNOObject()
 {
     return pViewImpl->GetUNOObject();
 }
-/* -----------------------------06.05.2002 13:18------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions)
 {
     pWrtShell->ApplyAccessiblityOptions(rAccessibilityOptions);
@@ -162,39 +152,29 @@ void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOpt
         pWrtShell->ShowCrsr();
 
 }
-/*-- 26.05.2004 09:14:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void   SwView::SetMailMergeConfigItem(SwMailMergeConfigItem*  pConfigItem,
                 sal_uInt16 nRestart, sal_Bool bIsSource)
 {
     pViewImpl->SetMailMergeConfigItem(pConfigItem, nRestart, bIsSource);
     UIFeatureChanged();
 }
-/*-- 26.05.2004 09:14:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem*  SwView::GetMailMergeConfigItem()
 {
     return pViewImpl->GetMailMergeConfigItem();
 }
-/*-- 26.05.2004 09:14:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt16 SwView::GetMailMergeRestartPage() const
 {
     return pViewImpl->GetMailMergeRestartPage();
 }
-/*-- 03.09.2004 11:56:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwView::IsMailMergeSourceView() const
 {
     return pViewImpl->IsMailMergeSourceView();
 }
-/*-- 12.04.2006 11:51:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool lcl_IsViewMarks( const SwViewOption& rVOpt )
 {
     return  rVOpt.IsHardBlank() &&
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index fadfd6edb72e..58cb5b8ba0db 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -53,12 +53,6 @@
 
 extern int bDocSzUpdated;
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwView::Activate(BOOL bMDIActivate)
 {
     // aktuelle View anmelden an der DocShell
@@ -129,11 +123,6 @@ void SwView::Activate(BOOL bMDIActivate)
     SfxViewShell::Activate(bMDIActivate);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwView::Deactivate(BOOL bMDIActivate)
 {
     extern BOOL bFlushCharBuffer ;
@@ -151,18 +140,11 @@ void SwView::Deactivate(BOOL bMDIActivate)
     SfxViewShell::Deactivate(bMDIActivate);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwView::MarginChanged()
 {
     GetWrtShell().SetBrowseBorder( GetMargin() );
 }
 
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
-
 void SwView::ExecFormatPaintbrush(SfxRequest& rReq)
 {
     if(!pFormatClipboard)
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 51c6bc514c99..d45f47d7de35 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -158,7 +158,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ui::dialogs;
 
-
 static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, USHORT nWhichId )
 {
     if (nWhichId == RES_CHRATR_LANGUAGE ||
@@ -187,7 +186,6 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, USHORT nWhichId
 /*---------------------------------------------------------------------------
     Beschreibung:   String fuer die Seitenanzeige in der Statusbar basteln.
  ----------------------------------------------------------------------------*/
-
 String SwView::GetPageStr( USHORT nPg, USHORT nLogPg,
                             const String& rDisplay )
 {
@@ -208,7 +206,6 @@ String SwView::GetPageStr( USHORT nPg, USHORT nLogPg,
     return aStr;
 }
 
-
 int SwView::InsertGraphic( const String &rPath, const String &rFilter,
                                 BOOL bLink, GraphicFilter *pFlt,
                                 Graphic* pPreviewGrf, BOOL bRule )
@@ -254,7 +251,6 @@ int SwView::InsertGraphic( const String &rPath, const String &rFilter,
     return nRes;
 }
 
-
 BOOL SwView::InsertGraphicDlg( SfxRequest& rReq )
 {
 #ifndef ENABLE_PROP_WITHOUTLINK
@@ -487,7 +483,6 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq )
     return bReturn;
 }
 
-
 void __EXPORT SwView::Execute(SfxRequest &rReq)
 {
     USHORT nSlot = rReq.GetSlot();
@@ -1169,7 +1164,6 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
 /*--------------------------------------------------------------------
     Beschreibung:   SeitenNr-Feld invalidieren
  --------------------------------------------------------------------*/
-
 void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr)
 {
     String sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr ));
@@ -1182,8 +1176,6 @@ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgSt
 /*--------------------------------------------------------------------
     Beschreibung:   Status der Stauszeile
  --------------------------------------------------------------------*/
-
-
 void SwView::StateStatusLine(SfxItemSet &rSet)
 {
     SwWrtShell& rShell = GetWrtShell();
@@ -1530,8 +1522,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 /*--------------------------------------------------------------------
     Beschreibung:   Execute fuer die Stauszeile
  --------------------------------------------------------------------*/
-
-
 void SwView::ExecuteStatusLine(SfxRequest &rReq)
 {
     SwWrtShell &rSh = GetWrtShell();
@@ -1817,7 +1807,6 @@ void SwView::InsFrmMode(USHORT nCols)
 /*--------------------------------------------------------------------
     Beschreibung:   Links bearbeiten
  --------------------------------------------------------------------*/
-
 void SwView::EditLinkDlg()
 {
     BOOL bWeb = 0 != PTR_CAST(SwWebView, this);
@@ -1959,7 +1948,6 @@ BOOL SwView::JumpToSwMark( const String& rMark )
 // Undo "Insert form file" crashes with documents imported from binary filter (.sdw) => disabled
 // Undo "Insert form file" crashes with (.odt) documents crashes if these documents contains
 // page styles with active header/footer => disabled for those documents
-
 sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc )
 {
     sal_uInt16 nRet = 0;
@@ -1981,7 +1969,6 @@ sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc )
 /*--------------------------------------------------------------------
     Beschreibung:   Links bearbeiten
  --------------------------------------------------------------------*/
-
 void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem )
 {
     pViewImpl->InitRequest( rRequest );
@@ -2188,9 +2175,7 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
     delete pMedium;
     return nFound;
 }
-/* -----------------05.02.2003 12:06-----------------
- *
- * --------------------------------------------------*/
+
 void SwView::EnableMailMerge(BOOL bEnable )
 {
     bInMailMerge = bEnable;
@@ -2198,8 +2183,7 @@ void SwView::EnableMailMerge(BOOL bEnable )
     rBind.Invalidate(FN_INSERT_FIELD_DATA_ONLY);
     rBind.Update(FN_INSERT_FIELD_DATA_ONLY);
 }
-/*
-*/
+
 namespace
 {
     sal_Bool lcl_NeedAdditionalDataSource( const uno::Reference< XNameAccess >& _rDatasourceContext )
@@ -2214,10 +2198,6 @@ namespace
     }
 }
 
-/* -----------------27.11.2002 12:12-----------------
- *
- * --------------------------------------------------*/
-
 class SwMergeSourceWarningBox_Impl : public ModalDialog
 {
         FixedInfo       aMessageFI;
@@ -2264,9 +2244,6 @@ class SwMergeSourceWarningBox_Impl : public ModalDialog
         void            SetMessText( const String& rText ) { aMessageFI.SetText( rText ); }
 };
 
-
-
-
 void SwView::GenerateFormLetter(BOOL bUseCurrentDocument)
 {
     if(bUseCurrentDocument)
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index abae753c1b56..4cc2d6065ab8 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -82,10 +82,10 @@
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
+
 /*--------------------------------------------------------------------
     Beschreibung:   Drawing-Ids ausfuehren
  --------------------------------------------------------------------*/
-
 void SwView::ExecDraw(SfxRequest& rReq)
 {
     const SfxItemSet *pArgs = rReq.GetArgs();
@@ -410,9 +410,6 @@ void SwView::ExecDraw(SfxRequest& rReq)
 /*--------------------------------------------------------------------
     Beschreibung:   Drawing beenden
  --------------------------------------------------------------------*/
-
-
-
 void SwView::ExitDraw()
 {
     NoRotate();
@@ -464,9 +461,6 @@ void SwView::ExitDraw()
 /*--------------------------------------------------------------------
     Beschreibung:   Rotate-Mode abschalten
  --------------------------------------------------------------------*/
-
-
-
 void SwView::NoRotate()
 {
     if (IsDrawRotate())
@@ -482,7 +476,6 @@ void SwView::NoRotate()
 /******************************************************************************
  *  Beschreibung: DrawTextEditMode einschalten
  ******************************************************************************/
-
 sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
 {
     SdrObject* pObj;
@@ -621,9 +614,6 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
 /******************************************************************************
  *  Beschreibung: Ist ein DrawTextObjekt selektiert?
  ******************************************************************************/
-
-
-
 sal_Bool SwView::IsTextTool() const
 {
     sal_uInt16 nId;
@@ -638,32 +628,16 @@ sal_Bool SwView::IsTextTool() const
     return (nInvent==SdrInventor);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 SdrView* SwView::GetDrawView() const
 {
     return GetWrtShell().GetDrawView();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 sal_Bool SwView::IsBezierEditMode()
 {
     return (!IsDrawSelMode() && GetWrtShell().GetDrawView()->HasMarkablePoints());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 sal_Bool SwView::IsFormMode() const
 {
     if (GetDrawFuncPtr() && GetDrawFuncPtr()->IsCreateObj())
@@ -674,12 +648,6 @@ sal_Bool SwView::IsFormMode() const
     return AreOnlyFormsSelected();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 void SwView::SetDrawFuncPtr(SwDrawBase* pFuncPtr)
 {
     if (pDrawActual)
@@ -687,20 +655,12 @@ void SwView::SetDrawFuncPtr(SwDrawBase* pFuncPtr)
     pDrawActual = pFuncPtr;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwView::SetSelDrawSlot()
 {
     nDrawSfxId = SID_OBJECT_SELECT;
     sDrawCustom.Erase();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 sal_Bool SwView::AreOnlyFormsSelected() const
 {
     if ( GetWrtShell().IsFrmSelected() )
@@ -733,10 +693,6 @@ sal_Bool SwView::AreOnlyFormsSelected() const
     return bForm;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const
 {
     sal_Bool bRet = sal_False;
@@ -756,10 +712,6 @@ sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const
     return bRet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
 {
     sal_Bool bRet = sal_False;
@@ -779,7 +731,6 @@ sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
     return bRet;
 }
 
-
 //#i87414# mod
 IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
 {
@@ -788,9 +739,6 @@ IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 sal_Bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
 {
     sal_Bool bRet = sal_False;
@@ -807,12 +755,6 @@ sal_Bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
     return bRet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 sal_Bool SwView::IsDrawTextHyphenate()
 {
     SdrView *pSdrView = pWrtShell->GetDrawView();
@@ -828,12 +770,6 @@ sal_Bool SwView::IsDrawTextHyphenate()
     return bHyphenate;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 void SwView::HyphenateDrawText()
 {
     SdrView *pSdrView = pWrtShell->GetDrawView();
@@ -844,6 +780,3 @@ void SwView::HyphenateDrawText()
     pSdrView->SetAttributes( aSet );
     GetViewFrame()->GetBindings().Invalidate(FN_HYPHENATE_OPT_DLG);
 }
-
-
-
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index b3f73f7c38e4..7fe310b5a004 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -114,8 +114,6 @@ using namespace ::com::sun::star::smarttags;
 /*--------------------------------------------------------------------
     Beschreibung:   Lingu-Dispatcher
  --------------------------------------------------------------------*/
-
-
 void SwView::ExecLingu(SfxRequest &rReq)
 {
     switch(rReq.GetSlot())
@@ -241,7 +239,6 @@ void SwView::ExecLingu(SfxRequest &rReq)
 /*--------------------------------------------------------------------
     Description: start language specific text conversion
  --------------------------------------------------------------------*/
-
 void SwView::StartTextConversion(
         LanguageType nSourceLang,
         LanguageType nTargetLang,
@@ -287,7 +284,6 @@ void SwView::StartTextConversion(
 /*--------------------------------------------------------------------
      spellcheck and text conversion related stuff
  --------------------------------------------------------------------*/
-
 void SwView::SpellStart( SvxSpellArea eWhich,
         sal_Bool bStartDone, sal_Bool bEndDone,
         SwConversionArgs *pConvArgs )
@@ -350,8 +346,6 @@ void SwView::SpellStart( SvxSpellArea eWhich,
 /*--------------------------------------------------------------------
     Beschreibung: Fehlermeldung beim Spelling
  --------------------------------------------------------------------*/
-
-
 // Der uebergebene Pointer nLang ist selbst der Wert
 IMPL_LINK( SwView, SpellError, LanguageType *, pLang )
 {
@@ -415,8 +409,6 @@ IMPL_LINK( SwView, SpellError, LanguageType *, pLang )
 /*--------------------------------------------------------------------
      Beschreibung: Spelling beenden und Cursor wiederherstellen
  --------------------------------------------------------------------*/
-
-
 void SwView::SpellEnd( SwConversionArgs *pConvArgs )
 {
     pWrtShell->SpellEnd( pConvArgs );
@@ -424,7 +416,6 @@ void SwView::SpellEnd( SwConversionArgs *pConvArgs )
         pWrtShell->SetMark();
 }
 
-
 void SwView::HyphStart( SvxSpellArea eWhich )
 {
     switch ( eWhich )
@@ -449,8 +440,6 @@ void SwView::HyphStart( SvxSpellArea eWhich )
 /*--------------------------------------------------------------------
      Beschreibung: Interaktive Trennung
  --------------------------------------------------------------------*/
-
-
 void SwView::HyphenateDocument()
 {
     // do not hyphenate if interactive hyphenationg is active elsewhere
@@ -523,9 +512,6 @@ void SwView::HyphenateDocument()
     }
 }
 
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
-
 bool SwView::IsValidSelectionForThesaurus() const
 {
     // must not be a multi-selection, and if it is a selection it needs
@@ -536,13 +522,11 @@ bool SwView::IsValidSelectionForThesaurus() const
     return !bMultiSel && (!bSelection || pWrtShell->IsSelOnePara() );
 }
 
-
 String SwView::GetThesaurusLookUpText( bool bSelection ) const
 {
     return bSelection ? pWrtShell->GetSelTxt() : pWrtShell->GetCurWord();
 }
 
-
 void SwView::InsertThesaurusSynonym( const String &rSynonmText, const String &rLookUpText, bool bSelection )
 {
     sal_Bool bOldIns = pWrtShell->IsInsMode();
@@ -586,12 +570,9 @@ void SwView::InsertThesaurusSynonym( const String &rSynonmText, const String &rL
     pWrtShell->SetInsMode( bOldIns );
 }
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Thesaurus starten
  --------------------------------------------------------------------*/
-
-
 void SwView::StartThesaurus()
 {
     if (!IsValidSelectionForThesaurus())
@@ -648,7 +629,6 @@ void SwView::StartThesaurus()
 /*--------------------------------------------------------------------
     Beschreibung:   Online-Vorschlaege anbieten
  *--------------------------------------------------------------------*/
-
 //!! Start of extra code for context menu modifying extensions
 struct ExecuteInfo
 {
@@ -833,7 +813,6 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
    This function shows the popup menu for smarttag
    actions.
 */
-
 sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
 {
     sal_Bool bRet = sal_False;
@@ -864,8 +843,6 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
     return bRet;
 }
 
-
-
 class SwFieldPopup : public PopupMenu
 {
 public:
@@ -977,7 +954,6 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
     }
 }
 
-
 BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
 {
     sal_Bool bRet = sal_False;
@@ -1002,4 +978,3 @@ BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
 
     return bRet;
 }
-
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 6f95e271b10c..8f3d822d271b 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -289,7 +289,6 @@ void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly )
 /*
  * Scrollbar - Handler
  */
-
 IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent )
 {
     DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
@@ -389,9 +388,7 @@ IMPL_LINK( SwView, BtnPage, Button *, pButton )
     Application::PostUserEvent( STATIC_LINK(this, SwView, MoveNavigationHdl), pbNext );
     return 0;
 }
-/*-----------------20.06.97 10:46-------------------
 
---------------------------------------------------*/
 IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
 {
     if ( !pbNext )
@@ -541,16 +538,6 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
     return 0;
 }
 
-/*************************************************************************
-|*
-|*  SwView::CreateTab()
-|*
-|*  Beschreibung
-|*  Ersterstellung      VB 29.05.91
-|*  Letzte Aenderung    OS 09.05.96
-|*
-*************************************************************************/
-
 int SwView::CreateTab()
 {
     pHRuler->SetActive(GetFrame() && IsActive());
@@ -560,16 +547,6 @@ int SwView::CreateTab()
     return 1;
 }
 
-/*************************************************************************
-|*
-|*  SwView::KillTab()
-|*
-|*  Beschreibung
-|*  Ersterstellung      VB 29.05.91
-|*  Letzte Aenderung    OS 09.05.96
-|*
-*************************************************************************/
-
 int SwView::KillTab()
 {
     pHRuler->Hide();
@@ -594,28 +571,16 @@ void SwView::ChangeVLinealMetric( FieldUnit eUnit )
         pVRuler->Invalidate();
     }
 }
-/* -----------------------------07.04.01 17:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::GetVLinealMetric(FieldUnit& eToFill) const
 {
     eToFill = pVRuler->GetUnit();
 }
-/* -----------------------------07.04.01 17:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::GetHLinealMetric(FieldUnit& eToFill) const
 {
     eToFill = pHRuler->GetUnit();
 }
-/*************************************************************************
-|*
-|*  SwView::CreateVLineal()
-|*
-|*  Beschreibung
-|*  Ersterstellung  VB 29.05.91
-|*
-*************************************************************************/
 
 int SwView::CreateVLineal()
 {
@@ -627,15 +592,6 @@ int SwView::CreateVLineal()
     return 1;
 }
 
-/*************************************************************************
-|*
-|*  SwView::KillVLineal()
-|*
-|*  Beschreibung
-|*  Ersterstellung  VB 29.05.91
-|*
-*************************************************************************/
-
 int SwView::KillVLineal()
 {
     pVRuler->Hide();
@@ -643,15 +599,6 @@ int SwView::KillVLineal()
     InvalidateBorder();
     return 1;
 }
-/*************************************************************************
-|*
-|*  SwView::ExecRulerClick()
-|*
-|*  Beschreibung
-|*  Ersterstellung  OS 15.06.95
-|*  Letzte Aenderung
-|*
-*************************************************************************/
 
 IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
 {
@@ -677,18 +624,10 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
     return 0;
 }
 
-
-/*-----------------20.02.97 09:11-------------------
-
---------------------------------------------------*/
-
 USHORT SwView::GetMoveType()
 {
     return nMoveType;
 }
-/*-----------------20.02.97 09:11-------------------
-
---------------------------------------------------*/
 
 void SwView::SetMoveType(USHORT nSet)
 {
@@ -708,18 +647,11 @@ void SwView::SetMoveType(USHORT nSet)
     }
 }
 
-/*-----------------20.06.97 11:18-------------------
-
---------------------------------------------------*/
 void SwView::SetActMark(sal_Int32 nSet)
 {
     nActMark = nSet;
 }
 
-/*-----------------15.03.97 10:53-------------------
-
---------------------------------------------------*/
-
 void SwView::SetImageButtonColor(Color& rColor)
 {
     if(pPageUpBtn)
@@ -728,25 +660,19 @@ void SwView::SetImageButtonColor(Color& rColor)
         pPageDownBtn->SetControlForeground(rColor);
     }
 }
-/* -----------------------------2002/06/26 13:57------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::ShowHScrollbar(sal_Bool bShow)
 {
     DBG_ASSERT(pHScrollbar, "Scrollbar invalid");
     pHScrollbar->ExtendedShow(bShow);
 }
-/* -----------------------------2002/06/26 13:57------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SwView::IsHScrollbarVisible()const
 {
     DBG_ASSERT(pHScrollbar, "Scrollbar invalid");
     return pHScrollbar->IsVisible( FALSE ) || pHScrollbar->IsAuto();
 }
-/* -----------------------------2002/06/26 13:57------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwView::ShowVScrollbar(sal_Bool bShow)
 {
     DBG_ASSERT(pVScrollbar, "Scrollbar invalid");
@@ -755,9 +681,7 @@ void SwView::ShowVScrollbar(sal_Bool bShow)
     pPageDownBtn->Show(bShow);
     pNaviBtn->Show(bShow);
 }
-/* -----------------------------2002/06/26 13:57------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SwView::IsVScrollbarVisible()const
 {
     DBG_ASSERT(pVScrollbar, "Scrollbar invalid");
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 2b7d2f1e52b8..08caf92fb795 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -80,8 +80,6 @@ inline long GetLeftMargin( SwView &rView )
                                          lRet + DOCUMENTBORDER + nLeftOfst;
 }
 
-//-------------------------------------------------------------------------
-
 void lcl_GetPos(SwView* pView,
                 Point& rPos,
                 SwScrollbar* pScrollbar,
@@ -116,7 +114,6 @@ void lcl_GetPos(SwView* pView,
 /*--------------------------------------------------------------------
     Beschreibung:   Nullpunkt Lineal setzen
  --------------------------------------------------------------------*/
-
 void SwView::InvalidateRulerPos()
 {
     static USHORT __READONLY_DATA aInval[] =
@@ -142,7 +139,6 @@ void SwView::InvalidateRulerPos()
                     viertel Bildschirm bis vor das Ende des Dokumentes
                     gescrollt werden kann.
  --------------------------------------------------------------------*/
-
 long SwView::SetHScrollMax( long lMax )
 {
     const long lBorder = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2;
@@ -153,7 +149,6 @@ long SwView::SetHScrollMax( long lMax )
     return Max( Min( lMax, lSize ), 0L );
 }
 
-
 long SwView::SetVScrollMax( long lMax )
 {
     const long lBorder = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2;
@@ -161,7 +156,6 @@ long SwView::SetVScrollMax( long lMax )
     return Max( Min( lMax, lSize), 0L );        // siehe horz.
 }
 
-
 Point SwView::AlignToPixel(const Point &rPt) const
 {
     return GetEditWin().PixelToLogic( GetEditWin().LogicToPixel( rPt ) );
@@ -170,7 +164,6 @@ Point SwView::AlignToPixel(const Point &rPt) const
 /*--------------------------------------------------------------------
     Beschreibung:   Dokumentgroesse hat sich geaendert
  --------------------------------------------------------------------*/
-
 void SwView::DocSzChgd(const Size &rSz)
 {
 
@@ -221,7 +214,6 @@ aDocSz = rSz;
 /*--------------------------------------------------------------------
     Beschreibung:   Visarea neu setzen
  --------------------------------------------------------------------*/
-
 void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
 {
     const Size aOldSz( aVisArea.GetSize() );
@@ -315,7 +307,6 @@ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
 /*--------------------------------------------------------------------
     Beschreibung:   Pos VisArea setzen
  --------------------------------------------------------------------*/
-
 void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar )
 {
     //einmal alignen, damit Brushes korrekt angesetzt werden.
@@ -343,7 +334,6 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar )
             bUpdateScrollbar);
 }
 
-
 void SwView::CheckVisArea()
 {
     pHScrollbar->SetAuto( pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) &&
@@ -371,7 +361,6 @@ void SwView::CheckVisArea()
         USHORT nRange           optional exakte Angabe des Bereiches,
                                 um den ggfs. gescrollt werden soll
  --------------------------------------------------------------------*/
-
 void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
                      USHORT nRangeX, USHORT nRangeY)
 {
@@ -419,13 +408,11 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
 /*--------------------------------------------------------------------
     Beschreibung:   Scrolling
  --------------------------------------------------------------------*/
-
 BOOL SwView::IsScroll( const Rectangle &rRect ) const
 {
     return bCenterCrsr || bTopCrsr || !aVisArea.IsInside(rRect);
 }
 
-
 void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY )
 {
     if ( aVisArea.IsEmpty() )
@@ -552,7 +539,6 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY )
     Beschreibung:   Seitenweises Scrollen
     Liefern den Wert, um den bei PageUp / -Down gescrollt werden soll
  --------------------------------------------------------------------*/
-
 BOOL SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
 {
     if ( !aVisArea.Top() || !aVisArea.GetHeight() )
@@ -567,7 +553,6 @@ BOOL SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
     return TRUE;
 }
 
-
 BOOL SwView::GetPageScrollDownOffset( SwTwips &rOff ) const
 {
     if ( !aVisArea.GetHeight() ||
@@ -585,7 +570,6 @@ BOOL SwView::GetPageScrollDownOffset( SwTwips &rOff ) const
 }
 
 // Seitenweises Blaettern
-
 long SwView::PageUp()
 {
     if (!aVisArea.GetHeight())
@@ -598,7 +582,6 @@ long SwView::PageUp()
     return 1;
 }
 
-
 long SwView::PageDown()
 {
     if ( !aVisArea.GetHeight() )
@@ -610,7 +593,6 @@ long SwView::PageDown()
     return 1;
 }
 
-
 long SwView::PhyPageUp()
 {
     //aktuell sichtbare Seite erfragen, nicht formatieren
@@ -631,7 +613,6 @@ long SwView::PhyPageUp()
     return 1;
 }
 
-
 long SwView::PhyPageDown()
 {
     //aktuell sichtbare Seite erfragen, nicht formatieren
@@ -651,7 +632,6 @@ long SwView::PhyPageDown()
     return 1;
 }
 
-
 long SwView::PageUpCrsr( BOOL bSelect )
 {
     if ( !bSelect )
@@ -678,7 +658,6 @@ long SwView::PageUpCrsr( BOOL bSelect )
     return FALSE;
 }
 
-
 long SwView::PageDownCrsr(BOOL bSelect)
 {
     SwTwips lOff = 0;
@@ -696,7 +675,6 @@ long SwView::PageDownCrsr(BOOL bSelect)
 /*------------------------------------------------------------------------
  Beschreibung:  Handler der Scrollbars
 ------------------------------------------------------------------------*/
-
 IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
 {
     if ( GetWrtShell().ActionPend() )
@@ -767,10 +745,10 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
 
     return 0;
 }
+
 /*------------------------------------------------------------------------
  Beschreibung:  Handler der Scrollbars
 ------------------------------------------------------------------------*/
-
 IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
 {
     if ( !GetWrtShell().ActionPend() )
@@ -795,12 +773,9 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
 
 /*--------------------------------------------------------------------
     Beschreibung:
-
         berechnet die Groesse von aVisArea abhaengig von der Groesse
         des EditWin auf dem Schirm.
-
  --------------------------------------------------------------------*/
-
 void SwView::CalcVisArea( const Size &rOutPixel )
 {
     Point aTopLeft;
@@ -844,8 +819,6 @@ void SwView::CalcVisArea( const Size &rOutPixel )
 /*--------------------------------------------------------------------
     Beschreibung:   Bedienelemente neu anordnen
  --------------------------------------------------------------------*/
-
-
 void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
 {
     BOOL bRightVRuler = pWrtShell->GetViewOptions()->IsVRulerRight();
@@ -879,7 +852,6 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
     SetBorderPixel( rToFill );
 }
 
-
 void ViewResizePixel( const Window &rRef,
                     const Point &rOfst,
                     const Size &rSize,
@@ -1013,7 +985,6 @@ void ViewResizePixel( const Window &rRef,
     }
 }
 
-
 void SwView::ShowAtResize()
 {
     bShowAtResize = FALSE;
@@ -1021,7 +992,6 @@ void SwView::ShowAtResize()
         pHRuler->Show();
 }
 
-
 void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
 {
     Size aObjSize = GetObjectShell()->GetVisArea().GetSize();
@@ -1104,7 +1074,6 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
     bInInnerResizePixel = FALSE;
 }
 
-
 void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
 {
     // FME 22.08.2003 #i16909# - return, if no size (caused by minimize window).
@@ -1252,7 +1221,6 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
     }
 }
 
-
 void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
 {
     const Fraction &rFrac = rX < rY ? rX : rY;
@@ -1263,7 +1231,6 @@ void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
     SfxViewShell::SetZoomFactor( rX, rY );
 }
 
-
 Size SwView::GetOptimalSizePixel() const
 {
     Size aPgSize;
@@ -1285,7 +1252,6 @@ Size SwView::GetOptimalSizePixel() const
     return GetEditWin().LogicToPixel( aPgSize );
 }
 
-
 BOOL SwView::UpdateScrollbars()
 {
     BOOL bRet = FALSE;
@@ -1334,7 +1300,6 @@ BOOL SwView::UpdateScrollbars()
     return bRet;
 }
 
-
 void SwView::Move()
 {
     if ( GetWrtShell().IsInSelect() )
@@ -1373,5 +1338,3 @@ BOOL SwView::HandleWheelCommands( const CommandEvent& rCEvt )
     }
     return bOk;
 }
-
-
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 1b8717fe25ca..52bb848fd1d1 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -91,12 +91,9 @@
 
 using namespace ::com::sun::star;
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Drucker an Sfx uebergeben
  --------------------------------------------------------------------*/
-
-
 SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate )
 {
     const IDocumentDeviceAccess* pIDDA = GetWrtShell().getIDocumentDeviceAccess();
@@ -113,7 +110,6 @@ SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate )
 /*--------------------------------------------------------------------
     Beschreibung:   Druckerwechsel weitermelden
  --------------------------------------------------------------------*/
-
 void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb )
 {
     SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb);
@@ -134,7 +130,6 @@ void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb )
     }
 }
 
-
 USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool  )
 {
     SwWrtShell &rSh = GetWrtShell();
@@ -174,7 +169,6 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool  )
 /*--------------------------------------------------------------------
     Beschreibung:   TabPage fuer applikationsspezifische Druckoptionen
  --------------------------------------------------------------------*/
-
 SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent,
                                                     const SfxItemSet& rSet)
 {
@@ -184,7 +178,6 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent,
 /*--------------------------------------------------------------------
     Beschreibung:   Druckerdialog
  --------------------------------------------------------------------*/
-
 PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh )
 {
     PrintDialog *pDlg = new PrintDialog( pParent, false );
@@ -205,10 +198,6 @@ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh )
     return pDlg;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent )
 {
     // AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden,
@@ -220,7 +209,6 @@ PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent )
 /*--------------------------------------------------------------------
     Beschreibung:   Print-Dispatcher
  --------------------------------------------------------------------*/
-
 void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
 {
     BOOL bWeb = 0 != PTR_CAST(SwWebView, this);
@@ -315,7 +303,6 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
     Beschreibung:   Page Drucker/Zusaetze erzeugen fuer SwView und
                     SwPagePreview
  --------------------------------------------------------------------*/
-
 SfxTabPage* CreatePrintOptionsPage( Window *pParent,
                                 const SfxItemSet &rOptions, BOOL bPreview )
 {
@@ -339,7 +326,6 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent,
     return pPage;
 }
 
-
 void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb )
 {
     SwPrintData aPrtData = *SW_MOD()->GetPrtOptions(bWeb);
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index de30153f2439..47d7a2038007 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -68,10 +68,6 @@
 
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwView::GetState(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
@@ -435,11 +431,6 @@ void SwView::GetState(SfxItemSet &rSet)
     }
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwView::GetDrawState(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
@@ -505,10 +496,6 @@ void SwView::GetDrawState(SfxItemSet &rSet)
         }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 sal_Bool SwView::HasUIFeature( sal_uInt32 nFeature )
 {
     sal_Bool bRet = sal_False;
@@ -519,4 +506,3 @@ sal_Bool SwView::HasUIFeature( sal_uInt32 nFeature )
     }
     return bRet;
 }
-
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 9e806f5b5159..93271891cc49 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -79,12 +79,9 @@ using namespace ::com::sun::star;
     Beschreibung:   Debug-Methode
  --------------------------------------------------------------------*/
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Columns eintueten
  --------------------------------------------------------------------*/
-
-
 void lcl_FillSvxColumn(const SwFmtCol& rCol,
                           USHORT nTotalWidth,
                           SvxColumnItem& rColItem,
@@ -126,8 +123,6 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol,
 /*--------------------------------------------------------------------
     Beschreibung:   ColumnItem in ColumnInfo ueberfuehren
  --------------------------------------------------------------------*/
-
-
 void lcl_ConvertToCols(const SvxColumnItem& rColItem,
                           USHORT nTotalWidth,
                           SwFmtCol& rCols)
@@ -178,8 +173,6 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
 /*--------------------------------------------------------------------
     Beschreibung:   Tabs loeschen
  --------------------------------------------------------------------*/
-
-
 void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 {
     // Def Tabs loeschen
@@ -199,8 +192,6 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
 /*--------------------------------------------------------------------
     Beschreibung:   Seitenrand umdrehen
  --------------------------------------------------------------------*/
-
-
 void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
 {
     USHORT nPhyPage, nVirPage;
@@ -218,8 +209,6 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
     Beschreibung:   Wenn der Rahmenrand verschoben wird, sollen die
                     Spaltentrenner an der gleichen absoluten Position bleiben
  --------------------------------------------------------------------*/
-
-
 void lcl_Scale(long& nVal, long nScale)
 {
     nVal *= nScale;
@@ -264,12 +253,11 @@ void ResizeFrameCols(SwFmtCol& rCol,
     //reset auto width
     rCol.SetOrtho(FALSE, 0, 0 );
 }
+
 /*--------------------------------------------------------------------
     Beschreibung:   Hier werden alle Aenderungen der Tableiste
                     wieder in das Modell geschossen
  --------------------------------------------------------------------*/
-
-
 void SwView::ExecTabWin( SfxRequest& rReq )
 {
     SwWrtShell &rSh         = GetWrtShell();
@@ -902,8 +890,6 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                     sprich alle relevanten Attribute an der CursorPos
                     werden der Tableiste uebermittelt
  --------------------------------------------------------------------*/
-
-
 void SwView::StateTabWin(SfxItemSet& rSet)
 {
     SwWrtShell &rSh         = GetWrtShell();
@@ -1845,5 +1831,3 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         rSet.Put(aProtect);
     }
 }
-
-