[Libreoffice-commits] .: sw/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Oct 10 02:29:38 PDT 2010
sw/source/ui/envelp/envfmt.cxx | 36 -----------
sw/source/ui/envelp/envimg.cxx | 21 +-----
sw/source/ui/envelp/envlop1.cxx | 71 ----------------------
sw/source/ui/envelp/envprt.cxx | 44 --------------
sw/source/ui/envelp/label1.cxx | 121 ---------------------------------------
sw/source/ui/envelp/labelcfg.cxx | 22 +------
sw/source/ui/envelp/labelexp.cxx | 12 ---
sw/source/ui/envelp/labfmt.cxx | 61 -------------------
sw/source/ui/envelp/labimg.cxx | 17 -----
sw/source/ui/envelp/labprt.cxx | 37 -----------
sw/source/ui/envelp/mailmrge.cxx | 36 +----------
11 files changed, 18 insertions(+), 460 deletions(-)
New commits:
commit d8d530bd33514e154c3109c3fd26bb8825519b73
Author: Prashant Shah <pshah.mumbai at gmail.com>
Date: Sun Oct 10 04:21:45 2010 -0500
Remove bogus comment
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index d723b10..3066c72 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -78,9 +78,6 @@ static PopupMenu *pMenu;
static long lUserW = 5669; // 10 cm
static long lUserH = 5669; // 10 cm
-// --------------------------------------------------------------------------
-
-
SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_ENV_FMT), rSet),
@@ -186,9 +183,6 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
}
-// --------------------------------------------------------------------------
-
-
__EXPORT SwEnvFmtPage::~SwEnvFmtPage()
{
aAddrEditButton.SetPopupMenu(0);
@@ -196,9 +190,6 @@ __EXPORT SwEnvFmtPage::~SwEnvFmtPage()
delete ::pMenu;
}
-// --------------------------------------------------------------------------
-
-
IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
{
long lWVal = static_cast< long >(GetFldVal(aSizeWidthField ));
@@ -234,9 +225,6 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
}
IMPL_LINK_INLINE_END( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
-// --------------------------------------------------------------------------
-
-
IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
{
SwWrtShell* pSh = GetParent()->pSh;
@@ -438,9 +426,6 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
return pAddrSet;
}
-// --------------------------------------------------------------------------
-
-
IMPL_LINK( SwEnvFmtPage, FormatHdl, ListBox *, EMPTYARG )
{
long lWidth;
@@ -483,9 +468,6 @@ IMPL_LINK( SwEnvFmtPage, FormatHdl, ListBox *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
void SwEnvFmtPage::SetMinMax()
{
long lWVal = static_cast< long >(GetFldVal(aSizeWidthField ));
@@ -523,17 +505,11 @@ void SwEnvFmtPage::SetMinMax()
aSizeHeightField.Reformat();
}
-// --------------------------------------------------------------------------
-
-
SfxTabPage* __EXPORT SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwEnvFmtPage(pParent, rSet);
}
-// ----------------------------------------------------------------------------
-
-
void __EXPORT SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
{
SfxItemSet aSet(rSet);
@@ -541,9 +517,6 @@ void __EXPORT SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet)
Reset(aSet);
}
-// ----------------------------------------------------------------------------
-
-
int __EXPORT SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet)
{
if( _pSet )
@@ -551,9 +524,6 @@ int __EXPORT SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet)
return SfxTabPage::LEAVE_PAGE;
}
-// --------------------------------------------------------------------------
-
-
void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
{
rItem.lAddrFromLeft = static_cast< sal_Int32 >(GetFldVal(aAddrLeftField));
@@ -578,9 +548,6 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
}
}
-// --------------------------------------------------------------------------
-
-
BOOL __EXPORT SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
{
FillItem(GetParent()->aEnvItem);
@@ -588,9 +555,6 @@ BOOL __EXPORT SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
return TRUE;
}
-// --------------------------------------------------------------------------
-
-
void __EXPORT SwEnvFmtPage::Reset(const SfxItemSet& rSet)
{
const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP);
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 118e31d..e79f3eb 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star::uno;
TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
-// --------------------------------------------------------------------------
SW_DLLPUBLIC String MakeSender()
{
SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions();
@@ -103,7 +102,7 @@ SW_DLLPUBLIC String MakeSender()
}
return sRet;
}
-// --------------------------------------------------------------------------
+
SwEnvItem::SwEnvItem() :
SfxPoolItem(FN_ENVELOP)
{
@@ -123,7 +122,7 @@ SwEnvItem::SwEnvItem() :
lAddrFromLeft = Max(lWidth, lHeight) / 2;
lAddrFromTop = Min(lWidth, lHeight) / 2;
}
-// --------------------------------------------------------------------------
+
SwEnvItem::SwEnvItem(const SwEnvItem& rItem) :
SfxPoolItem(FN_ENVELOP),
aAddrText (rItem.aAddrText),
@@ -142,7 +141,6 @@ SwEnvItem::SwEnvItem(const SwEnvItem& rItem) :
{
}
-// --------------------------------------------------------------------------
SwEnvItem& SwEnvItem::operator =(const SwEnvItem& rItem)
{
aAddrText = rItem.aAddrText;
@@ -160,7 +158,7 @@ SwEnvItem& SwEnvItem::operator =(const SwEnvItem& rItem)
lShiftDown = rItem.lShiftDown;
return *this;
}
-// --------------------------------------------------------------------------
+
int SwEnvItem::operator ==(const SfxPoolItem& rItem) const
{
const SwEnvItem& rEnv = (const SwEnvItem&) rItem;
@@ -180,13 +178,11 @@ int SwEnvItem::operator ==(const SfxPoolItem& rItem) const
lShiftDown == rEnv.lShiftDown;
}
-// --------------------------------------------------------------------------
SfxPoolItem* SwEnvItem::Clone(SfxItemPool*) const
{
return new SwEnvItem(*this);
}
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
+
SwEnvCfgItem::SwEnvCfgItem() :
ConfigItem(C2U("Office.Writer/Envelope"))
{
@@ -249,15 +245,11 @@ SwEnvCfgItem::SwEnvCfgItem() :
}
}
}
-/* -----------------------------26.09.00 14:04--------------------------------
- ---------------------------------------------------------------------------*/
SwEnvCfgItem::~SwEnvCfgItem()
{
}
-/* -----------------------------26.09.00 14:05--------------------------------
- ---------------------------------------------------------------------------*/
void SwEnvCfgItem::Commit()
{
Sequence<OUString> aNames = GetPropertyNames();
@@ -289,9 +281,6 @@ void SwEnvCfgItem::Commit()
void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
-/* -----------------------------26.09.00 14:04--------------------------------
-
- ---------------------------------------------------------------------------*/
Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
{
static const char* aPropNames[] =
@@ -342,9 +331,7 @@ bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
}
return bRet;
}
-/* -----------------------------26.04.01 12:26--------------------------------
- ---------------------------------------------------------------------------*/
bool SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId)
{
bool bRet = false;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 12b0f1f..0341708 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -65,8 +65,6 @@ using namespace ::rtl;
//impl in envimg.cxx
extern SW_DLLPUBLIC String MakeSender();
-// --------------------------------------------------------------------------
-
SwEnvPreview::SwEnvPreview(SfxTabPage* pParent, const ResId& rResID) :
Window(pParent, rResID)
@@ -75,15 +73,10 @@ SwEnvPreview::SwEnvPreview(SfxTabPage* pParent, const ResId& rResID) :
SetMapMode(MapMode(MAP_PIXEL));
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvPreview::~SwEnvPreview()
{
}
-// ----------------------------------------------------------------------------
void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -91,8 +84,6 @@ void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt )
SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
}
-// ----------------------------------------------------------------------------
-
void SwEnvPreview::Paint(const Rectangle &)
{
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
@@ -154,10 +145,6 @@ void SwEnvPreview::Paint(const Rectangle &)
DrawRect(Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH)));
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert) :
@@ -186,20 +173,12 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
AddTabPage(TP_ENV_PRT, SwEnvPrtPage::Create, 0);
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvDlg::~SwEnvDlg()
{
delete pAddresseeSet;
delete pSenderSet;
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
{
if (nId == TP_ENV_PRT)
@@ -208,8 +187,6 @@ void SwEnvDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
}
}
-// --------------------------------------------------------------------------
-
short SwEnvDlg::Ok()
{
short nRet = SfxTabDialog::Ok();
@@ -231,10 +208,6 @@ short SwEnvDlg::Ok()
return nRet;
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_ENV_ENV), rSet),
@@ -271,18 +244,10 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) :
InitDatabaseBox();
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvPage::~SwEnvPage()
{
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
{
SwWait aWait( *pSh->GetView().GetDocShell(), TRUE );
@@ -300,10 +265,6 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG )
{
String aStr ( '<' );
@@ -324,10 +285,6 @@ IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPage, SenderHdl, Button *, EMPTYARG )
{
const BOOL bEnable = aSenderBox.IsChecked();
@@ -343,10 +300,6 @@ IMPL_LINK( SwEnvPage, SenderHdl, Button *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvPage::InitDatabaseBox()
{
if (pSh->GetNewDBMgr())
@@ -371,19 +324,11 @@ void SwEnvPage::InitDatabaseBox()
}
}
-// --------------------------------------------------------------------------
-
-
-
SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwEnvPage(pParent, rSet);
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
{
SfxItemSet aSet(rSet);
@@ -391,10 +336,6 @@ void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
Reset(aSet);
}
-// --------------------------------------------------------------------------
-
-
-
int SwEnvPage::DeactivatePage(SfxItemSet* _pSet)
{
FillItem(GetParent()->aEnvItem);
@@ -403,10 +344,6 @@ int SwEnvPage::DeactivatePage(SfxItemSet* _pSet)
return SfxTabPage::LEAVE_PAGE;
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvPage::FillItem(SwEnvItem& rItem)
{
rItem.aAddrText = aAddrEdit .GetText();
@@ -414,10 +351,6 @@ void SwEnvPage::FillItem(SwEnvItem& rItem)
rItem.aSendText = aSenderEdit.GetText();
}
-// --------------------------------------------------------------------------
-
-
-
BOOL SwEnvPage::FillItemSet(SfxItemSet& rSet)
{
FillItem(GetParent()->aEnvItem);
@@ -425,10 +358,6 @@ BOOL SwEnvPage::FillItemSet(SfxItemSet& rSet)
return TRUE;
}
-// ----------------------------------------------------------------------------
-
-
-
void SwEnvPage::Reset(const SfxItemSet& rSet)
{
SwEnvItem aItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP);
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index b7c155a..08348c6 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -44,10 +44,6 @@
#include "envprt.hrc"
-
-
-
-
SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_ENV_PRT), rSet),
@@ -90,18 +86,10 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
}
-// --------------------------------------------------------------------------
-
-
-
SwEnvPrtPage::~SwEnvPrtPage()
{
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
{
sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -128,10 +116,6 @@ IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn )
{
if (pBtn == &aPrtSetup)
@@ -150,10 +134,6 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwEnvPrtPage, AlignHdl, ToolBox *, EMPTYARG )
{
if (aAlignBox.GetCurItemId())
@@ -171,29 +151,17 @@ IMPL_LINK( SwEnvPrtPage, AlignHdl, ToolBox *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwEnvPrtPage(pParent, rSet);
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
{
if (pPrt)
aPrinterInfo.SetText(pPrt->GetName());
}
-// --------------------------------------------------------------------------
-
-
-
int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet)
{
if( _pSet )
@@ -201,10 +169,6 @@ int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet)
return SfxTabPage::LEAVE_PAGE;
}
-// --------------------------------------------------------------------------
-
-
-
void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
{
USHORT nID = 0;
@@ -218,10 +182,6 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
rItem.lShiftDown = static_cast< sal_Int32 >(GetFldVal(aDownField ));
}
-// --------------------------------------------------------------------------
-
-
-
BOOL SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
{
FillItem(GetParent()->aEnvItem);
@@ -229,10 +189,6 @@ BOOL SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
return TRUE;
}
-// ----------------------------------------------------------------------------
-
-
-
void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
{
// SfxItemSet aSet(rSet);
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 7e90180..b166abc 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -80,7 +80,6 @@ void SwLabRec::FillItem( SwLabItem& rItem ) const
rItem.nRows = nRows;
}
-// --------------------------------------------------------------------------
void SwLabDlg::_ReplaceGroup( const String &rMake )
{
//Die alten Eintraege vernichten.
@@ -89,10 +88,6 @@ void SwLabDlg::_ReplaceGroup( const String &rMake )
aLstGroup = rMake;
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
{
if (nId == TP_LAB_LAB)
@@ -109,10 +104,6 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
pPrtPage = (SwLabPrtPage*)&rPage;
}
-// --------------------------------------------------------------------------
-
-
-
SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
SwNewDBMgr* pDBMgr, sal_Bool bLabel) :
SfxTabDialog( pParent, SW_RES(DLG_LAB), &rSet, sal_False ),
@@ -192,13 +183,10 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
pExampleSet->Put(aItem);
}
-// --------------------------------------------------------------------------
-
SwLabDlg::~SwLabDlg()
{
delete pRecs;
}
-// --------------------------------------------------------------------------
void SwLabDlg::GetLabItem(SwLabItem &rItem)
{
@@ -221,8 +209,6 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
}
}
-// --------------------------------------------------------------------------
-
SwLabRec* SwLabDlg::GetRecord(const String &rRecName, sal_Bool bCont)
{
SwLabRec* pRec = NULL;
@@ -246,8 +232,6 @@ SwLabRec* SwLabDlg::GetRecord(const String &rRecName, sal_Bool bCont)
return(pRec);
}
-// --------------------------------------------------------------------------
-
Printer *SwLabDlg::GetPrt()
{
if (pPrtPage)
@@ -256,7 +240,6 @@ Printer *SwLabDlg::GetPrt()
return (NULL);
}
-// --------------------------------------------------------------------------
SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_LAB_LAB), rSet),
pNewDBMgr(NULL),
@@ -316,16 +299,10 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
aMakeBox.GetSelectHdl().Call( &aMakeBox );
}
-// --------------------------------------------------------------------------
-
-
-
SwLabPage::~SwLabPage()
{
}
-/* -----------------29.09.99 09:08-------------------
- --------------------------------------------------*/
void lcl_ChgYPos(Window& rWin, long nDiff)
{
Point aTempPos(rWin.GetPosPixel());
@@ -377,9 +354,6 @@ void SwLabPage::SetToBusinessCard()
aTypeBox.SetPosPixel(aLBPos);
};
-// --------------------------------------------------------------------------
-
-
IMPL_LINK( SwLabPage, AddrHdl, Button *, EMPTYARG )
{
String aWriting;
@@ -390,10 +364,6 @@ IMPL_LINK( SwLabPage, AddrHdl, Button *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox )
{
sActDBName = aDatabaseLB.GetSelectEntry();
@@ -406,8 +376,6 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox )
return 0;
}
-
-
IMPL_LINK( SwLabPage, FieldHdl, Button *, EMPTYARG )
{
String aStr ( '<' );
@@ -426,10 +394,6 @@ IMPL_LINK( SwLabPage, FieldHdl, Button *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK_INLINE_START( SwLabPage, PageHdl, Button *, EMPTYARG )
{
aMakeBox.GetSelectHdl().Call( &aMakeBox );
@@ -437,10 +401,6 @@ IMPL_LINK_INLINE_START( SwLabPage, PageHdl, Button *, EMPTYARG )
}
IMPL_LINK_INLINE_END( SwLabPage, PageHdl, Button *, EMPTYARG )
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG )
{
WaitObject aWait( GetParent() );
@@ -495,10 +455,6 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK_INLINE_START( SwLabPage, TypeHdl, ListBox *, EMPTYARG )
{
DisplayFormat();
@@ -507,10 +463,6 @@ IMPL_LINK_INLINE_START( SwLabPage, TypeHdl, ListBox *, EMPTYARG )
}
IMPL_LINK_INLINE_END( SwLabPage, TypeHdl, ListBox *, EMPTYARG )
-// --------------------------------------------------------------------------
-
-
-
void SwLabPage::DisplayFormat()
{
MetricField aField(this, WinBits(0));
@@ -542,8 +494,6 @@ void SwLabPage::DisplayFormat()
aFormatInfo.SetText(aText);
}
-// --------------------------------------------------------------------------
-
SwLabRec* SwLabPage::GetSelectedEntryPos()
{
String sSelEntry(aTypeBox.GetSelectEntry());
@@ -551,10 +501,6 @@ SwLabRec* SwLabPage::GetSelectedEntryPos()
return GetParent()->GetRecord(sSelEntry, aContButton.IsChecked());
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabPage::InitDatabaseBox()
{
if( GetNewDBMgr() )
@@ -577,18 +523,16 @@ void SwLabPage::InitDatabaseBox()
}
}
-// --------------------------------------------------------------------------
SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwLabPage(pParent, rSet);
}
-// --------------------------------------------------------------------------
void SwLabPage::ActivatePage(const SfxItemSet& rSet)
{
Reset( rSet );
}
-// --------------------------------------------------------------------------
+
int SwLabPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
@@ -597,10 +541,6 @@ int SwLabPage::DeactivatePage(SfxItemSet* _pSet)
return sal_True;
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabPage::FillItem(SwLabItem& rItem)
{
rItem.bAddr = aAddrBox.IsChecked();
@@ -617,10 +557,6 @@ void SwLabPage::FillItem(SwLabItem& rItem)
rItem.aLstType = aTypeBox.GetSelectEntry();
}
-// --------------------------------------------------------------------------
-
-
-
sal_Bool SwLabPage::FillItemSet(SfxItemSet& rSet)
{
FillItem( aItem );
@@ -629,8 +565,6 @@ sal_Bool SwLabPage::FillItemSet(SfxItemSet& rSet)
return sal_True;
}
-// --------------------------------------------------------------------------
-
void SwLabPage::Reset(const SfxItemSet& rSet)
{
aItem = (const SwLabItem&) rSet.Get(FN_LABEL);
@@ -675,10 +609,6 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
aSheetButton.Check();
}
-/*-- 08.07.99 14:00:02---------------------------------------------------
-
- -----------------------------------------------------------------------*/
-//-----------------------------------------------------------------------------
void SwVisitingCardPage::ClearUserData()
{
SvLBoxEntry* pEntry = aAutoTextLB.First();
@@ -689,8 +619,6 @@ void SwVisitingCardPage::ClearUserData()
}
}
-//-----------------------------------------------------------------------------
-
void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
const rtl::OUString* pNames, const rtl::OUString* pValues )
{
@@ -701,8 +629,6 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
}
}
-//-----------------------------------------------------------------------------
-
SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_VISITING_CARDS), rSet),
aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )),
@@ -730,9 +656,7 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet)
aAutoTextGroupLB.Show();
InitFrameControl();
}
-/*-- 08.07.99 14:00:03---------------------------------------------------
- -----------------------------------------------------------------------*/
SwVisitingCardPage::~SwVisitingCardPage()
{
for(sal_uInt16 i = 0; i < aAutoTextGroupLB.GetEntryCount(); i++)
@@ -742,33 +666,25 @@ SwVisitingCardPage::~SwVisitingCardPage()
ClearUserData();
delete pExampleFrame;
}
-/*-- 08.07.99 14:00:03---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwVisitingCardPage(pParent, rSet);
}
-/*-- 08.07.99 14:00:03---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet)
{
Reset( rSet );
UpdateFields();
}
-/*-- 08.07.99 14:00:04---------------------------------------------------
- -----------------------------------------------------------------------*/
int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
FillItemSet(*_pSet);
return LEAVE_PAGE;
}
-/*-- 08.07.99 14:00:04---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
{
String* pGroup = (String*)aAutoTextGroupLB.GetEntryData(
@@ -783,9 +699,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet)
rSet.Put(aLabItem);
return sal_True;
}
-/*-- 08.07.99 14:00:05---------------------------------------------------
- -----------------------------------------------------------------------*/
void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
{
SvLBoxEntry* pEntry = rAutoTextLB.First();
@@ -800,7 +714,7 @@ void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
pEntry = rAutoTextLB.Next(pEntry);
}
}
-//-----------------------------------------------------------------------------
+
sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
{
SvLBoxEntry* pEntry = rAutoTextLB.First();
@@ -816,7 +730,6 @@ sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName)
return sal_False;
}
-//-----------------------------------------------------------------------------
void SwVisitingCardPage::Reset(const SfxItemSet& rSet)
{
aLabItem = (const SwLabItem&) rSet.Get(FN_LABEL);
@@ -862,9 +775,6 @@ void SwVisitingCardPage::Reset(const SfxItemSet& rSet)
}
}
-/* -----------------29.09.99 08:55-------------------
-
- --------------------------------------------------*/
SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_PRIVATE_DATA), rSet),
aDataFL (this, SW_RES( FL_DATA )),
@@ -903,38 +813,27 @@ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) :
SetExchangeSupport();
}
-/*-- 29.09.99 08:55:57---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SwPrivateDataPage::~SwPrivateDataPage()
{
}
-/*-- 29.09.99 08:55:57---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwPrivateDataPage(pParent, rSet);
}
-/*-- 29.09.99 08:55:57---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
{
Reset(rSet);
}
-/*-- 29.09.99 08:55:58---------------------------------------------------
- -----------------------------------------------------------------------*/
int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
FillItemSet(*_pSet);
return LEAVE_PAGE;
}
-/*-- 29.09.99 08:55:58---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
{
@@ -961,9 +860,7 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
rSet.Put(aItem);
return sal_True;
}
-/*-- 29.09.99 08:55:59---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
{
const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL);
@@ -986,9 +883,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
aHomePageED .SetText(aItem.aPrivWWW);
aMailED .SetText(aItem.aPrivMail);
}
-/* -----------------29.09.99 08:56-------------------
- --------------------------------------------------*/
SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet),
aDataFL (this, SW_RES( FL_DATA )),
@@ -1021,38 +916,28 @@ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet)
SetExchangeSupport();
}
-/*-- 29.09.99 08:56:06---------------------------------------------------
- -----------------------------------------------------------------------*/
SwBusinessDataPage::~SwBusinessDataPage()
{
}
-/*-- 29.09.99 08:56:06---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwBusinessDataPage(pParent, rSet);
}
-/*-- 29.09.99 08:56:06---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
{
Reset(rSet);
}
-/*-- 29.09.99 08:56:06---------------------------------------------------
- -----------------------------------------------------------------------*/
int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
FillItemSet(*_pSet);
return LEAVE_PAGE;
}
-/*-- 29.09.99 08:56:06---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
@@ -1075,9 +960,7 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
rSet.Put(aItem);
return sal_True;
}
-/*-- 29.09.99 08:56:07---------------------------------------------------
- -----------------------------------------------------------------------*/
void SwBusinessDataPage::Reset(const SfxItemSet& rSet)
{
const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL);
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 4cd165e..b3d7580 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -41,23 +41,16 @@ using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-/* -----------------------------15.01.01 11:17--------------------------------
-
- ---------------------------------------------------------------------------*/
SwLabelConfig::SwLabelConfig() :
ConfigItem(C2U("Office.Labels/Manufacturer"))
{
aNodeNames = GetNodeNames(OUString());
}
-/* -----------------------------06.09.00 16:50--------------------------------
- ---------------------------------------------------------------------------*/
SwLabelConfig::~SwLabelConfig()
{
}
-/* -----------------------------06.09.00 16:43--------------------------------
- ---------------------------------------------------------------------------*/
void SwLabelConfig::Commit()
{
// the config item is not writable yet
@@ -65,9 +58,6 @@ void SwLabelConfig::Commit()
void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
-/* -----------------------------15.01.01 11:42--------------------------------
-
- ---------------------------------------------------------------------------*/
Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix)
{
Sequence<OUString> aProperties(2);
@@ -79,7 +69,7 @@ Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix)
pProperties[ 1] += C2U("Measure");
return aProperties;
}
-//-----------------------------------------------------------------------------
+
SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufacturer)
{
SwLabRec* pNewRec = new SwLabRec;
@@ -124,7 +114,7 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur
}
return pNewRec;
}
-//-----------------------------------------------------------------------------
+
Sequence<PropertyValue> lcl_CreateProperties(
Sequence<OUString>& rPropNames, const SwLabRec& rRec)
{
@@ -158,7 +148,7 @@ Sequence<PropertyValue> lcl_CreateProperties(
}
return aRet;
}
-//-----------------------------------------------------------------------------
+
void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr)
{
OUString sManufacturer(wrapConfigurationElementName(rManufacturer));
@@ -176,9 +166,7 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr
rLabArr.C40_INSERT( SwLabRec, pNewRec, rLabArr.Count() );
}
}
-/* -----------------------------23.01.01 11:36--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
{
const OUString* pNode = aNodeNames.getConstArray();
@@ -215,9 +203,7 @@ sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::
}
return sal_False;
}
-/* -----------------------------23.01.01 11:36--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
{
const OUString* pLabels = rLabels.getConstArray();
@@ -226,7 +212,7 @@ sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
return sal_True;
return sal_False;
}
-//-----------------------------------------------------------------------------
+
void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
const rtl::OUString& rType, const SwLabRec& rRec)
{
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 6046773..a295ba4 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -56,9 +56,6 @@ using ::rtl::OUString;
#endif
#define SW_PROP_NAME_STR(nId) SwGetPropName((nId)).pName
-/* -----------------08.07.99 15:15-------------------
-
- --------------------------------------------------*/
void SwVisitingCardPage::InitFrameControl()
{
Link aLink(LINK(this, SwVisitingCardPage, FrameControlInitializedHdl));
@@ -126,9 +123,7 @@ void SwVisitingCardPage::InitFrameControl()
}
}
}
-/* -----------------01.10.99 13:19-------------------
- --------------------------------------------------*/
IMPL_LINK( SwVisitingCardPage, FrameControlInitializedHdl, void*, EMPTYARG )
{
SvLBoxEntry* pSel = aAutoTextLB.FirstSelected();
@@ -161,9 +156,7 @@ IMPL_LINK( SwVisitingCardPage, FrameControlInitializedHdl, void*, EMPTYARG )
}
return 0;
}
-/* -----------------22.07.99 11:06-------------------
- --------------------------------------------------*/
IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
{
if(_xAutoText.is())
@@ -190,9 +183,6 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
return 0;
}
-/* -----------------01.10.99 11:59-------------------
-
- --------------------------------------------------*/
void SwVisitingCardPage::UpdateFields()
{
uno::Reference< frame::XModel > xModel;
@@ -201,9 +191,7 @@ void SwVisitingCardPage::UpdateFields()
SwLabDlg::UpdateFieldInformation(xModel, aLabItem);
}
}
-/* -----------------01.10.99 15:16-------------------
- --------------------------------------------------*/
void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, const SwLabItem& rItem)
{
uno::Reference< text::XTextFieldsSupplier > xFlds(xModel, uno::UNO_QUERY);
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index feae56b..28cf25c 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -52,11 +52,8 @@ using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-// #define ------------------------------------------------------------------
-
#define ROUND(x) ((USHORT) ((x) + .5))
-// --------------------------------------------------------------------------
SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
Window((Window*) pParent, rResID),
@@ -106,11 +103,10 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
lOutHPix23 = (long)((float)lOutHPix * fx);
}
-// --------------------------------------------------------------------------
SwLabPreview::~SwLabPreview()
{
}
-// --------------------------------------------------------------------------
+
void SwLabPreview::Paint(const Rectangle &)
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -245,8 +241,6 @@ void SwLabPreview::Paint(const Rectangle &)
// Pfeil bzw. Intervall zeichnen --------------------------------------------
-
-
void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, BOOL bArrow)
{
DrawLine(rP1, rP2);
@@ -299,18 +293,12 @@ void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, BOOL bArrow)
}
}
-// --------------------------------------------------------------------------
-
void SwLabPreview::Update(const SwLabItem& rItem)
{
aItem = rItem;
Invalidate();
}
-// --------------------------------------------------------------------------
-
-
-
SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_LAB_FMT), rSet),
@@ -376,18 +364,11 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) :
aPreviewTimer.SetTimeoutHdl(LINK(this, SwLabFmtPage, PreviewHdl));
}
-// --------------------------------------------------------------------------
-
-
-
SwLabFmtPage::~SwLabFmtPage()
{
}
// Modify-Handler der MetricFields. Preview-Timer starten -------------------
-
-
-
IMPL_LINK_INLINE_START( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG )
{
bModified = TRUE;
@@ -397,9 +378,6 @@ IMPL_LINK_INLINE_START( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG )
IMPL_LINK_INLINE_END( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG )
// Preview invalidaten ------------------------------------------------------
-
-
-
IMPL_LINK_INLINE_START( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG )
{
aPreviewTimer.Stop();
@@ -412,9 +390,6 @@ IMPL_LINK_INLINE_START( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG )
IMPL_LINK_INLINE_END( SwLabFmtPage, PreviewHdl, Timer *, EMPTYARG )
// LoseFocus-Handler: Bei Aenderung sofort updaten --------------------------
-
-
-
IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
{
if (((Edit*) pControl)->IsModified())
@@ -424,8 +399,6 @@ IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
IMPL_LINK_INLINE_END( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
// Minima und Maxima fuer Fields festlegen ----------------------------------
-
-
void SwLabFmtPage::ChangeMinMax()
{
long lMax = 31748; // 56 cm
@@ -487,29 +460,17 @@ void SwLabFmtPage::ChangeMinMax()
aRowsField .Reformat();
}
-// --------------------------------------------------------------------------
-
-
-
SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwLabFmtPage(pParent, rSet);
}
-// ----------------------------------------------------------------------------
-
-
-
void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet)
{
SfxItemSet aSet(rSet);
Reset(aSet);
}
-// ----------------------------------------------------------------------------
-
-
-
int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
@@ -518,10 +479,6 @@ int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
return TRUE;
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabFmtPage::FillItem(SwLabItem& rItem)
{
if (bModified)
@@ -540,10 +497,6 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
}
}
-// --------------------------------------------------------------------------
-
-
-
BOOL SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
{
FillItem(aItem);
@@ -552,7 +505,6 @@ BOOL SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
return TRUE;
}
-// --------------------------------------------------------------------------
void SwLabFmtPage::Reset(const SfxItemSet& )
{
// Fields initialisieren
@@ -581,9 +533,6 @@ void SwLabFmtPage::Reset(const SfxItemSet& )
aTypeFI.SetText(aItem.aType);
PreviewHdl(0);
}
-/* -----------------------------22.01.01 15:11--------------------------------
-
- ---------------------------------------------------------------------------*/
IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG )
{
@@ -620,9 +569,7 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG )
delete pSaveDlg;
return 0;
}
-/* -----------------------------23.01.01 10:41--------------------------------
- ---------------------------------------------------------------------------*/
SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) :
ModalDialog(pParent, SW_RES(DLG_SAVE_LABEL)),
aOptionsFL(this,SW_RES(FL_OPTIONS )),
@@ -654,9 +601,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec) :
for(sal_Int32 i = 0; i < rMan.getLength(); i++)
aMakeCB.InsertEntry(pMan[i]);
}
-/* -----------------------------23.01.01 10:40--------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SwSaveLabelDlg, OkHdl, OKButton*, EMPTYARG)
{
SwLabelConfig& rCfg = pLabPage->GetParent()->GetLabelsConfig();
@@ -681,17 +626,13 @@ IMPL_LINK(SwSaveLabelDlg, OkHdl, OKButton*, EMPTYARG)
EndDialog(RET_OK);
return 0;
}
-/* -----------------------------23.01.01 11:22--------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SwSaveLabelDlg, ModifyHdl, Edit*, EMPTYARG)
{
aOKPB.Enable(aMakeCB.GetText().Len() && aTypeED.GetText().Len());
return 0;
}
-/* -----------------------------23.01.01 16:06--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SwSaveLabelDlg::GetLabel(SwLabItem& rItem)
{
if(bSuccess)
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index d70c04f..74da69c 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -45,8 +45,6 @@ using namespace utl;
using namespace rtl;
using namespace ::com::sun::star::uno;
-
-// ----------------------------------------------------------------------------
SwLabItem::SwLabItem() :
SfxPoolItem(FN_LABEL),
@@ -65,13 +63,12 @@ SwLabItem::SwLabItem() :
lHeight = 5669; // 10 cm
}
-// ----------------------------------------------------------------------------
SwLabItem::SwLabItem(const SwLabItem& rItem) :
SfxPoolItem(FN_LABEL)
{
*this = rItem;
}
-// ----------------------------------------------------------------------------
+
SwLabItem& SwLabItem::operator =(const SwLabItem& rItem)
{
bAddr = rItem.bAddr;
@@ -132,10 +129,6 @@ SwLabItem& SwLabItem::operator =(const SwLabItem& rItem)
return *this;
}
-// --------------------------------------------------------------------------
-
-
-
int SwLabItem::operator ==(const SfxPoolItem& rItem) const
{
const SwLabItem& rLab = (const SwLabItem&) rItem;
@@ -197,15 +190,11 @@ int SwLabItem::operator ==(const SfxPoolItem& rItem) const
sGlossaryBlockName == rLab.sGlossaryBlockName;
}
-// --------------------------------------------------------------------------
SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const
{
return new SwLabItem(*this);
}
-/* -----------------------------25.09.00 16:25--------------------------------
-
- ---------------------------------------------------------------------------*/
Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
{
static const char* aLabelPropNames[] =
@@ -277,9 +266,7 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
pNames[nIndex++] = OUString::createFromAscii(aBusinessPropNames[nBusiness]);
return aNames;
}
-/* ----------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
ConfigItem(bLabel ? C2U("Office.Writer/Label") : C2U("Office.Writer/BusinessCard")),
bIsLabel(bLabel)
@@ -402,9 +389,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
SetModified();
}
}
-/* -----------------------------25.09.00 16:26--------------------------------
- ---------------------------------------------------------------------------*/
void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
void SwLabCfgItem::Commit()
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 7288ca5..68ee9eb 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -45,11 +45,6 @@
#include <cmdid.h>
#include <labprt.hrc>
-
-// --------------------------------------------------------------------------
-
-
-
SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_LAB_PRT), rSet),
@@ -89,20 +84,12 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
}
}
-// --------------------------------------------------------------------------
-
-
-
SwLabPrtPage::~SwLabPrtPage()
{
if (pPrinter)
delete pPrinter;
}
-// --------------------------------------------------------------------------
-
-
-
IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
{
if (pButton == &aPrtSetup)
@@ -135,28 +122,16 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
return 0;
}
-// --------------------------------------------------------------------------
-
-
-
SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwLabPrtPage( pParent, rSet );
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
{
Reset(rSet);
}
-// --------------------------------------------------------------------------
-
-
-
int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
{
if ( _pSet )
@@ -165,10 +140,6 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
return TRUE;
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabPrtPage::FillItem(SwLabItem& rItem)
{
rItem.bPage = aPageButton.IsChecked();
@@ -177,10 +148,6 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem)
rItem.bSynchron = aSynchronCB.IsChecked() && aSynchronCB.IsEnabled();
}
-// --------------------------------------------------------------------------
-
-
-
BOOL SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem;
@@ -191,10 +158,6 @@ BOOL SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
return TRUE;
}
-// --------------------------------------------------------------------------
-
-
-
void SwLabPrtPage::Reset(const SfxItemSet& )
{
SwLabItem aItem;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index a80438a..d99d4cd 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -90,19 +90,16 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::ui::dialogs;
-
-/* -----------------------------05.06.01 13:54--------------------------------
-
- ---------------------------------------------------------------------------*/
struct SwMailMergeDlg_Impl
{
uno::Reference<runtime::XFormController> xFController;
uno::Reference<XSelectionChangeListener> xChgLstnr;
uno::Reference<XSelectionSupplier> xSelSupp;
};
-/* -----------------------------05.06.01 13:47--------------------------------
+
+/* --------------------------------------------------------------------------
helper classes
- ---------------------------------------------------------------------------*/
+----------------------------------------------------------------------------*/
class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper1
<
view::XSelectionChangeListener
@@ -116,20 +113,14 @@ public:
virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException);
virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException);
};
-/* -----------------------------05.06.01 13:51--------------------------------
- ---------------------------------------------------------------------------*/
SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) :
rParent(rParentDlg)
{}
-/* -----------------------------05.06.01 14:06--------------------------------
- ---------------------------------------------------------------------------*/
SwXSelChgLstnr_Impl::~SwXSelChgLstnr_Impl()
{}
-/* -----------------------------05.06.01 14:06--------------------------------
- ---------------------------------------------------------------------------*/
void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (RuntimeException)
{
//call the parent to enable selection mode
@@ -147,13 +138,12 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (Runtime
rParent.m_aSelection.realloc(0);
}
}
-/* -----------------------------05.06.01 14:06--------------------------------
- ---------------------------------------------------------------------------*/
void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeException)
{
DBG_ERROR("disposing");
}
+
/*------------------------------------------------------------------------
Beschreibung:
------------------------------------------------------------------------*/
@@ -511,9 +501,7 @@ SwMailMergeDlg::~SwMailMergeDlg()
void SwMailMergeDlg::Apply()
{
}
-/*-- 01.06.2007 13:06:50---------------------------------------------------
- -----------------------------------------------------------------------*/
void lcl_MoveControlY( Window* ppW, long nDiffSize )
{
Point aPos( ppW->GetPosPixel());
@@ -654,9 +642,7 @@ IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn )
return 0;
}
-/*-- 01.06.2007 12:36:43---------------------------------------------------
- -----------------------------------------------------------------------*/
IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*, pBtn )
{
bool bIndividual = pBtn == &aSaveIndividualRB;
@@ -882,9 +868,7 @@ IMPL_LINK( SwMailMergeDlg, AttachFileHdl, PushButton *, EMPTYARG )
}
return 0;
}
-/* -----------------------------05.06.01 14:56--------------------------------
- ---------------------------------------------------------------------------*/
uno::Reference<XResultSet> SwMailMergeDlg::GetResultSet() const
{
uno::Reference< XResultSet > xResSetClone;
@@ -897,9 +881,7 @@ uno::Reference<XResultSet> SwMailMergeDlg::GetResultSet() const
}
return xResSetClone;
}
-/*-- 27.11.2002 12:27:33---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) :
ModalDialog(pParent, SW_RES(DLG_MERGE_CREATE)),
aCreateFromFL( this, SW_RES( FL_CREATEFROM )),
@@ -911,15 +893,11 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) :
{
FreeResource();
}
-/*-- 27.11.2002 12:27:33---------------------------------------------------
- -----------------------------------------------------------------------*/
SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg()
{
}
-/* -----------------04.02.2003 13:45-----------------
- *
- * --------------------------------------------------*/
+
SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent) :
ModalDialog(pParent, SW_RES(DLG_MERGE_FIELD_CONNECTIONS)),
aConnectionsFL( this, SW_RES( FL_CONNECTIONS )),
@@ -932,9 +910,7 @@ SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent)
{
FreeResource();
}
-/* -----------------04.02.2003 13:45-----------------
- *
- * --------------------------------------------------*/
+
SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg()
{
}
More information about the Libreoffice-commits
mailing list