This patch removes bogus comments found in the dbui directory
including empty 'Letzte Aenderung' (translation: Last Change) statements
Signed-off-by: Prashant Shah <pshah.mumbai@gmail.com>
---
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 +--
22 files changed, 38 insertions(+), 1131 deletions(-)
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)
{
Point aPos(pCtrl->GetPosPixel());
aPos.Y() += nYOffset;
pCtrl->SetPosPixel(aPos);
}
-/*-- 02.04.2004 12:46:40---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_ADDRESSBLOCK_PAGE)),
#ifdef MSC
@@ -112,22 +109,16 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard*
_pP
m_aPrevSetIB.SetClickHdl(aLink);
m_aNextSetIB.SetClickHdl(aLink);
}
-/*-- 02.04.2004 12:46:40---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeAddressBlockPage::~SwMailMergeAddressBlockPage()
{
}
-/*-- 05.07.2004 13:55:15---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwMailMergeAddressBlockPage::canAdvance() const
{
return m_pWizard->GetConfigItem().GetResultSet().is();
}
-/*-- 16.06.2004 12:34:09---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeAddressBlockPage::ActivatePage()
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -172,18 +163,14 @@ void SwMailMergeAddressBlockPage::ActivatePage()
InsertDataHdl_Impl(0);
}
}
-/*-- 27.05.2004 13:59:15---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason
)
{
if ( ::svt::WizardTypes::eTravelForward == _eReason &&
!m_pWizard->GetConfigItem().GetResultSet().is() )
return sal_False;
return sal_True;
}
-/*-- 07.04.2004 16:19:30---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl, PushButton*, EMPTYARG)
{
SwAddressListDialog* pAddrDialog = new SwAddressListDialog(this);
@@ -204,9 +191,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressListHdl_Impl, PushButton*, EMPTYAR
delete pAddrDialog;
return 0;
}
-/*-- 07.04.2004 16:19:30---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
{
SwSelectAddressBlockDialog* pDlg =
@@ -233,9 +218,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
return 0;
}
-/*-- 07.04.2004 16:19:31---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -253,9 +236,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
delete pDlg;
return 0;
}
-/*-- 11.06.2004 13:37:22---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeAddressBlockPage::EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective)
{
m_aSettingsFI.Enable(bAll);
@@ -273,9 +254,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(sal_Bool bAll, sal_Bool bSe
m_aPrevSetIB.Enable(bSelective);
m_aNextSetIB.Enable(bSelective);
}
-/*-- 28.04.2004 12:45:58---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox)
{
EnableAddressBlock(pBox->IsEnabled(), pBox->IsChecked());
@@ -284,9 +263,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox)
m_pWizard->UpdateRoadmap();
return 0;
}
-/*-- 08.06.2004 13:00:29---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, SwAddressPreview*, EMPTYARG)
{
sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress();
@@ -299,9 +276,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, SwAddressPrev
GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
return 0;
}
-/*-- 31.08.2005 15:34:55---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, CheckBox*, pBox)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -309,7 +284,6 @@ IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, CheckBox*, pBox)
return 0;
}
-// ------------------------------------------------------------------------------
IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton)
{
//if no pButton is given, the first set has to be pre-set
@@ -366,9 +340,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
EnableAddressBlock(bHasResultSet, m_aAddressCB.IsChecked());
return 0;
}
-/*-- 13.04.2004 16:01:26---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
Window* pParent, SwMailMergeConfigItem& rConfig) :
SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTADDRESSBLOCK)),
@@ -409,15 +381,11 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
m_aPreview.SetLayout(2, 2);
m_aPreview.EnableScrollBar();
}
-/*-- 13.04.2004 16:01:27---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog()
{
}
-/*-- 28.04.2004 11:48:11---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OUString>& rBlocks,
sal_uInt16 nSelectedAddress)
{
@@ -426,6 +394,7 @@ void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OU
m_aPreview.AddAddress(m_aAddressBlocks[nAddress]);
m_aPreview.SelectAddress(nSelectedAddress);
}
+
/*-- 25.06.2004 10:51:36---------------------------------------------------
return the address blocks and put the selected one to the first position
-----------------------------------------------------------------------*/
@@ -451,9 +420,7 @@ const uno::Sequence< ::rtl::OUString >& SwSelectAddressBlockDialog::GetAddres
}
return m_aAddressBlocks;
}
-/*-- 28.04.2004 11:48:11---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwSelectAddressBlockDialog::SetSettings(
sal_Bool bIsCountry, ::rtl::OUString rCountry)
{
@@ -466,9 +433,7 @@ void SwSelectAddressBlockDialog::SetSettings(
m_aNeverRB.Check();
m_aDeletePB.Enable(m_aAddressBlocks.getLength() > 1);
}
-/*-- 10.05.2004 11:17:06---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwSelectAddressBlockDialog::GetCountry() const
{
::rtl::OUString sRet;
@@ -477,9 +442,6 @@ void SwSelectAddressBlockDialog::SetSettings(
return sRet;
}
-/*-- 13.04.2004 16:02:32---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton)
{
if(m_aAddressBlocks.getLength())
@@ -500,9 +462,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton)
}
return 0;
}
-/*-- 13.04.2004 16:02:32---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton)
{
bool bCustomize = pButton == &m_aCustomizePB;
@@ -537,24 +497,17 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*,
pButton
delete pDlg;
return 0;
}
-/*-- 13.04.2004 16:02:33---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, RadioButton*, pButton)
{
m_aCountryED.Enable(&m_aDependentRB == pButton);
return 0;
}
-/* -----------------------------28.02.05 09:00--------------------------------
-
- ---------------------------------------------------------------------------*/
SwRestrictedComboBox::~SwRestrictedComboBox()
{
}
-/* -----------------------------28.02.05 09:00--------------------------------
- ---------------------------------------------------------------------------*/
void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
{
BOOL bCallParent = TRUE;
@@ -567,9 +520,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
if(bCallParent)
ComboBox::KeyInput(rEvt);
}
-/* -----------------------------28.02.05 09:00--------------------------------
- ---------------------------------------------------------------------------*/
void SwRestrictedComboBox::Modify()
{
Selection aSel = GetSelection();
@@ -590,9 +541,6 @@ void SwRestrictedComboBox::Modify()
GetModifyHdl().Call(this);
}
-/*-- 13.04.2004 16:01:08---------------------------------------------------
-
- -----------------------------------------------------------------------*/
#define USER_DATA_SALUTATION -1
#define USER_DATA_PUNCTUATION -2
#define USER_DATA_TEXT -3
@@ -694,23 +642,17 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_aDownIB.SetClickHdl(aImgButtonHdl);
UpdateImageButtons_Impl();
}
-/*-- 13.04.2004 16:01:08---------------------------------------------------
- -----------------------------------------------------------------------*/
SwCustomizeAddressBlockDialog::~SwCustomizeAddressBlockDialog()
{
}
-/*-- 07.06.2004 13:51:11---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, OKHdl_Impl, OKButton*, EMPTYARG)
{
EndDialog(RET_OK);
return 0;
}
-/*-- 24.06.2004 11:36:05---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox)
{
sal_Int32 nUserData = (sal_Int32)(sal_IntPtr)pBox->FirstSelected()->GetUserData();
@@ -718,9 +660,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox
m_aInsertFieldIB.Enable(nUserData >= 0 || !HasItem_Impl(nUserData));
return 0;
}
-/*-- 25.06.2004 11:21:24---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, AddressMultiLineEdit*, EMPTYARG)
{
String sAddress = SwAddressPreview::FillData(
@@ -730,9 +670,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, AddressMultiLineEdi
UpdateImageButtons_Impl();
return 0;
}
-/*-- 25.06.2004 12:14:11---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pButton)
{
if(&m_aInsertFieldIB == pButton)
@@ -764,9 +702,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pBut
UpdateImageButtons_Impl();
return 0;
}
-/*-- 01.07.2004 09:27:02---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
{
sal_Int32 nRet = USER_DATA_NONE;
@@ -784,9 +720,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
}
return nRet;
}
-/*-- 01.07.2004 10:01:19---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData)
{
//get the entry from the ListBox
@@ -808,9 +742,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData)
bool bRet = sText.Search(sEntry) != STRING_NOTFOUND;
return bRet;
}
-/*-- 25.06.2004 13:10:16---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit*, pEdit)
{
// called in case the selection of the edit field changes.
@@ -863,9 +795,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiL
bOnEntry = false;
return 0;
}
-/*-- 25.06.2004 13:36:29---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, ComboBox*, EMPTYARG)
{
//changing the field content changes the related members, too
@@ -888,9 +818,6 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, ComboBox*, EMPTYAR
return 0;
}
-/*-- 25.06.2004 12:35:51---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
{
sal_uInt16 nMove = m_aDragED.IsCurrentItemMoveable();
@@ -903,18 +830,14 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
m_aInsertFieldIB.Enable( pEntry &&
(0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || m_aFieldCB.GetText().Len()));
}
-/*-- 28.04.2004 12:04:14---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
{
m_aDragED.SetText( rAddress );
UpdateImageButtons_Impl();
m_aDragED.Modify();
}
-/*-- 28.04.2004 12:04:14---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwCustomizeAddressBlockDialog::GetAddress()
{
String sAddress(m_aDragED.GetAddress());
@@ -938,9 +861,7 @@ void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
}
return sAddress;
}
-/*-- 28.02.2005 11:03:35---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext )
{
::std::vector< Window* > aControls;
@@ -1007,9 +928,7 @@ void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext )
}
}
-/*-- 13.04.2004 17:49:45---------------------------------------------------
- -----------------------------------------------------------------------*/
class SwAssignFieldsControl : public Control
{
friend class SwAssignFieldsDialog;
@@ -1048,10 +967,7 @@ public:
m_aModifyHdl.Call(this);
}
};
-/*-- 13.04.2004 17:51:27---------------------------------------------------
- -----------------------------------------------------------------------*/
-//-------------------------------------------------------------------------
SwAssignFieldsControl::SwAssignFieldsControl(
Window* pParent, const ResId& rResId, SwMailMergeConfigItem& rConfigItem) :
Control(pParent, rResId),
@@ -1167,9 +1083,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
m_aVScroll.SetSizePixel(Size(m_aVScroll.GetSizePixel().Width(), aOutputSize.Height() -
nHBHeight));
}
-/*-- 13.04.2004 17:51:28---------------------------------------------------
- -----------------------------------------------------------------------*/
SwAssignFieldsControl::~SwAssignFieldsControl()
{
::std::vector<FixedInfo*>::iterator aFIIter;
@@ -1182,9 +1096,6 @@ SwAssignFieldsControl::~SwAssignFieldsControl()
delete *aFIIter;
}
-/*-- 07.05.2004 13:11:26---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwAssignFieldsControl::Command( const CommandEvent& rCEvt )
{
switch ( rCEvt.GetCommand() )
@@ -1204,9 +1115,7 @@ void SwAssignFieldsControl::Command( const CommandEvent& rCEvt )
Control::Command(rCEvt);
}
}
-/*-- 07.05.2004 13:11:21---------------------------------------------------
- -----------------------------------------------------------------------*/
long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType() == EVENT_COMMAND)
@@ -1221,9 +1130,7 @@ long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt )
}
return Control::PreNotify(rNEvt);
}
-/*-- 03.09.2004 13:19:09---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex )
{
long nThumb = m_aVScroll.GetThumbPos();
@@ -1236,9 +1143,7 @@ void SwAssignFieldsControl::MakeVisible( sal_Int32 nIndex )
return;
ScrollHdl_Impl( &m_aVScroll );
}
-/*-- 30.04.2004 16:10:58---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
{
long nThumb = pScroll->GetThumbPos();
@@ -1263,9 +1168,6 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll)
return 0;
}
-/*-- 03.05.2004 15:37:52---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
{
String sColumn = pBox->GetSelectEntry();
@@ -1301,9 +1203,7 @@ IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
m_aModifyHdl.Call(0);
return 0;
}
-/*-- 03.09.2004 13:16:04---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox)
{
if(0 != (GETFOCUS_TAB & pBox->GetGetFocusFlags()))
@@ -1321,9 +1221,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox)
}
return 0;
}
-/*-- 13.04.2004 17:44:01---------------------------------------------------
- -----------------------------------------------------------------------*/
SwAssignFieldsDialog::SwAssignFieldsDialog(
Window* pParent, SwMailMergeConfigItem& rConfigItem,
const ::rtl::OUString& rPreview,
@@ -1375,16 +1273,12 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
m_aOK.SetClickHdl(LINK(this, SwAssignFieldsDialog, OkHdl_Impl));
}
-/*-- 13.04.2004 17:44:02---------------------------------------------------
- -----------------------------------------------------------------------*/
SwAssignFieldsDialog::~SwAssignFieldsDialog()
{
delete m_pFieldsControl;
}
-/*-- 05.05.2004 14:39:13---------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
{
uno::Sequence< ::rtl::OUString > aAssignments(
@@ -1404,9 +1298,7 @@ uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
}
return aAssignments;
}
-/*-- 03.05.2004 18:04:00---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG)
{
m_rConfigItem.SetColumnAssignment(
@@ -1415,9 +1307,7 @@ IMPL_LINK(SwAssignFieldsDialog, OkHdl_Impl, PushButton*, EMPTYARG)
EndDialog(RET_OK);
return 0;
}
-/*-- 05.05.2004 14:37:19---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, void*, EMPTYARG)
{
uno::Sequence< ::rtl::OUString > aAssignments = CreateAssignments();
@@ -1427,9 +1317,6 @@ IMPL_LINK(SwAssignFieldsDialog, AssignmentModifyHdl_Impl, void*, EMPTYARG)
return 0;
}
-/*-- 26.05.2004 11:20:11---------------------------------------------------
-
- -----------------------------------------------------------------------*/
DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId) :
SvTreeListBox(pParent, rResId),
m_pParentDialog(pParent)
@@ -1446,15 +1333,11 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId
rResId)
Show();
}
-/*-- 26.05.2004 11:20:15---------------------------------------------------
- -----------------------------------------------------------------------*/
DDListBox::~DDListBox()
{
}
-/*-- 26.05.2004 11:20:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
{
SvLBoxEntry* pEntry = GetCurEntry();
@@ -1482,9 +1365,7 @@ void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
}
}
}
-/*-- 26.05.2004 13:14:53---------------------------------------------------
- -----------------------------------------------------------------------*/
AddressMultiLineEdit::AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId&
rResId) :
MultiLineEdit(pParent, rResId),
m_pParentDialog(pParent)
@@ -1495,16 +1376,12 @@ AddressMultiLineEdit::AddressMultiLineEdit(SwCustomizeAddressBlockDialog*
pParen
//DisableSelectionOnFocus();
EnableFocusSelectionHide(FALSE);
}
-/*-- 26.05.2004 13:14:53---------------------------------------------------
- -----------------------------------------------------------------------*/
AddressMultiLineEdit::~AddressMultiLineEdit()
{
EndListening(*GetTextEngine());
}
-/*-- 25.06.2004 13:02:49---------------------------------------------------
- -----------------------------------------------------------------------*/
void AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if(rHint.ISA(TextHint) &&
@@ -1514,9 +1391,7 @@ void AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint&
rH
m_aSelectionLink.Call(this);
}
}
-/*-- 26.05.2004 13:45:46---------------------------------------------------
- -----------------------------------------------------------------------*/
long AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
{
long nHandled = 0;
@@ -1541,9 +1416,7 @@ long AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
return nHandled;
}
-/*-- 25.06.2004 08:20:54---------------------------------------------------
- -----------------------------------------------------------------------*/
void AddressMultiLineEdit::SetText( const String& rStr )
{
MultiLineEdit::SetText(rStr);
@@ -1588,7 +1461,6 @@ void AddressMultiLineEdit::SetText( const String& rStr )
/*-- 25.06.2004 12:32:41---------------------------------------------------
Insert the new entry in front of the entry at the beginning of the selection
-
-----------------------------------------------------------------------*/
void AddressMultiLineEdit::InsertNewEntry( const String& rStr )
{
@@ -1626,9 +1498,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition( const String& rStr,
ULONG n
pTextView->SetSelection(aEntrySel);
m_aSelectionLink.Call(this);
}
-/*-- 25.06.2004 12:32:41---------------------------------------------------
- -----------------------------------------------------------------------*/
void AddressMultiLineEdit::RemoveCurrentEntry()
{
ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1648,9 +1518,7 @@ void AddressMultiLineEdit::RemoveCurrentEntry()
Modify();
}
}
-/*-- 25.06.2004 12:32:41---------------------------------------------------
- -----------------------------------------------------------------------*/
void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove)
{
ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1723,9 +1591,7 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove)
Modify();
}
}
-/*-- 25.06.2004 12:32:41---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_uInt16 AddressMultiLineEdit::IsCurrentItemMoveable()
{
sal_uInt16 nRet = 0;
@@ -1747,9 +1613,7 @@ sal_uInt16 AddressMultiLineEdit::IsCurrentItemMoveable()
}
return nRet;
}
-/*-- 25.06.2004 12:32:42---------------------------------------------------
- -----------------------------------------------------------------------*/
bool AddressMultiLineEdit::HasCurrentItem()
{
ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1760,9 +1624,7 @@ bool AddressMultiLineEdit::HasCurrentItem()
(pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex()
&& pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex()));
}
-/*-- 01.07.2004 09:07:44---------------------------------------------------
- -----------------------------------------------------------------------*/
String AddressMultiLineEdit::GetCurrentItem()
{
String sRet;
@@ -1780,9 +1642,7 @@ String AddressMultiLineEdit::GetCurrentItem()
}
return sRet;
}
-/*-- 05.07.2004 14:29:02---------------------------------------------------
- -----------------------------------------------------------------------*/
void AddressMultiLineEdit::SelectCurrentItem()
{
ExtTextEngine* pTextEngine = GetTextEngine();
@@ -1824,4 +1684,3 @@ String AddressMultiLineEdit::GetAddress()
}
return sRet;
}
-
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 86d4fba..c8a7bb0 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -78,9 +78,6 @@ const char* cDataCommandType = "DataSource/DataCommandType";
#define DEFAULT_PORT 25
#define POP_PORT 110
-/*-- 16.04.2004 09:41:36---------------------------------------------------
-
- -----------------------------------------------------------------------*/
struct DBAddressDataAssignment
{
SwDBData aDBData;
@@ -95,9 +92,6 @@ struct DBAddressDataAssignment
{}
};
-/*-- 16.04.2004 09:43:29---------------------------------------------------
-
- -----------------------------------------------------------------------*/
class SwMailMergeConfigItem_Impl : public utl::ConfigItem
{
friend class SwMailMergeConfigItem;
@@ -198,9 +192,6 @@ public:
};
-/*-- 06.05.2004 12:51:54---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
ConfigItem(C2U("Office.Writer/MailMergeWizard"), 0),
nResultSetCursorPos(-1),
@@ -368,15 +359,11 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
}
}
-/*-- 06.05.2004 12:51:54---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeConfigItem_Impl::~SwMailMergeConfigItem_Impl()
{
}
-/*-- 13.03.2006 12:12:59---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
{
if(aAddressBlocks.size() >= sal::static_int_cast<sal_uInt32, sal_Int32>(nSet))
@@ -385,9 +372,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet )
SetModified();
}
}
-/*-- 16.04.2004 13:06:07---------------------------------------------------
- -----------------------------------------------------------------------*/
OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
{
const OUString* pNames = rAssignments.getConstArray();
@@ -416,7 +401,7 @@ OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
rAssignments.getArray()[rAssignments.getLength() - 1] = sNewName;
return sNewName;
}
-// --------------------------------------------------------------------------------
+
void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
{
//convert the strings used for UI to numbers used for the configuration
@@ -433,7 +418,7 @@ void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
}
rBlock = sBlock;
}
-// --------------------------------------------------------------------------------
+
void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
{
//convert the numbers used for the configuration to strings used for UI to numbers
@@ -468,9 +453,6 @@ void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
rBlock = sBlock;
}
-/*--------------------------------------------------------------------
-
- --------------------------------------------------------------------*/
const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
{
static Sequence<OUString> aNames;
@@ -528,9 +510,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
}
return aNames;
}
-/*-- 15.04.2004 08:48:39---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& )
{}
void SwMailMergeConfigItem_Impl::Commit()
@@ -655,9 +635,7 @@ void SwMailMergeConfigItem_Impl::Commit()
bUserSettingWereOverwritten = sal_False;
}
-/*-- 06.05.2004 13:04:36---------------------------------------------------
- -----------------------------------------------------------------------*/
const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
sal_Bool bConvertToConfig) const
{
@@ -671,9 +649,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
}
return aRet;
}
-/*-- 06.05.2004 13:04:36---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem_Impl::SetAddressBlocks(
const Sequence< ::rtl::OUString>& rBlocks,
sal_Bool bConvertFromConfig)
@@ -689,9 +665,7 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks(
nCurrentAddressBlock = 0;
SetModified();
}
-/*-- 30.04.2004 11:04:52---------------------------------------------------
- -----------------------------------------------------------------------*/
const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings(
SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const
{
@@ -709,9 +683,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings(
}
return aRet;
}
-/*-- 30.04.2004 11:04:52---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem_Impl::SetGreetings(
SwMailMergeConfigItem::Gender eType,
const Sequence< ::rtl::OUString>& rSetGreetings,
@@ -732,9 +704,7 @@ void SwMailMergeConfigItem_Impl::SetGreetings(
}
SetModified();
}
-/*-- 11.05.2004 13:13:54---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
SwMailMergeConfigItem::Gender eType) const
{
@@ -747,9 +717,7 @@ sal_Int32 SwMailMergeConfigItem_Impl::GetCurrentGreeting(
}
return nRet;
}
-/*-- 11.05.2004 13:13:54---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
SwMailMergeConfigItem::Gender eType, sal_Int32 nIndex)
{
@@ -775,9 +743,7 @@ void SwMailMergeConfigItem_Impl::SetCurrentGreeting(
static SwMailMergeConfigItem_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
static ::osl::Mutex aMutex;
-/*-- 15.04.2004 08:42:43---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeConfigItem::SwMailMergeConfigItem() :
m_bAddressInserted(false),
m_bMergeDone(false),
@@ -795,9 +761,7 @@ SwMailMergeConfigItem::SwMailMergeConfigItem() :
++nRefCount;
m_pImpl = pOptions;
}
-/*-- 15.04.2004 08:43:36---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeConfigItem::~SwMailMergeConfigItem()
{
// Global access, must be guarded (multithreading)
@@ -807,46 +771,34 @@ SwMailMergeConfigItem::~SwMailMergeConfigItem()
DELETEZ( pOptions );
}
}
-/*-- 06.05.2004 14:18:10---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::Commit()
{
if(m_pImpl->IsModified())
m_pImpl->Commit();
}
-/*-- 06.05.2004 12:59:50---------------------------------------------------
- -----------------------------------------------------------------------*/
const ResStringArray& SwMailMergeConfigItem::GetDefaultAddressHeaders() const
{
return m_pImpl->m_AddressHeaderSA;
}
-/*-- 27.04.2004 14:34:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetAddressBlocks(
const Sequence< ::rtl::OUString>& rBlocks)
{
m_pImpl->SetAddressBlocks(rBlocks);
}
-/*-- 27.04.2004 14:34:16---------------------------------------------------
- -----------------------------------------------------------------------*/
const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetAddressBlocks() const
{
return m_pImpl->GetAddressBlocks();
}
-/*-- 11.05.2004 17:08:45---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsAddressBlock()const
{
return m_pImpl->bIsAddressBlock && IsOutputToLetter();
}
-/*-- 11.05.2004 17:08:46---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
{
m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -857,16 +809,11 @@ void SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
}
}
-/*-- 30.08.2005 15:09:46---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsHideEmptyParagraphs() const
{
return m_pImpl->bIsHideEmptyParagraphs;
}
-/*-- 30.08.2005 15:09:47---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
{
if(m_pImpl->bIsHideEmptyParagraphs != bSet)
@@ -875,23 +822,17 @@ void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 28.04.2004 13:00:02---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const
{
return m_pImpl->bIncludeCountry;
}
-/*-- 28.04.2004 13:00:02---------------------------------------------------
- -----------------------------------------------------------------------*/
rtl::OUString& SwMailMergeConfigItem::GetExcludeCountry() const
{
return m_pImpl->sExcludeCountry;
}
-/*-- 28.04.2004 13:00:02---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUString& rCountry)
{
if(m_pImpl->sExcludeCountry != rCountry ||
@@ -903,9 +844,6 @@ void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUStrin
}
}
-/*-- 28.04.2004 15:35:16---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetCurrentConnection(
Reference< XDataSource> xSource,
SharedConnection xConnection,
@@ -920,23 +858,17 @@ void SwMailMergeConfigItem::SetCurrentConnection(
m_pImpl->nResultSetCursorPos = 0;
m_pImpl->SetModified();
}
-/*-- 28.04.2004 15:38:11---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XDataSource> SwMailMergeConfigItem::GetSource()
{
return m_pImpl->xSource;
}
-/*-- 28.04.2004 15:38:11---------------------------------------------------
- -----------------------------------------------------------------------*/
SharedConnection SwMailMergeConfigItem::GetConnection()
{
return m_pImpl->xConnection;
}
-/*-- 28.04.2004 15:38:11---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
{
if(!m_pImpl->xColumnsSupplier.is() && m_pImpl->xConnection.is())
@@ -948,17 +880,12 @@ Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
}
return m_pImpl->xColumnsSupplier;
}
-/*-- 30.04.2004 14:30:55---------------------------------------------------
- -----------------------------------------------------------------------*/
const SwDBData& SwMailMergeConfigItem::GetCurrentDBData() const
{
return m_pImpl->aDBData;
}
-/*-- 17.06.2004 13:18:47---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
{
if(m_pImpl->aDBData != rDBData)
@@ -970,9 +897,7 @@ void SwMailMergeConfigItem::SetCurrentDBData( const SwDBData& rDBData)
m_pImpl->SetModified();
}
}
-/*-- 29.04.2004 11:34:36---------------------------------------------------
- -----------------------------------------------------------------------*/
Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const
{
if(!m_pImpl->xConnection.is() && m_pImpl->aDBData.sDataSource.getLength())
@@ -1019,9 +944,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const
}
return m_pImpl->xResultSet;
}
-/*-- 13.08.2004 11:49:46---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::DisposeResultSet()
{
m_pImpl->xConnection.clear();
@@ -1030,16 +953,12 @@ void SwMailMergeConfigItem::DisposeResultSet()
::comphelper::disposeComponent( m_pImpl->xResultSet );
}
}
-/*-- 14.05.2004 15:07:55---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString& SwMailMergeConfigItem::GetFilter() const
{
return m_pImpl->sFilter;
}
-/*-- 14.05.2004 15:07:55---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
{
if(m_pImpl->sFilter != rFilter)
@@ -1063,9 +982,7 @@ void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
}
}
}
-/*-- 29.04.2004 11:55:38---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
{
if(!m_pImpl->xResultSet.is())
@@ -1100,9 +1017,6 @@ sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
return m_pImpl->nResultSetCursorPos;
}
-/*-- 27.05.2004 13:56:18---------------------------------------------------
-
- -----------------------------------------------------------------------*/
bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast)
{
bool bRet = false;
@@ -1122,16 +1036,12 @@ bool SwMailMergeConfigItem::IsResultSetFirstLast(bool& bIsFirst, bool&
bIsLast)
}
return bRet;
}
-/*-- 29.04.2004 11:55:38---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() const
{
return m_pImpl->nResultSetCursorPos;
}
-/*-- 27.05.2004 14:49:53---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
{
bool bRet = false;
@@ -1143,9 +1053,7 @@ bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
}
return bRet;
}
-/*-- 27.05.2004 14:49:53---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
{
//nRecord is based on 1
@@ -1184,9 +1092,7 @@ void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
}
}
}
-/*-- 27.05.2004 15:08:35---------------------------------------------------
- -----------------------------------------------------------------------*/
Sequence< Any > SwMailMergeConfigItem::GetSelection() const
{
Sequence< Any > aRet(m_aSelection.getLength());
@@ -1204,17 +1110,13 @@ Sequence< Any > SwMailMergeConfigItem::GetSelection() const
aRet.realloc(nRetIndex);
return aRet;
}
-/*-- 16.06.2004 15:15:56---------------------------------------------------
- -----------------------------------------------------------------------*/
const uno::Sequence< ::rtl::OUString>&
SwMailMergeConfigItem::GetSavedDocuments() const
{
return m_pImpl->aSavedDocuments;
}
-/*-- 16.06.2004 15:15:56---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
{
const ::rtl::OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray();
@@ -1233,16 +1135,12 @@ void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
m_pImpl->aSavedDocuments[m_pImpl->aSavedDocuments.getLength() - 1] = rName;
}
}
-/*-- 28.04.2004 16:15:16---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsOutputToLetter()const
{
return m_pImpl->bIsOutputToLetter || !IsMailAvailable();
}
-/*-- 28.04.2004 16:15:16---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
{
if(m_pImpl->bIsOutputToLetter != bSet)
@@ -1251,18 +1149,14 @@ void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 30.04.2004 10:51:10---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsIndividualGreeting(sal_Bool bInEMail) const
{
return bInEMail ?
m_pImpl->bIsIndividualGreetingLineInMail :
m_pImpl->bIsIndividualGreetingLine;
}
-/*-- 30.04.2004 10:51:10---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetIndividualGreeting(
sal_Bool bSet, sal_Bool bInEMail)
{
@@ -1283,16 +1177,12 @@ void SwMailMergeConfigItem::SetIndividualGreeting(
}
}
}
-/*-- 30.04.2004 10:51:10---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsGreetingLine(sal_Bool bInEMail) const
{
return bInEMail ? m_pImpl->bIsGreetingLineInMail : m_pImpl->bIsGreetingLine;
}
-/*-- 30.04.2004 10:51:10---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail)
{
m_pImpl->bUserSettingWereOverwritten = sal_False;
@@ -1313,48 +1203,35 @@ void SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool
bInEMail
}
}
}
-/*-- 30.04.2004 11:04:52---------------------------------------------------
- -----------------------------------------------------------------------*/
const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetGreetings(
Gender eType ) const
{
return m_pImpl->GetGreetings(eType);
}
-/*-- 30.04.2004 11:04:52---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetGreetings(
Gender eType, const Sequence< ::rtl::OUString>& rSetGreetings)
{
m_pImpl->SetGreetings( eType, rSetGreetings);
}
-/*-- 11.05.2004 13:10:54---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Int32 SwMailMergeConfigItem::GetCurrentGreeting(
SwMailMergeConfigItem::Gender eType) const
{
return m_pImpl->GetCurrentGreeting(eType);
}
-/*-- 11.05.2004 13:10:55---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetCurrentGreeting(Gender eType, sal_Int32 nIndex)
{
m_pImpl->SetCurrentGreeting(eType, nIndex);
}
-/*-- 12.05.2004 12:29:59---------------------------------------------------
- -----------------------------------------------------------------------*/
const ::rtl::OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const
{
return m_pImpl->sFemaleGenderValue;
}
-/*-- 12.05.2004 12:29:59---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
{
if( m_pImpl->sFemaleGenderValue != rValue )
@@ -1364,9 +1241,6 @@ void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
}
}
-/*-- 30.04.2004 13:25:41---------------------------------------------------
-
- -----------------------------------------------------------------------*/
Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
const SwDBData& rDBData ) const
{
@@ -1383,6 +1257,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
}
return aRet;
}
+
/*-- 21.05.2004 12:31:31---------------------------------------------------
returns the name that is assigned as e-mail column of the current data base
-----------------------------------------------------------------------*/
@@ -1396,9 +1271,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn);
return sRet;
}
-/*-- 30.04.2004 13:25:41---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
const Sequence< ::rtl::OUString>& rList)
{
@@ -1429,9 +1302,6 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
m_pImpl->SetModified();
}
-/*-- 07.09.2005 11:50:27---------------------------------------------------
-
- -----------------------------------------------------------------------*/
bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
{
bool bResult = true;
@@ -1477,9 +1347,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
}
return bResult;
}
-/*-- 07.09.2005 11:50:27---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
{
bool bResult = true;
@@ -1538,16 +1406,12 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
}
return bResult;
}
-/*-- 05.05.2004 16:10:07---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailDisplayName() const
{
return m_pImpl->sMailDisplayName;
}
-/*-- 05.05.2004 16:10:08---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
{
if(m_pImpl->sMailDisplayName != rName)
@@ -1556,16 +1420,12 @@ void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:09---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailAddress() const
{
return m_pImpl->sMailAddress;
}
-/*-- 05.05.2004 16:10:09---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
{
if(m_pImpl->sMailAddress != rAddress )
@@ -1575,16 +1435,11 @@ void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
}
}
-/*-- 07.05.2004 12:40:59---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsMailReplyTo() const
{
return m_pImpl->bIsMailReplyTo;
}
-/*-- 07.05.2004 12:40:59---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
{
if(m_pImpl->bIsMailReplyTo != bSet)
@@ -1593,16 +1448,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:09---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailReplyTo() const
{
return m_pImpl->sMailReplyTo;
}
-/*-- 05.05.2004 16:10:09---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
{
if(m_pImpl->sMailReplyTo != rReplyTo)
@@ -1611,16 +1462,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:09---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailServer() const
{
return m_pImpl->sMailServer;
}
-/*-- 05.05.2004 16:10:10---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
{
if(m_pImpl->sMailServer != rAddress)
@@ -1629,18 +1476,14 @@ void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:10---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int16 SwMailMergeConfigItem::GetMailPort() const
{
return m_pImpl->bIsDefaultPort ?
(m_pImpl->bIsSecureConnection ? SECURE_PORT : DEFAULT_PORT) :
m_pImpl->nMailPort;
}
-/*-- 05.05.2004 16:10:10---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
{
if(m_pImpl->nMailPort != nSet || m_pImpl->bIsDefaultPort)
@@ -1650,16 +1493,12 @@ void SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:11---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsSecureConnection() const
{
return m_pImpl->bIsSecureConnection;
}
-/*-- 05.05.2004 16:10:12---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
{
if(m_pImpl->bIsSecureConnection != bSet)
@@ -1668,16 +1507,12 @@ void SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:12---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsAuthentication() const
{
return m_pImpl->bIsAuthentication;
}
-/*-- 05.05.2004 16:10:13---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
{
if(m_pImpl->bIsAuthentication != bSet)
@@ -1686,16 +1521,12 @@ void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:13---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailUserName() const
{
return m_pImpl->sMailUserName;
}
-/*-- 05.05.2004 16:10:13---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
{
if(m_pImpl->sMailUserName != rName)
@@ -1704,16 +1535,12 @@ void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
m_pImpl->SetModified();
}
}
-/*-- 05.05.2004 16:10:14---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetMailPassword() const
{
return m_pImpl->sMailPassword;
}
-/*-- 05.05.2004 16:10:14---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
{
if(m_pImpl->sMailPassword != rPassword)
@@ -1722,16 +1549,12 @@ void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString&
rPassword)
m_pImpl->SetModified();
}
}
-/*-- 19.08.2004 14:44:57---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsSMTPAfterPOP() const
{
return m_pImpl->bIsSMPTAfterPOP;
}
-/*-- 19.08.2004 14:44:57---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
{
if( m_pImpl->bIsSMPTAfterPOP != bSet)
@@ -1740,16 +1563,12 @@ void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 19.08.2004 14:44:57---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetInServerName() const
{
return m_pImpl->sInServerName;
}
-/*-- 19.08.2004 14:44:57---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
{
if(m_pImpl->sInServerName != rServer)
@@ -1758,16 +1577,12 @@ void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
m_pImpl->SetModified();
}
}
-/*-- 19.08.2004 14:44:58---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int16 SwMailMergeConfigItem::GetInServerPort() const
{
return m_pImpl->nInServerPort;
}
-/*-- 19.08.2004 14:44:58---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
{
if( m_pImpl->nInServerPort != nSet)
@@ -1776,16 +1591,12 @@ void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
m_pImpl->SetModified();
}
}
-/*-- 20.08.2004 08:52:48---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeConfigItem::IsInServerPOP() const
{
return m_pImpl->bInServerPOP;
}
-/*-- 20.08.2004 08:52:49---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
{
if( m_pImpl->bInServerPOP != bSet)
@@ -1794,16 +1605,12 @@ void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
m_pImpl->SetModified();
}
}
-/*-- 19.08.2004 14:44:58---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetInServerUserName() const
{
return m_pImpl->sInServerUserName;
}
-/*-- 19.08.2004 14:44:58---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
{
if( m_pImpl->sInServerUserName != rName)
@@ -1812,16 +1619,12 @@ void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString&
rName)
m_pImpl->SetModified();
}
}
-/*-- 19.08.2004 14:44:59---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString SwMailMergeConfigItem::GetInServerPassword() const
{
return m_pImpl->sInServerPassword;
}
-/*-- 19.08.2004 14:45:00---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword)
{
if(m_pImpl->sInServerPassword != rPassword)
@@ -1831,9 +1634,6 @@ void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString&
rPassword
}
}
-/*-- 02.09.2004 14:43:27---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::DocumentReloaded()
{
m_bMergeDone = false;
@@ -1841,38 +1641,28 @@ void SwMailMergeConfigItem::DocumentReloaded()
m_bAddressInserted = false;
m_rAddressBlockFrame = ::rtl::OUString();
}
-/*-- 16.06.2004 12:24:18---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwMailMergeConfigItem::IsMailAvailable() const
{
return m_pImpl->bIsEMailSupported;
}
-/*-- 21.05.2004 12:20:05---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo)
{
m_pImpl->aMergeInfos.push_back(rInfo);
}
-/*-- 21.05.2004 12:20:05---------------------------------------------------
- -----------------------------------------------------------------------*/
SwDocMergeInfo& SwMailMergeConfigItem::GetDocumentMergeInfo(sal_uInt32 nDocument)
{
DBG_ASSERT(m_pImpl->aMergeInfos.size() > nDocument,"invalid document index");
return m_pImpl->aMergeInfos[nDocument];
}
-/*-- 14.06.2004 11:46:26---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_uInt32 SwMailMergeConfigItem::GetMergedDocumentCount() const
{
return m_pImpl->aMergeInfos.size();
}
-/*-- 11.06.2004 10:38:39---------------------------------------------------
- -----------------------------------------------------------------------*/
SwView* lcl_ExistsView(SwView* pView)
{
const TypeId aType(TYPE(SwView));
@@ -1886,9 +1676,7 @@ SwView* lcl_ExistsView(SwView* pView)
}
return 0;
}
-/*-- 16.06.2004 15:02:35---------------------------------------------------
- -----------------------------------------------------------------------*/
SwView* SwMailMergeConfigItem::GetTargetView()
{
//make sure that the pointer is really valid - the document may have been closed manually
@@ -1898,9 +1686,7 @@ SwView* SwMailMergeConfigItem::GetTargetView()
}
return m_pTargetView;
}
-/*-- 02.09.2004 17:04:11---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetTargetView(SwView* pView)
{
m_pTargetView = pView;
@@ -1910,17 +1696,13 @@ void SwMailMergeConfigItem::SetTargetView(SwView* pView)
m_pImpl->aMergeInfos.clear();
}
}
-/*-- 16.06.2004 15:02:35---------------------------------------------------
- -----------------------------------------------------------------------*/
SwView* SwMailMergeConfigItem::GetSourceView()
{
m_pSourceView = lcl_ExistsView(m_pSourceView);
return m_pSourceView;
}
-/*-- 04.11.2004 19:53 ---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetSourceView(SwView* pView)
{
m_pSourceView = pView;
@@ -1966,16 +1748,11 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView)
}
}
-/*-- 13.03.2006 12:15:06---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwMailMergeConfigItem::SetCurrentAddressBlockIndex( sal_Int32 nSet )
{
m_pImpl->SetCurrentAddressBlockIndex( nSet );
}
-/*-- 13.03.2006 12:15:07---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Int32 SwMailMergeConfigItem::GetCurrentAddressBlockIndex() const
{
return m_pImpl->GetCurrentAddressBlockIndex();
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index cff7d37..a400a17 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -59,9 +59,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace svt;
-/*-- 02.04.2004 09:40:14---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent ) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_DOCSELECT_PAGE)),
#ifdef MSC
@@ -112,16 +109,10 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard*
_pParent
}
}
-/*-- 02.04.2004 09:40:14---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
{
}
-/*-- 05.04.2004 14:21:48---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, RadioButton*, pButton)
{
m_aRecentDocLB.Enable(&m_aRecentDocRB == pButton);
@@ -131,9 +122,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, RadioButton*, pButton)
return 0;
}
-/*-- 05.04.2004 14:25:12---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
{
bool bTemplate = &m_aBrowseTemplatePB == pButton;
@@ -192,9 +181,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
return 0;
}
-/*-- 06.04.2004 12:52:24---------------------------------------------------
-
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
sal_Bool bReturn = sal_False;
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index db00382..626654c 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -47,7 +47,7 @@
using namespace svt;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-// -----------------------------------------------------------------------
+
void lcl_FillGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
@@ -57,7 +57,7 @@ void lcl_FillGreetingsBox(ListBox& rBox,
rBox.InsertEntry(rEntries[nEntry]);
rBox.SelectEntryPos((USHORT)rConfig.GetCurrentGreeting(eType));
}
-// -----------------------------------------------------------------------
+
void lcl_FillGreetingsBox(ComboBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
@@ -67,7 +67,7 @@ void lcl_FillGreetingsBox(ComboBox& rBox,
rBox.InsertEntry(rEntries[nEntry]);
rBox.SelectEntryPos((USHORT)rConfig.GetCurrentGreeting(eType));
}
-// -----------------------------------------------------------------------
+
void lcl_StoreGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
@@ -79,7 +79,7 @@ void lcl_StoreGreetingsBox(ListBox& rBox,
rConfig.SetGreetings(eType, aEntries);
rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
}
-// -----------------------------------------------------------------------
+
void lcl_StoreGreetingsBox(ComboBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
@@ -91,9 +91,7 @@ void lcl_StoreGreetingsBox(ComboBox& rBox,
rConfig.SetGreetings(eType, aEntries);
rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
}
-/*-- 30.04.2004 10:42:57---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwGreetingsHandler, IndividualHdl_Impl, CheckBox*, EMPTYARG)
{
BOOL bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked();
@@ -118,9 +116,7 @@ IMPL_LINK(SwGreetingsHandler, IndividualHdl_Impl, CheckBox*, EMPTYARG)
UpdatePreview();
return 0;
}
-/*-- 30.04.2004 10:42:57---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton)
{
SwCustomizeAddressBlockDialog* pDlg =
@@ -142,16 +138,12 @@ IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton)
delete pDlg;
return 0;
}
-/*-- 16.06.2004 10:56:21---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwGreetingsHandler::UpdatePreview()
{
//the base class does nothing
}
-/*-- 30.04.2004 10:42:59---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton)
{
String sPreview = m_aFemaleLB.GetSelectEntry();
@@ -168,17 +160,13 @@ IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton)
delete pDlg;
return 0;
}
-/*-- 05.05.2004 15:25:56---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl, ListBox*, EMPTYARG)
{
UpdatePreview();
return 0;
}
-/*-- 05.05.2004 15:23:43---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeGreetingsPage::UpdatePreview()
{
//find out which type of greeting should be selected:
@@ -233,9 +221,7 @@ void SwMailMergeGreetingsPage::UpdatePreview()
sPreview = SwAddressPreview::FillData(sPreview, m_pWizard->GetConfigItem());
m_aPreviewWIN.SetAddress(sPreview);
}
-/*-- 17.05.2004 15:44:53---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
{
m_pPersonalizedCB->Enable(bContainsGreeting);
@@ -255,9 +241,7 @@ void SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
m_pNeutralFT->Enable(bContainsGreeting);
m_pNeutralCB->Enable(bContainsGreeting);
}
-/*-- 02.04.2004 14:17:52---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_GREETINGS_PAGE)),
#ifdef MSC
@@ -353,15 +337,11 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard*
_pParent)
sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(1));
m_aDocumentIndexFI.SetText(sTemp);
}
-/*-- 02.04.2004 14:17:52---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeGreetingsPage::~SwMailMergeGreetingsPage()
{
}
-/*-- 18.06.2004 12:13:53---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeGreetingsPage::ActivatePage()
{
SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
@@ -387,9 +367,7 @@ void SwMailMergeGreetingsPage::ActivatePage()
UpdatePreview();
m_pWizard->enableButtons(WZB_NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE));
}
-/*-- 11.05.2004 14:47:10---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason )
{
SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
@@ -421,9 +399,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
rConfig.SetIndividualGreeting(m_aPersonalizedCB.IsChecked(), sal_False);
return sal_True;
}
-/*-- 30.04.2004 10:42:57---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
{
sal_Bool bContainsGreeting = pBox->IsChecked();
@@ -439,9 +415,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
m_pWizard->UpdateRoadmap();
return 0;
}
-/*-- 07.05.2004 12:56:42---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
{
//if no pButton is given, the first set has to be pre-set
@@ -473,9 +447,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
m_aDocumentIndexFI.SetText(sTemp);
return 0;
}
-/*-- 17.05.2004 15:11:19---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) :
SfxModalDialog(pParent, SW_RES(DLG_MM_MAILBODY)),
#ifdef MSC
@@ -570,25 +542,18 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard*
_pWizard)
m_aFemaleFieldCB.SetText(rConfig.GetFemaleGenderValue());
m_aFemaleFieldCB.SaveValue();
}
-/*-- 17.05.2004 15:13:07---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailBodyDialog::~SwMailBodyDialog()
{
}
-/*-- 30.04.2004 10:42:57---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, CheckBox*, pBox)
{
SwGreetingsHandler::Contains(pBox->IsChecked());
m_pWizard->GetConfigItem().SetGreetingLine(pBox->IsChecked(), sal_True);
return 0;
}
-/*-- 28.06.2004 11:22:42---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailBodyDialog, OKHdl, PushButton*, EMPTYARG)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -616,4 +581,3 @@ IMPL_LINK(SwMailBodyDialog, OKHdl, PushButton*, EMPTYARG)
EndDialog(RET_OK);
return 0;
}
-
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 91312c9..28239ea 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -84,9 +84,6 @@ using namespace ::com::sun::star::view;
#define DEFAULT_ADDRESS_WIDTH (MM50*15)// 7,5 cm
#define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
-/*-- 15.04.2004 08:16:35---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
#ifdef MSC
@@ -179,18 +176,14 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_aAlignToBodyCB.SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl));
m_aAlignToBodyCB.Check();
}
-/*-- 15.04.2004 08:17:11---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeLayoutPage::~SwMailMergeLayoutPage()
{
delete m_pExampleFrame;
File::remove( m_sExampleURL );
}
-/*-- 27.05.2004 13:41:04---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeLayoutPage::ActivatePage()
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -251,9 +244,7 @@ void SwMailMergeLayoutPage::ActivatePage()
}
}
-/*-- 11.05.2004 10:41:26---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
//now insert the frame and the greeting
@@ -270,9 +261,7 @@ sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason
}
return sal_True;
}
-/*-- 24.06.2004 09:50:26---------------------------------------------------
- -----------------------------------------------------------------------*/
SwFrmFmt* SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
SwMailMergeConfigItem& rConfigItem,
const Point& rAddressPosition,
@@ -300,9 +289,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
pView->GetWrtShell().EndUndo(UNDO_INSERT);
return pAddressBlockFormat;
}
-/*-- 11.05.2004 12:49:04---------------------------------------------------
- -----------------------------------------------------------------------*/
SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
SwWrtShell& rShell,
SwMailMergeConfigItem& rConfigItem,
@@ -458,9 +445,6 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
return pRet;
}
-/*-- 12.05.2004 12:20:19---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem,
bool bExample)
{
//set the cursor to the desired position - if no text content is here then
@@ -689,9 +673,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
DBG_ASSERT(0 == rShell.GetTableFmt(), "What to do with a table here?");
}
-/*-- 10.05.2004 09:34:25---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG)
{
m_aExampleWIN.Show( TRUE );
@@ -735,9 +717,7 @@ IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG)
m_aTopMF.SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
return 0;
}
-/*-- 10.05.2004 14:05:24---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox)
{
if(m_pExampleWrtShell)
@@ -761,10 +741,6 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox)
return 0;
}
-
-/*-- 10.05.2004 15:56:51---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, MetricField*, EMPTYARG)
{
if(m_pExampleWrtShell && m_pAddressBlockFormat)
@@ -786,9 +762,6 @@ IMPL_LINK(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, MetricField*, EMPTYARG)
return 0;
}
-/*-- 10.05.2004 16:13:36---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
{
bool bDown = pButton == &m_aDownPB;
@@ -803,9 +776,7 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
return 0;
}
-/*-- 15.07.2004 16:05:30---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, CheckBox*, pBox)
{
sal_Bool bCheck = pBox->IsChecked() && pBox->IsEnabled();
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index 1131556..01dc2bd 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -42,9 +42,6 @@
#include <svl/eitem.hxx>
#include <swabstdlg.hxx>
-/*-- 02.04.2004 16:38:45---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
#ifdef MSC
@@ -75,24 +72,18 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
m_aFindED.SetReturnActionLink( LINK(this, SwMailMergeMergePage, EnteredFindStringHdl_Impl ));
}
-/*-- 02.04.2004 16:38:45---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeMergePage::~SwMailMergeMergePage()
{
}
-/*-- 25.05.2004 16:14:49---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG)
{
m_pWizard->SetRestartPage(MM_MERGEPAGE);
m_pWizard->EndDialog(RET_EDIT_RESULT_DOC);
return 0;
}
-/*-- 25.05.2004 16:14:49---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG)
{
SvxSearchItem aSearchItem( SID_SEARCH_ITEM );
@@ -114,6 +105,7 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG)
return 0;
}
+
IMPL_LINK( SwMailMergeMergePage, EnteredFindStringHdl_Impl, void*, EMPTYARG )
{
m_aFindPB.GetClickHdl().Call( &m_aFindPB );
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index e267b32..61746b2 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -83,9 +83,6 @@ using namespace svt;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-/*-- 01.07.2004 16:47:49---------------------------------------------------
-
- -----------------------------------------------------------------------*/
String lcl_GetExtensionForDocType(ULONG nDocType)
{
String sExtension;
@@ -99,9 +96,7 @@ String lcl_GetExtensionForDocType(ULONG nDocType)
}
return sExtension;
}
-/*-- 28.06.2004 11:49:21---------------------------------------------------
- -----------------------------------------------------------------------*/
::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference <
container::XNameAccess>& rxColAccess )
{
::rtl::OUString sRet;
@@ -115,9 +110,7 @@ String lcl_GetExtensionForDocType(ULONG nDocType)
}
return sRet;
}
-/*-- 21.06.2004 14:01:13---------------------------------------------------
- -----------------------------------------------------------------------*/
class SwSaveWarningBox_Impl : public ModalDialog
{
FixedImage aWarningImageIM;
@@ -137,9 +130,7 @@ public:
String GetFileName() const {return aFileNameED.GetText();}
};
-/*-- 02.07.2004 08:54:42---------------------------------------------------
- -----------------------------------------------------------------------*/
class SwSendQueryBox_Impl : public ModalDialog
{
FixedImage aQueryImageIM;
@@ -171,9 +162,6 @@ public:
}
};
-/*-- 21.06.2004 14:11:58---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const String& rFileName) :
ModalDialog(pParent, SW_RES( DLG_MM_SAVEWARNING )),
aWarningImageIM(this, SW_RES( IM_WARNING )),
@@ -190,23 +178,17 @@ SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const String&
rFil
aFileNameED.SetModifyHdl(LINK(this, SwSaveWarningBox_Impl, ModifyHdl));
ModifyHdl( &aFileNameED );
}
-/*-- 21.06.2004 14:11:58---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSaveWarningBox_Impl::~SwSaveWarningBox_Impl()
{
}
-/*-- 21.06.2004 14:11:58---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit)
{
aOKPB.Enable(pEdit->GetText().Len() > 0);
return 0;
}
-/*-- 02.07.2004 09:02:53---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const String& rText) :
ModalDialog(pParent, SW_RES( DLG_MM_QUERY )),
aQueryImageIM( this, SW_RES( IM_QUERY )),
@@ -223,24 +205,17 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const String&
rText) :
aTextED.SetModifyHdl(LINK(this, SwSendQueryBox_Impl, ModifyHdl));
ModifyHdl( &aTextED );
}
-/*-- 02.07.2004 08:58:45---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSendQueryBox_Impl::~SwSendQueryBox_Impl()
{
}
-/*-- 02.07.2004 08:58:25---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, Edit*, pEdit)
{
aOKPB.Enable(bIsEmptyAllowed || (pEdit->GetText().Len() > 0));
return 0;
}
-/*-- 16.04.2004 16:34:48---------------------------------------------------
-
- -----------------------------------------------------------------------*/
class SwCopyToDialog : public SfxModalDialog
{
FixedInfo m_aDescriptionFI;
@@ -267,9 +242,6 @@ public:
void SetBCC(const String& rSet) {m_aBCCED.SetText(rSet);}
};
-/*-- 16.04.2004 16:43:18---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwCopyToDialog::SwCopyToDialog(Window* pParent) :
SfxModalDialog(pParent, SW_RES(DLG_MM_COPYTO)),
#ifdef MSC
@@ -291,16 +263,11 @@ SwCopyToDialog::SwCopyToDialog(Window* pParent) :
{
FreeResource();
}
-/*-- 16.04.2004 16:43:10---------------------------------------------------
- -----------------------------------------------------------------------*/
SwCopyToDialog::~SwCopyToDialog()
{
}
-/*-- 02.04.2004 13:15:54---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUT_PAGE)),
#ifdef MSC
@@ -410,17 +377,12 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
m_aPrintRB.Enable(!Application::GetSettings().GetMiscSettings().GetDisablePrinting());
}
-/*-- 02.04.2004 13:15:44---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeOutputPage::~SwMailMergeOutputPage()
{
delete m_pTempPrinter;
delete m_pDocumentPrinterCopy;
}
-/*-- 31.01.2005 08:38:14---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergeOutputPage::ActivatePage()
{
//fill printer ListBox
@@ -461,16 +423,12 @@ void SwMailMergeOutputPage::ActivatePage()
}
}
}
-/*-- 05.07.2004 13:54:11---------------------------------------------------
- -----------------------------------------------------------------------*/
bool SwMailMergeOutputPage::canAdvance() const
{
return false;
}
-/*-- 02.04.2004 13:15:44---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
{
Control* aControls[] =
@@ -633,9 +591,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
SetUpdateMode(FALSE);
return 0;
}
-/*-- 22.08.2005 12:15:10---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButton)
{
sal_Bool bEnableFromTo = pButton == &m_aFromRB;
@@ -645,9 +601,6 @@ IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButto
return 0;
}
-/*-- 16.04.2004 16:45:10---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton)
{
SwCopyToDialog* pDlg = new SwCopyToDialog(pButton);
@@ -661,9 +614,7 @@ IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton)
delete pDlg;
return 0;
}
-/*-- 17.05.2004 13:51:02---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -703,17 +654,13 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
}
return 0;
}
-/*-- 17.07.2008 08:09:06---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, EMPTYARG )
{
m_bCancelSaving = true;
return 0;
}
-/*-- 17.05.2004 13:51:02---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -901,9 +848,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
m_pWizard->enableButtons(WZB_FINISH, sal_True);
return 0;
}
-/*-- 22.06.2004 11:51:30---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox)
{
if( m_pDocumentPrinterCopy && pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
@@ -943,9 +888,6 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox)
return 0;
}
-/*-- 17.05.2004 13:51:02---------------------------------------------------
-
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
{
SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView();
@@ -1005,9 +947,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
m_pWizard->enableButtons(WZB_FINISH, sal_True);
return 0;
}
-/*-- 17.05.2004 13:51:02---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
{
if( !m_pTempPrinter )
@@ -1016,9 +956,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
m_pTempPrinter->Setup(pButton);
return 0;
}
-/*-- 14.06.2004 09:34:01---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
{
ULONG nDocType = (ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
@@ -1045,9 +983,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
}
return 0;
}
-/*-- 17.05.2004 13:51:02---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton)
{
SwMailBodyDialog* pDlg = new SwMailBodyDialog(pButton, m_pWizard);
@@ -1058,6 +994,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton)
}
return 0;
}
+
/*-- 21.05.2004 12:03:25---------------------------------------------------
Send documents as e-mail
-----------------------------------------------------------------------*/
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 2d98b7f..bf3992f 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -42,9 +42,6 @@
#include <mmoutputtypepage.hrc>
#include <dbui.hrc>
-/*-- 02.04.2004 11:06:55---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUTTYPE_PAGE)),
#ifdef MSC
@@ -88,15 +85,11 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen
TypeHdl_Impl(&m_aLetterRB);
}
-/*-- 02.04.2004 11:06:55---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
{
}
-/*-- 14.04.2004 14:44:07---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergeOutputTypePage, TypeHdl_Impl, RadioButton*, EMPTYARG )
{
bool bLetter = m_aLetterRB.IsChecked();
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 84d7175..ccfc4b6 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -54,9 +54,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
using ::rtl::OUString;
-/*-- 02.04.2004 16:42:49---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)),
#ifdef MSC
@@ -90,24 +87,18 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP
m_ExcludeCB.SetClickHdl(LINK(this, SwMailMergePrepareMergePage, ExcludeHdl_Impl));
aMoveLink.Call(&m_aRecordED);
}
-/*-- 02.04.2004 16:42:49---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage()
{
}
-/*-- 13.05.2004 15:36:48---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergePrepareMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG)
{
m_pWizard->SetRestartPage(MM_PREPAREMERGEPAGE);
m_pWizard->EndDialog(RET_EDIT_DOC);
return 0;
}
-/*-- 27.05.2004 14:16:37---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -166,22 +157,19 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
rSh.GetNewDBMgr()->MergeNew(aMergeDesc);
return 0;
}
-/*-- 27.05.2004 14:46:28---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergePrepareMergePage, ExcludeHdl_Impl, CheckBox*, pBox)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
rConfigItem.ExcludeRecord( rConfigItem.GetResultSetPosition(), pBox->IsChecked());
return 0;
};
-/*-- 18.08.2004 10:36:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwMailMergePrepareMergePage::ActivatePage()
{
MoveHdl_Impl(&m_aRecordED);
}
+
/*-- 13.05.2004 15:38:32---------------------------------------------------
merge the data into a new file
-----------------------------------------------------------------------*/
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 51277a1..ffaf10d 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -57,9 +57,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-/*-- 08.04.2004 14:33:56---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
const uno::Reference< sdbc::XConnection>& rConnection) :
SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTDBTABLEDDIALOG)),
@@ -148,15 +145,11 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
}
}
}
-/*-- 08.04.2004 14:33:57---------------------------------------------------
- -----------------------------------------------------------------------*/
SwSelectDBTableDialog::~SwSelectDBTableDialog()
{
}
-/*-- 08.04.2004 14:33:57---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
{
SvLBoxEntry* pEntry = m_aTableLB.FirstSelected();
@@ -195,18 +188,14 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
return 0;
}
-/*-- 19.04.2004 10:03:26---------------------------------------------------
- -----------------------------------------------------------------------*/
String SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable)
{
SvLBoxEntry* pEntry = m_aTableLB.FirstSelected();
bIsTable = pEntry->GetUserData() ? false : true;
return pEntry ? m_aTableLB.GetEntryText(pEntry, 0) : String();
}
-/*-- 13.05.2004 12:58:26---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwSelectDBTableDialog::SetSelectedTable(const String& rTable, bool bIsTable)
{
SvLBoxEntry* pEntry = m_aTableLB.First();
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index 786c60b..0ba95ff 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -35,8 +35,6 @@
#include <osl/diagnose.h>
#include <tools/solar.h>
-//........................................................................
-
using namespace ::connectivity::simple;
using namespace ::com::sun::star;
using namespace ::com::sun::star::sdbc;
@@ -80,12 +78,11 @@ namespace
}
// -----------------------------------------------------------------------------
}
-// -----------------------------------------------------------------------------
+
SwDbtoolsClient::SwDbtoolsClient()
{
}
-//--------------------------------------------------------------------
SwDbtoolsClient::~SwDbtoolsClient()
{
if(m_xDataAccessFactory.is())
@@ -98,7 +95,6 @@ SwDbtoolsClient::~SwDbtoolsClient()
}
}
-//--------------------------------------------------------------------
extern "C" { static void SAL_CALL thisModule() {} }
void SwDbtoolsClient::registerClient()
@@ -135,7 +131,6 @@ void SwDbtoolsClient::registerClient()
}
}
-//--------------------------------------------------------------------
void SwDbtoolsClient::revokeClient()
{
::osl::MutexGuard aGuard(getDbtoolsClientMutex());
@@ -147,9 +142,7 @@ void SwDbtoolsClient::revokeClient()
getDbToolsClientModule() = NULL;
}
}
-/* -----------------------------30.08.2001 14:58------------------------------
- ---------------------------------------------------------------------------*/
void SwDbtoolsClient::getFactory()
{
if(!m_xDataAccessFactory.is())
@@ -169,9 +162,7 @@ void SwDbtoolsClient::getFactory()
}
}
}
-/* -----------------------------30.08.2001 11:32------------------------------
- ---------------------------------------------------------------------------*/
::rtl::Reference< ::connectivity::simple::IDataAccessTools >
SwDbtoolsClient::getDataAccessTools()
{
@@ -183,9 +174,7 @@ void SwDbtoolsClient::getFactory()
}
return m_xDataAccessTools;
}
-/* -----------------------------30.08.2001 12:40------------------------------
- ---------------------------------------------------------------------------*/
::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion >
SwDbtoolsClient::getAccessTypeConversion()
{
@@ -198,9 +187,6 @@ void SwDbtoolsClient::getFactory()
return m_xAccessTypeConversion;
}
-/* -----------------------------30.08.2001 11:37------------------------------
-
- ---------------------------------------------------------------------------*/
Reference< XDataSource > SwDbtoolsClient::getDataSource(
const ::rtl::OUString& rRegisteredName,
const Reference< XMultiServiceFactory>& xFactory
@@ -212,9 +198,7 @@ Reference< XDataSource > SwDbtoolsClient::getDataSource(
xRet = xAccess->getDataSource(rRegisteredName, xFactory);
return xRet;
}
-/* -----------------------------30.08.2001 12:06------------------------------
- ---------------------------------------------------------------------------*/
sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
const Reference< XPropertySet >& rxColumn,
const Reference< XNumberFormatTypes >& rxTypes,
@@ -227,9 +211,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
nRet = xAccess->getDefaultNumberFormat( rxColumn, rxTypes, rLocale);
return nRet;
}
-/* -----------------------------30.08.2001 12:38------------------------------
- ---------------------------------------------------------------------------*/
::rtl::OUString SwDbtoolsClient::getValue(
const uno::Reference< beans::XPropertySet>& _rxColumn,
const uno::Reference< util::XNumberFormatter>& _rxFormatter,
@@ -245,4 +227,3 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
sRet = xConversion->getValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate);
return sRet;
}
-
Context
- [Libreoffice] [PATCH 1/1] Cleanup: remove bogus comments from dbui directory · Prashant Shah
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.