Remove bogus comment in sw

1 files changed, 3 insertions, 226 deletions

diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 3c4fc31bb157..52103af18862 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -78,9 +78,6 @@ const char* cDataCommandType            = "DataSource/DataCommandType";
 #define DEFAULT_PORT    25
 #define POP_PORT        110
 
-/*-- 16.04.2004 09:41:36---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 struct DBAddressDataAssignment
 {
     SwDBData                            aDBData;
@@ -95,9 +92,6 @@ struct DBAddressDataAssignment
         {}
 };
 
-/*-- 16.04.2004 09:43:29---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class SwMailMergeConfigItem_Impl : public utl::ConfigItem
 {
     friend class SwMailMergeConfigItem;
@@ -198,9 +192,6 @@ public:
 
 };
 
-/*-- 06.05.2004 12:51:54---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
     ConfigItem(C2U("Office.Writer/MailMergeWizard"), 0),
         nResultSetCursorPos(-1),
@@ -368,15 +359,11 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
     }
 
 }
-/*-- 06.05.2004 12:51:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem_Impl::~SwMailMergeConfigItem_Impl()
 {
 }
-/*-- 13.03.2006 12:12:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
 {
     if(aAddressBlocks.size() >= sal::static_int_cast<sal_uInt32, sal_Int32>(nSet))
@@ -385,9 +372,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
         SetModified();
     }
 }
-/*-- 16.04.2004 13:06:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
 {
     const OUString* pNames = rAssignments.getConstArray();
@@ -416,7 +401,7 @@ OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
     rAssignments.getArray()[rAssignments.getLength() - 1] = sNewName;
     return sNewName;
 }
-// --------------------------------------------------------------------------------
+
 void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
 {
     //convert the strings used for UI to numbers used for the configuration
@@ -433,7 +418,7 @@ void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
     }
     rBlock = sBlock;
 }
-// --------------------------------------------------------------------------------
+
 void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
 {
     //convert the numbers used for the configuration to strings used for UI to numbers
@@ -468,9 +453,6 @@ void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
     rBlock = sBlock;
 }
 
-/*--------------------------------------------------------------------
-
- --------------------------------------------------------------------*/
 const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -528,9 +510,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
     }
     return aNames;
 }
-/*-- 15.04.2004 08:48:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
 
 void  SwMailMergeConfigItem_Impl::Commit()
@@ -655,9 +635,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
 
     bUserSettingWereOverwritten = sal_False;
 }
-/*-- 06.05.2004 13:04:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
         sal_Bool bConvertToConfig) const
 {
@@ -671,9 +649,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
     }
     return aRet;
 }
-/*-- 06.05.2004 13:04:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetAddressBlocks(
         const Sequence< ::rtl::OUString>& rBlocks,
         sal_Bool bConvertFromConfig)
@@ -689,9 +665,7 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks(
     nCurrentAddressBlock = 0;
     SetModified();
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
         SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const
 {
@@ -709,9 +683,7 @@ const Sequence< ::rtl::OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
     }
     return aRet;
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem_Impl::SetGreetings(
         SwMailMergeConfigItem::Gender eType,
         const Sequence< ::rtl::OUString>& rSetGreetings,
@@ -732,9 +704,7 @@ void  SwMailMergeConfigItem_Impl::SetGreetings(
     }
     SetModified();
 }
-/*-- 11.05.2004 13:13:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
                             SwMailMergeConfigItem::Gender eType) const
 {
@@ -747,9 +717,7 @@ sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
     }
     return nRet;
 }
-/*-- 11.05.2004 13:13:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
         SwMailMergeConfigItem::Gender eType, sal_Int32 nIndex)
 {
@@ -775,9 +743,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
 static SwMailMergeConfigItem_Impl* pOptions = NULL;
 static sal_Int32            nRefCount = 0;
 static ::osl::Mutex aMutex;
-/*-- 15.04.2004 08:42:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem::SwMailMergeConfigItem() :
     m_bAddressInserted(false),
     m_bMergeDone(false),
@@ -795,9 +761,7 @@ SwMailMergeConfigItem::SwMailMergeConfigItem() :
     ++nRefCount;
     m_pImpl = pOptions;
 }
-/*-- 15.04.2004 08:43:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwMailMergeConfigItem::~SwMailMergeConfigItem()
 {
     // Global access, must be guarded (multithreading)
@@ -807,46 +771,34 @@ SwMailMergeConfigItem::~SwMailMergeConfigItem()
         DELETEZ( pOptions );
     }
 }
-/*-- 06.05.2004 14:18:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::Commit()
 {
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
 }
-/*-- 06.05.2004 12:59:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ResStringArray&   SwMailMergeConfigItem::GetDefaultAddressHeaders() const
 {
     return m_pImpl->m_AddressHeaderSA;
 }
-/*-- 27.04.2004 14:34:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetAddressBlocks(
         const Sequence< ::rtl::OUString>& rBlocks)
 {
     m_pImpl->SetAddressBlocks(rBlocks);
 }
-/*-- 27.04.2004 14:34:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetAddressBlocks() const
 {
     return m_pImpl->GetAddressBlocks();
 }
-/*-- 11.05.2004 17:08:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsAddressBlock()const
 {
     return m_pImpl->bIsAddressBlock && IsOutputToLetter();
 }
-/*-- 11.05.2004 17:08:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
 {
     m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -857,16 +809,11 @@ void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
     }
 }
 
-/*-- 30.08.2005 15:09:46---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsHideEmptyParagraphs() const
 {
     return m_pImpl->bIsHideEmptyParagraphs;
 }
-/*-- 30.08.2005 15:09:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
 {
     if(m_pImpl->bIsHideEmptyParagraphs != bSet)
@@ -875,23 +822,17 @@ void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const
 {
     return m_pImpl->bIncludeCountry;
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 rtl::OUString& SwMailMergeConfigItem::GetExcludeCountry() const
 {
     return m_pImpl->sExcludeCountry;
 }
-/*-- 28.04.2004 13:00:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUString& rCountry)
 {
     if(m_pImpl->sExcludeCountry != rCountry ||
@@ -903,9 +844,6 @@ void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUStrin
     }
 }
 
-/*-- 28.04.2004 15:35:16---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentConnection(
         Reference< XDataSource>       xSource,
         SharedConnection              xConnection,
@@ -920,23 +858,17 @@ void SwMailMergeConfigItem::SetCurrentConnection(
         m_pImpl->nResultSetCursorPos = 0;
         m_pImpl->SetModified();
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XDataSource>  SwMailMergeConfigItem::GetSource()
 {
     return m_pImpl->xSource;
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SharedConnection SwMailMergeConfigItem::GetConnection()
 {
     return m_pImpl->xConnection;
 }
-/*-- 28.04.2004 15:38:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
 {
     if(!m_pImpl->xColumnsSupplier.is() && m_pImpl->xConnection.is())
@@ -948,17 +880,12 @@ Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
     }
     return m_pImpl->xColumnsSupplier;
 }
-/*-- 30.04.2004 14:30:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SwDBData&    SwMailMergeConfigItem::GetCurrentDBData() const
 {
     return m_pImpl->aDBData;
 }
 
-/*-- 17.06.2004 13:18:47---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
 {
     if(m_pImpl->aDBData != rDBData)
@@ -970,9 +897,7 @@ void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
         m_pImpl->SetModified();
     }
 }
-/*-- 29.04.2004 11:34:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Reference< XResultSet>   SwMailMergeConfigItem::GetResultSet() const
 {
     if(!m_pImpl->xConnection.is() && m_pImpl->aDBData.sDataSource.getLength())
@@ -1019,9 +944,7 @@ Reference< XResultSet>   SwMailMergeConfigItem::GetResultSet() const
     }
     return m_pImpl->xResultSet;
 }
-/*-- 13.08.2004 11:49:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::DisposeResultSet()
 {
     m_pImpl->xConnection.clear();
@@ -1030,16 +953,12 @@ void SwMailMergeConfigItem::DisposeResultSet()
         ::comphelper::disposeComponent( m_pImpl->xResultSet );
     }
 }
-/*-- 14.05.2004 15:07:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString&    SwMailMergeConfigItem::GetFilter() const
 {
     return m_pImpl->sFilter;
 }
-/*-- 14.05.2004 15:07:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
 {
     if(m_pImpl->sFilter != rFilter)
@@ -1063,9 +982,7 @@ void  SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
         }
     }
 }
-/*-- 29.04.2004 11:55:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
 {
     if(!m_pImpl->xResultSet.is())
@@ -1100,9 +1017,6 @@ sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
     return m_pImpl->nResultSetCursorPos;
 }
 
-/*-- 27.05.2004 13:56:18---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast)
 {
     bool bRet = false;
@@ -1122,16 +1036,12 @@ bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast)
     }
     return bRet;
 }
-/*-- 29.04.2004 11:55:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() const
 {
     return m_pImpl->nResultSetCursorPos;
 }
-/*-- 27.05.2004 14:49:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
 {
     bool bRet = false;
@@ -1143,9 +1053,7 @@ bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
     }
     return bRet;
 }
-/*-- 27.05.2004 14:49:53---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
 {
     //nRecord is based on 1
@@ -1184,9 +1092,7 @@ void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
         }
     }
 }
-/*-- 27.05.2004 15:08:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Sequence< Any > SwMailMergeConfigItem::GetSelection() const
 {
     Sequence< Any > aRet(m_aSelection.getLength());
@@ -1204,17 +1110,13 @@ Sequence< Any > SwMailMergeConfigItem::GetSelection() const
     aRet.realloc(nRetIndex);
     return aRet;
 }
-/*-- 16.06.2004 15:15:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const uno::Sequence< ::rtl::OUString>&
                     SwMailMergeConfigItem::GetSavedDocuments() const
 {
     return m_pImpl->aSavedDocuments;
 }
-/*-- 16.06.2004 15:15:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
 {
     const ::rtl::OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray();
@@ -1233,16 +1135,12 @@ void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
         m_pImpl->aSavedDocuments[m_pImpl->aSavedDocuments.getLength() - 1] = rName;
     }
 }
-/*-- 28.04.2004 16:15:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsOutputToLetter()const
 {
     return m_pImpl->bIsOutputToLetter || !IsMailAvailable();
 }
-/*-- 28.04.2004 16:15:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
 {
     if(m_pImpl->bIsOutputToLetter != bSet)
@@ -1251,18 +1149,14 @@ void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsIndividualGreeting(sal_Bool bInEMail) const
 {
     return bInEMail ?
             m_pImpl->bIsIndividualGreetingLineInMail :
             m_pImpl->bIsIndividualGreetingLine;
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetIndividualGreeting(
                                         sal_Bool bSet, sal_Bool bInEMail)
 {
@@ -1283,16 +1177,12 @@ void     SwMailMergeConfigItem::SetIndividualGreeting(
         }
     }
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsGreetingLine(sal_Bool bInEMail) const
 {
     return bInEMail ? m_pImpl->bIsGreetingLineInMail : m_pImpl->bIsGreetingLine;
 }
-/*-- 30.04.2004 10:51:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail)
 {
     m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -1313,48 +1203,35 @@ void     SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail
         }
     }
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const Sequence< ::rtl::OUString>   SwMailMergeConfigItem::GetGreetings(
         Gender eType ) const
 {
     return m_pImpl->GetGreetings(eType);
 }
-/*-- 30.04.2004 11:04:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetGreetings(
         Gender eType, const Sequence< ::rtl::OUString>& rSetGreetings)
 {
     m_pImpl->SetGreetings( eType, rSetGreetings);
 }
 
-/*-- 11.05.2004 13:10:54---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetCurrentGreeting(
                         SwMailMergeConfigItem::Gender eType) const
 {
     return m_pImpl->GetCurrentGreeting(eType);
 }
-/*-- 11.05.2004 13:10:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentGreeting(Gender eType, sal_Int32 nIndex)
 {
     m_pImpl->SetCurrentGreeting(eType, nIndex);
 }
-/*-- 12.05.2004 12:29:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ::rtl::OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const
 {
     return m_pImpl->sFemaleGenderValue;
 }
-/*-- 12.05.2004 12:29:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
 {
     if( m_pImpl->sFemaleGenderValue != rValue )
@@ -1364,9 +1241,6 @@ void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
     }
 }
 
-/*-- 30.04.2004 13:25:41---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
                 const SwDBData& rDBData ) const
 {
@@ -1383,6 +1257,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
     }
     return aRet;
 }
+
 /*-- 21.05.2004 12:31:31---------------------------------------------------
     returns the name that is assigned as e-mail column of the current data base
   -----------------------------------------------------------------------*/
@@ -1396,9 +1271,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
         sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn);
     return sRet;
 }
-/*-- 30.04.2004 13:25:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
                             const Sequence< ::rtl::OUString>& rList)
 {
@@ -1429,9 +1302,6 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
     m_pImpl->SetModified();
 }
 
-/*-- 07.09.2005 11:50:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
 {
     bool bResult = true;
@@ -1477,9 +1347,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
     }
     return bResult;
 }
-/*-- 07.09.2005 11:50:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
 {
     bool bResult = true;
@@ -1538,16 +1406,12 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
     }
     return bResult;
 }
-/*-- 05.05.2004 16:10:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailDisplayName() const
 {
     return m_pImpl->sMailDisplayName;
 }
-/*-- 05.05.2004 16:10:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
 {
     if(m_pImpl->sMailDisplayName != rName)
@@ -1556,16 +1420,12 @@ void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailAddress() const
 {
     return m_pImpl->sMailAddress;
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
 {
     if(m_pImpl->sMailAddress != rAddress )
@@ -1575,16 +1435,11 @@ void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
     }
 }
 
-/*-- 07.05.2004 12:40:59---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsMailReplyTo() const
 {
     return m_pImpl->bIsMailReplyTo;
 }
-/*-- 07.05.2004 12:40:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
 {
     if(m_pImpl->bIsMailReplyTo != bSet)
@@ -1593,16 +1448,12 @@ void  SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailReplyTo() const
 {
     return m_pImpl->sMailReplyTo;
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
 {
     if(m_pImpl->sMailReplyTo != rReplyTo)
@@ -1611,16 +1462,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString  SwMailMergeConfigItem::GetMailServer() const
 {
     return m_pImpl->sMailServer;
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
 {
     if(m_pImpl->sMailServer != rAddress)
@@ -1629,18 +1476,14 @@ void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int16 SwMailMergeConfigItem::GetMailPort() const
 {
     return m_pImpl->bIsDefaultPort ?
              (m_pImpl->bIsSecureConnection ? SECURE_PORT : DEFAULT_PORT) :
              m_pImpl->nMailPort;
 }
-/*-- 05.05.2004 16:10:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
 {
     if(m_pImpl->nMailPort != nSet || m_pImpl->bIsDefaultPort)
@@ -1650,16 +1493,12 @@ void     SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsSecureConnection() const
 {
     return m_pImpl->bIsSecureConnection;
 }
-/*-- 05.05.2004 16:10:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
 {
     if(m_pImpl->bIsSecureConnection != bSet)
@@ -1668,16 +1507,12 @@ void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsAuthentication() const
 {
     return m_pImpl->bIsAuthentication;
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
 {
     if(m_pImpl->bIsAuthentication != bSet)
@@ -1686,16 +1521,12 @@ void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailUserName() const
 {
     return m_pImpl->sMailUserName;
 }
-/*-- 05.05.2004 16:10:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
 {
     if(m_pImpl->sMailUserName != rName)
@@ -1704,16 +1535,12 @@ void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 05.05.2004 16:10:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetMailPassword() const
 {
     return m_pImpl->sMailPassword;
 }
-/*-- 05.05.2004 16:10:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
 {
     if(m_pImpl->sMailPassword != rPassword)
@@ -1722,16 +1549,12 @@ void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsSMTPAfterPOP() const
 {
     return m_pImpl->bIsSMPTAfterPOP;
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
 {
     if( m_pImpl->bIsSMPTAfterPOP != bSet)
@@ -1740,16 +1563,12 @@ void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerName() const
 {
     return m_pImpl->sInServerName;
 }
-/*-- 19.08.2004 14:44:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
 {
     if(m_pImpl->sInServerName != rServer)
@@ -1758,16 +1577,12 @@ void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int16           SwMailMergeConfigItem::GetInServerPort() const
 {
     return m_pImpl->nInServerPort;
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
 {
     if( m_pImpl->nInServerPort != nSet)
@@ -1776,16 +1591,12 @@ void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 20.08.2004 08:52:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwMailMergeConfigItem::IsInServerPOP() const
 {
     return m_pImpl->bInServerPOP;
 }
-/*-- 20.08.2004 08:52:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
 {
     if( m_pImpl->bInServerPOP != bSet)
@@ -1794,16 +1605,12 @@ void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerUserName() const
 {
     return m_pImpl->sInServerUserName;
 }
-/*-- 19.08.2004 14:44:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
 {
     if( m_pImpl->sInServerUserName != rName)
@@ -1812,16 +1619,12 @@ void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
         m_pImpl->SetModified();
     }
 }
-/*-- 19.08.2004 14:44:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ::rtl::OUString     SwMailMergeConfigItem::GetInServerPassword() const
 {
     return m_pImpl->sInServerPassword;
 }
-/*-- 19.08.2004 14:45:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword)
 {
     if(m_pImpl->sInServerPassword != rPassword)
@@ -1831,9 +1634,6 @@ void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword
     }
 }
 
-/*-- 02.09.2004 14:43:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::DocumentReloaded()
 {
     m_bMergeDone = false;
@@ -1841,38 +1641,28 @@ void SwMailMergeConfigItem::DocumentReloaded()
     m_bAddressInserted = false;
     m_rAddressBlockFrame = ::rtl::OUString();
 }
-/*-- 16.06.2004 12:24:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwMailMergeConfigItem::IsMailAvailable() const
 {
     return m_pImpl->bIsEMailSupported;
 }
-/*-- 21.05.2004 12:20:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo)
 {
     m_pImpl->aMergeInfos.push_back(rInfo);
 }
-/*-- 21.05.2004 12:20:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwDocMergeInfo& SwMailMergeConfigItem::GetDocumentMergeInfo(sal_uInt32 nDocument)
 {
     DBG_ASSERT(m_pImpl->aMergeInfos.size() > nDocument,"invalid document index");
     return m_pImpl->aMergeInfos[nDocument];
 }
-/*-- 14.06.2004 11:46:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt32 SwMailMergeConfigItem::GetMergedDocumentCount() const
 {
     return m_pImpl->aMergeInfos.size();
 }
-/*-- 11.06.2004 10:38:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView* lcl_ExistsView(SwView* pView)
 {
     const TypeId aType(TYPE(SwView));
@@ -1886,9 +1676,7 @@ SwView* lcl_ExistsView(SwView* pView)
     }
     return 0;
 }
-/*-- 16.06.2004 15:02:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView*  SwMailMergeConfigItem::GetTargetView()
 {
     //make sure that the pointer is really valid - the document may have been closed manually
@@ -1898,9 +1686,7 @@ SwView*  SwMailMergeConfigItem::GetTargetView()
     }
     return m_pTargetView;
 }
-/*-- 02.09.2004 17:04:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void  SwMailMergeConfigItem::SetTargetView(SwView* pView)
 {
     m_pTargetView = pView;
@@ -1910,17 +1696,13 @@ void  SwMailMergeConfigItem::SetTargetView(SwView* pView)
         m_pImpl->aMergeInfos.clear();
     }
 }
-/*-- 16.06.2004 15:02:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwView* SwMailMergeConfigItem::GetSourceView()
 {
     m_pSourceView = lcl_ExistsView(m_pSourceView);
     return m_pSourceView;
 }
 
-/*-- 04.11.2004 19:53 ---------------------------------------------------
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetSourceView(SwView* pView)
 {
     m_pSourceView = pView;
@@ -1966,16 +1748,11 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView)
     }
 }
 
-/*-- 13.03.2006 12:15:06---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwMailMergeConfigItem::SetCurrentAddressBlockIndex( sal_Int32 nSet )
 {
     m_pImpl->SetCurrentAddressBlockIndex( nSet );
 }
-/*-- 13.03.2006 12:15:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SwMailMergeConfigItem::GetCurrentAddressBlockIndex() const
 {
     return m_pImpl->GetCurrentAddressBlockIndex();