[Libreoffice-commits] .: sw/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Mon Oct 11 15:46:45 PDT 2010


 sw/source/ui/dbui/addresslistdialog.cxx          |   33 ---
 sw/source/ui/dbui/createaddresslistdialog.cxx    |   56 -----
 sw/source/ui/dbui/customizeaddresslistdialog.cxx |   27 --
 sw/source/ui/dbui/dbinsdlg.cxx                   |   44 ----
 sw/source/ui/dbui/dbmgr.cxx                      |  114 +----------
 sw/source/ui/dbui/dbtablepreviewdialog.cxx       |    5 
 sw/source/ui/dbui/dbtree.cxx                     |   59 -----
 sw/source/ui/dbui/maildispatcher.cxx             |    3 
 sw/source/ui/dbui/mailmergechildwindow.cxx       |   85 --------
 sw/source/ui/dbui/mailmergehelper.cxx            |  140 --------------
 sw/source/ui/dbui/mailmergewizard.cxx            |   16 -
 sw/source/ui/dbui/mmaddressblockpage.cxx         |  143 --------------
 sw/source/ui/dbui/mmconfigitem.cxx               |  229 -----------------------
 sw/source/ui/dbui/mmdocselectpage.cxx            |   14 -
 sw/source/ui/dbui/mmgreetingspage.cxx            |   44 ----
 sw/source/ui/dbui/mmlayoutpage.cxx               |   29 --
 sw/source/ui/dbui/mmmergepage.cxx                |   10 -
 sw/source/ui/dbui/mmoutputpage.cxx               |   65 ------
 sw/source/ui/dbui/mmoutputtypepage.cxx           |    7 
 sw/source/ui/dbui/mmpreparemergepage.cxx         |   14 -
 sw/source/ui/dbui/selectdbtabledialog.cxx        |   11 -
 sw/source/ui/dbui/swdbtoolsclient.cxx            |   21 --
 sw/source/ui/dochdl/gloshdl.cxx                  |   62 ------
 sw/source/ui/dochdl/selglos.cxx                  |    2 
 sw/source/ui/dochdl/swdtflvr.cxx                 |  106 ----------
 sw/source/ui/uiview/pview.cxx                    |  228 ----------------------
 sw/source/ui/uiview/srcview.cxx                  |   85 --------
 sw/source/ui/uiview/uivwimp.cxx                  |   29 --
 sw/source/ui/uiview/view.cxx                     |   82 --------
 sw/source/ui/uiview/view0.cxx                    |   20 --
 sw/source/ui/uiview/view1.cxx                    |   18 -
 sw/source/ui/uiview/view2.cxx                    |   27 --
 sw/source/ui/uiview/viewdraw.cxx                 |   69 ------
 sw/source/ui/uiview/viewling.cxx                 |   25 --
 sw/source/ui/uiview/viewmdi.cxx                  |   76 -------
 sw/source/ui/uiview/viewport.cxx                 |   39 ---
 sw/source/ui/uiview/viewprt.cxx                  |   14 -
 sw/source/ui/uiview/viewstat.cxx                 |   14 -
 sw/source/ui/uiview/viewtab.cxx                  |   18 -
 39 files changed, 60 insertions(+), 2023 deletions(-)

New commits:
commit 6fd88f4d2453c09561ea62aa635f30df9a999aff
Author: Prashant Shah <pshah.mumbai at gmail.com>
Date:   Mon Oct 11 17:38:56 2010 -0500

    Remove bogus comment in sw

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index f8c4a0b..d0c0a09 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 a71ebef..9c38bdc 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 e1787da..2d47bc7 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 42d4db3..a2ab8f5 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 d550c3b..7958dcb 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 nLanguage,
     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 bcb9757..2189491 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 86a0aa9..deb7e40 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 354541e..5971ecb 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -102,7 +102,6 @@ namespace /* private */
     };
     
 } // namespace private
-
     
 MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) :
     mailserver_ (mailserver),
@@ -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 e03b129..9c301be 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 67e9181..f76e639 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 61e124e..06c1742 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 ae6b6b0..0914f8d 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)
 {

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list