[Libreoffice-commits] .: sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Tue Oct 12 13:38:54 PDT 2010
sw/source/ui/frmdlg/colex.cxx | 26 ------
sw/source/ui/frmdlg/colmgr.cxx | 43 +---------
sw/source/ui/frmdlg/column.cxx | 115 +---------------------------
sw/source/ui/frmdlg/cption.cxx | 12 ---
sw/source/ui/frmdlg/frmdlg.cxx | 8 --
sw/source/ui/frmdlg/frmmgr.cxx | 12 ---
sw/source/ui/frmdlg/frmpage.cxx | 160 ----------------------------------------
sw/source/ui/frmdlg/wrap.cxx | 59 --------------
8 files changed, 14 insertions(+), 421 deletions(-)
New commits:
commit 8bc0e77f23df2d9b19305d4f0a6f5ab8044ae4d3
Author: Prashant Shah <pshah.mumbai at gmail.com>
Date: Tue Oct 12 21:38:17 2010 +0100
cleanup bogus comments
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 9054ca3..ee23672 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -204,10 +204,6 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
Invalidate();
}
-/*-----------------------------------------------------------------------
- Beschreibung:
- -----------------------------------------------------------------------*/
-
void SwColExample::DrawPage( const Point& rOrg,
const BOOL bSecond,
@@ -307,11 +303,6 @@ void SwColExample::DrawPage( const Point& rOrg,
}
}
-/*-----------------25.10.96 09.15-------------------
-
---------------------------------------------------*/
-
-
SwColumnOnlyExample::SwColumnOnlyExample( Window* pParent, const ResId& rResId) :
Window(pParent, rResId),
m_aFrmSize(1,1)
@@ -336,11 +327,6 @@ SwColumnOnlyExample::SwColumnOnlyExample( Window* pParent, const ResId& rResId)
SetMapMode( aMapMode );
}
-/*-----------------25.10.96 09.16-------------------
-
---------------------------------------------------*/
-
-
void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -429,11 +415,6 @@ void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ )
}
}
-/*-----------------25.10.96 12.05-------------------
-
---------------------------------------------------*/
-
-
void SwColumnOnlyExample::SetColumns(const SwFmtCol& rCol)
{
m_aCols = rCol;
@@ -477,16 +458,12 @@ void SwColumnOnlyExample::SetColumns(const SwFmtCol& rCol)
}
}
}
-/* -----------------------------08.02.2002 11:44------------------------------
- ---------------------------------------------------------------------------*/
SwPageGridExample::~SwPageGridExample()
{
delete pGridItem;
}
-/* -----------------------------08.02.2002 11:48------------------------------
- ---------------------------------------------------------------------------*/
#define MAX_ROWS 10
#define MAX_LINES 15
void SwPageGridExample::DrawPage( const Point& rOrg,
@@ -589,9 +566,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg,
}
}
}
-/* -----------------------------08.02.2002 11:48------------------------------
- ---------------------------------------------------------------------------*/
void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
{
DELETEZ(pGridItem);
@@ -607,4 +582,3 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
}
SwPageExample::UpdateExample(rSet);
}
-
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx
index 5346a1f..7895056 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/ui/frmdlg/colmgr.cxx
@@ -42,9 +42,6 @@
/*------------------------------------------------------------------------
Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
------------------------------------------------------------------------*/
-
-
-
void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
{
const USHORT nCount = rCol.GetColumns().Count();
@@ -56,14 +53,10 @@ void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
rCol.SetWishWidth(nWidth);
}
-
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
Beschreibung: Setzen Spaltenanzahl und Gutterwidth
------------------------------------------------------------------------*/
-
-
-
void SwColMgr::SetCount(USHORT nCount, USHORT nGutterWidth)
{
aFmtCol.Init(nCount, nGutterWidth, nWidth);
@@ -71,8 +64,6 @@ void SwColMgr::SetCount(USHORT nCount, USHORT nGutterWidth)
aFmtCol.SetGutterWidth(nGutterWidth, nWidth);
}
-
-
USHORT SwColMgr::GetGutterWidth( USHORT nPos ) const
{
USHORT nRet;
@@ -87,11 +78,6 @@ USHORT SwColMgr::GetGutterWidth( USHORT nPos ) const
return nRet;
}
-/*-----------------22.10.96 14.28-------------------
-
---------------------------------------------------*/
-
-
void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos )
{
if(nPos == USHRT_MAX)
@@ -109,35 +95,26 @@ void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos )
/*------------------------------------------------------------------------
Beschreibung: Hoehe Trennlinie
------------------------------------------------------------------------*/
-
-
-
short SwColMgr::GetLineHeightPercent() const
{
return (short)aFmtCol.GetLineHeight();
}
-
-
void SwColMgr::SetLineHeightPercent(short nPercent)
{
ASSERT(nPercent <= 100, LineHeight darf nur bis 100 % gross sein);
aFmtCol.SetLineHeight((BYTE)nPercent);
}
+
/*------------------------------------------------------------------------
Beschreibung: Spaltenbreite
------------------------------------------------------------------------*/
-
-
-
USHORT SwColMgr::GetColWidth(USHORT nIdx) const
{
ASSERT(nIdx < GetCount(), Spaltenarray ueberindiziert.);
return aFmtCol.CalcPrtColWidth(nIdx, nWidth);
}
-
-
void SwColMgr::SetColWidth(USHORT nIdx, USHORT nWd)
{
ASSERT(nIdx < GetCount(), Spaltenarray ueberindiziert.);
@@ -148,9 +125,6 @@ void SwColMgr::SetColWidth(USHORT nIdx, USHORT nWd)
/*--------------------------------------------------------------------
Beschreibung: Groesse neu setzen
--------------------------------------------------------------------*/
-
-
-
void SwColMgr::SetActualWidth(USHORT nW)
{
nWidth = nW;
@@ -160,9 +134,6 @@ void SwColMgr::SetActualWidth(USHORT nW)
/*--------------------------------------------------------------------
Beschreibung: ctor
--------------------------------------------------------------------*/
-
-
-
SwColMgr::SwColMgr(const SfxItemSet& rSet, USHORT nActWidth) :
aFmtCol((const SwFmtCol&)rSet.Get(RES_COL)),
nWidth(nActWidth)
@@ -179,13 +150,7 @@ SwColMgr::SwColMgr(const SfxItemSet& rSet, USHORT nActWidth) :
::FitToActualSize(aFmtCol, nWidth);
}
-
-
-
-SwColMgr::~SwColMgr() {}
-
-
-
-
-
+SwColMgr::~SwColMgr()
+{
+}
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 370b05f..94ec734 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -77,7 +77,6 @@ SV_IMPL_PTRARR( SwColumns, SwColumnPtr )
/*--------------------------------------------------------------------
Beschreibung: Statische Daten
--------------------------------------------------------------------*/
-
static const USHORT __FAR_DATA nLines[] = {
DEF_LINE_WIDTH_0,
DEF_LINE_WIDTH_1,
@@ -97,10 +96,6 @@ inline BOOL IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect )
return bRet;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
SfxModalDialog(pParent, SW_RES(DLG_COLUMN)),
aOK(this, SW_RES(PB_OK)),
@@ -232,10 +227,6 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
pTabPage->ActivateColumnControl();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwColumnDlg::~SwColumnDlg()
{
delete pTabPage;
@@ -244,9 +235,6 @@ SwColumnDlg::~SwColumnDlg()
delete pSelectionSet;
}
-/* -----------------26.05.99 11:40-------------------
- *
- * --------------------------------------------------*/
IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
{
SfxItemSet* pSet = 0;
@@ -309,9 +297,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
pTabPage->Reset(*pSet);
return 0;
}
-/* -----------------26.05.99 12:32-------------------
- *
- * --------------------------------------------------*/
+
IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
{
//aktuelle Selektion auswerten
@@ -393,10 +379,6 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
#if OSL_DEBUG_LEVEL < 2
inline
#endif
@@ -413,11 +395,8 @@ static USHORT __FAR_DATA aPageRg[] = {
0
};
-
DBG_NAME(columnhdl)
-
-
USHORT lcl_LineWidthToPos(ULONG nWidth)
{
const USHORT nUShortWidth = (USHORT)nWidth;
@@ -427,8 +406,6 @@ USHORT lcl_LineWidthToPos(ULONG nWidth)
return 0;
}
-
-
void SwColumnPage::ResetColWidth()
{
if( nCols )
@@ -445,9 +422,6 @@ void SwColumnPage::ResetColWidth()
/*--------------------------------------------------------------------
Beschreibung: Jetzt als TabPage
--------------------------------------------------------------------*/
-
-
-
SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, SW_RES(TP_COLUMN), rSet),
@@ -560,18 +534,11 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
aLineTypeDLB.InsertEntry( 100 * nLines[ i ] );
}
-
-
SwColumnPage::~SwColumnPage()
{
delete pColMgr;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwColumnPage::SetPageWidth(long nPageWidth)
{
long nNewMaxWidth = static_cast< long >(aEd1.NormalizePercent(nPageWidth));
@@ -583,12 +550,6 @@ void SwColumnPage::SetPageWidth(long nPageWidth)
aEd3.SetMax(nNewMaxWidth, FUNIT_TWIP);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwColumnPage::Reset(const SfxItemSet &rSet)
{
USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
@@ -647,9 +608,6 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: TabPage erzeugen
--------------------------------------------------------------------*/
-
-
-
SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
{
return new SwColumnPage(pParent, rSet);
@@ -658,9 +616,6 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
-
-
-
BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
{
if(aCLNrEdt.HasChildPathFocus())
@@ -693,9 +648,6 @@ BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: ColumnManager updaten
--------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
{
long nGutterWidth = pColMgr->GetGutterWidth();
@@ -786,9 +738,6 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
/*------------------------------------------------------------------------
Beschreibung: Initialisierung
------------------------------------------------------------------------*/
-
-
-
void SwColumnPage::Init()
{
aCLNrEdt.SetValue(nCols);
@@ -857,9 +806,6 @@ void SwColumnPage::Init()
Andernfalls werden die Edits jeweils fuer die entsprechenden
Spaltenzahl enabled; eine Spalte kann nicht bearbeitet werden.
------------------------------------------------------------------------*/
-
-
-
void SwColumnPage::UpdateCols()
{
BOOL bEnableBtns= FALSE;
@@ -929,7 +875,6 @@ void SwColumnPage::SetLabels( USHORT nVis )
Breiteneinstellungen des Benutzers; alle Spalten sind
gleich breit.
------------------------------------------------------------------------*/
-
IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
{
nCols = (USHORT)aCLNrEdt.GetValue();
@@ -965,9 +910,6 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
eine Aenderung der Spaltenzahl kehrt wieder zu diesem
Default zurueck.
------------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld )
{
long nActValue = static_cast< long >(pFld->DenormalizePercent(pFld->GetValue(FUNIT_TWIP)));
@@ -1039,26 +981,18 @@ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld )
return 0;
}
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
{
pModifiedField = pField;
Timeout(0);
return 0;
}
+
/*------------------------------------------------------------------------
Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
Ist die Box gecheckt, koennen keine expliziten Werte
fuer die Spaltenbreite eingegeben werden.
------------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
{
long nDist = static_cast< long >(aDistEd1.DenormalizePercent(aDistEd1.GetValue(FUNIT_TWIP)));
@@ -1079,7 +1013,6 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
/*------------------------------------------------------------------------
Beschreibung: Raufscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
-
IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
{
if( nFirstVis )
@@ -1090,10 +1023,10 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
}
return 0;
}
+
/*------------------------------------------------------------------------
Beschreibung: Runterscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
-
IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
{
if( nFirstVis + nVisCols < nCols )
@@ -1104,12 +1037,12 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
}
return 0;
}
+
/*------------------------------------------------------------------------
Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
* Timer- Handler; angetriggert durch eine Aenderung der
Spaltenbreite oder des Spaltenabstandes.
------------------------------------------------------------------------*/
-
IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
{
DBG_PROFSTART(columnhdl) ;
@@ -1155,12 +1088,10 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
DBG_PROFSTOP(columnhdl) ;
return 0;
}
+
/*------------------------------------------------------------------------
Beschreibung: Aktualisierung der Anzeige
------------------------------------------------------------------------*/
-
-
-
void SwColumnPage::Update()
{
aBalanceColsCB.Enable(nCols > 1);
@@ -1194,9 +1125,6 @@ void SwColumnPage::Update()
/*--------------------------------------------------------------------
Beschreibung: Update Bsp
--------------------------------------------------------------------*/
-
-
-
void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
{
if(!bFrm)
@@ -1271,12 +1199,6 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
Update();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
int SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
@@ -1285,19 +1207,11 @@ int SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
return TRUE;
}
-
-
USHORT* SwColumnPage::GetRanges()
{
return aPageRg;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
{
USHORT nItem = pVS->GetSelectItemId();
@@ -1334,18 +1248,11 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
return 0;
}
-/*-----------------25.10.96 11.41-------------------
-
---------------------------------------------------*/
-
-
void SwColumnPage::SetFrmMode(BOOL bMod)
{
bFrm = bMod;
}
-/* -----------------------------2002/06/19 13:08------------------------------
- ---------------------------------------------------------------------------*/
void SwColumnPage::SetInSection(BOOL bSet)
{
if(!SW_MOD()->GetCTLOptions().IsCTLFontEnabled())
@@ -1372,11 +1279,6 @@ void SwColumnPage::SetInSection(BOOL bSet)
}
}
-/*-----------------07.03.97 08.33-------------------
-
---------------------------------------------------*/
-
-
void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
OutputDevice* pDev = rUDEvt.GetDevice();
@@ -1442,16 +1344,10 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetLineColor(aLineColor);
}
-/*-----------------07.03.97 08.48-------------------
-
---------------------------------------------------*/
-
ColumnValueSet::~ColumnValueSet()
{
}
-/* -----------------------------02.04.2002 16:01------------------------------
- ---------------------------------------------------------------------------*/
void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -1461,4 +1357,3 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt )
}
ValueSet::DataChanged( rDCEvt );
}
-
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 6f05456..189c65f 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -340,8 +340,6 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, SelectHdl, ListBox *, EMPTYARG )
}
IMPL_LINK_INLINE_END( SwCaptionDialog, SelectHdl, ListBox *, EMPTYARG )
-
-
IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG )
{
SwWrtShell &rSh = rView.GetWrtShell();
@@ -477,8 +475,6 @@ SwCaptionDialog::~SwCaptionDialog()
{
delete pMgr;
}
-/* */
-
SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
const String& rSeqFldType )
@@ -560,9 +556,6 @@ void SwSequenceOptionDialog::Apply()
rSh.UpdateExpFlds();
}
-/*-- 24.08.2004 16:13:53---------------------------------------------------
-
- -----------------------------------------------------------------------*/
String SwSequenceOptionDialog::GetCharacterStyle() const
{
String sRet;
@@ -571,9 +564,6 @@ String SwSequenceOptionDialog::GetCharacterStyle() const
return sRet;
}
-/*-- 24.08.2004 16:14:00---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void SwSequenceOptionDialog::SetCharacterStyle(const String& rStyle)
{
aLbCharStyle.SelectEntryPos(0);
@@ -607,6 +597,7 @@ long SwCaptionDialog::CategoryBox::PreNotify( NotifyEvent& rNEvt )
nHandled = ComboBox::PreNotify( rNEvt );
return nHandled;
}
+
/*-- 01.11.2007 10:45:51---------------------------------------------------
//#i61007# order of captions
-----------------------------------------------------------------------*/
@@ -616,6 +607,7 @@ void lcl_MoveH( Window& rWin, sal_Int32 nMove )
aPos.Y() += nMove;
rWin.SetPosPixel(aPos);
}
+
void SwCaptionDialog::ApplyCaptionOrder()
{
//have the settings changed?
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 1f422cf..f782772 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -57,7 +57,6 @@
/*--------------------------------------------------------------------
Beschreibung: Der Traeger des Dialoges
--------------------------------------------------------------------*/
-
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
Window* pParent,
const SfxItemSet& rCoreSet,
@@ -135,17 +134,10 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
SetCurPageId(nDefPage);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwFrmDlg::~SwFrmDlg()
{
}
-
-
-
void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index f5cd076..65c2fd1 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -65,7 +65,6 @@ static USHORT __FAR_DATA aFrmMgrRange[] = {
/*--------------------------------------------------------------------
Beschreibung: Rahmen-Attribute ueber Shell ermitteln
--------------------------------------------------------------------*/
-
SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
pOwnSh( pSh ),
@@ -111,11 +110,9 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, const SfxItemSet &
}
}
-
/*--------------------------------------------------------------------
Beschreibung: Initialisieren
--------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::UpdateAttrMgr()
{
if ( !bNewFrm && pOwnSh->IsFrmSelected() )
@@ -142,7 +139,6 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
/*--------------------------------------------------------------------
Beschreibung: Bestehenden Fly-Frame aendern
--------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::UpdateFlyFrm()
{
ASSERT( pOwnSh->IsFrmSelected(),
@@ -176,7 +172,6 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
/*--------------------------------------------------------------------
Beschreibung: Rahmen einfuegen
--------------------------------------------------------------------*/
-
BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
{
pOwnSh->StartAllAction();
@@ -200,7 +195,6 @@ BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
Nicht erlaubte Werte des Aufzaehlungstypes werden
korrigiert.
------------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
const Point &rPos,
const Size &rSize,
@@ -225,7 +219,6 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
/*--------------------------------------------------------------------
Beschreibung: Anker setzen
--------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
{
USHORT nPhyPageNum, nVirtPageNum;
@@ -247,15 +240,14 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
/*------------------------------------------------------------------------
Beschreibung: Setzen des Attributs fuer Spalten
------------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
{
aSet.Put( rCol );
}
+
/*--------------------------------------------------------------------
Beschreibung: Absolute Position setzen
--------------------------------------------------------------------*/
-
void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
{
bAbsPos = TRUE;
@@ -511,7 +503,6 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
/*--------------------------------------------------------------------
Beschreibung: Korrektur fuer Umrandung
--------------------------------------------------------------------*/
-
SwTwips SwFlyFrmAttrMgr::CalcTopSpace()
{
const SvxShadowItem& rShadow = GetShadow();
@@ -540,7 +531,6 @@ SwTwips SwFlyFrmAttrMgr::CalcRightSpace()
return rShadow.CalcShadowSpace(SHADOW_RIGHT) + rBox.CalcLineSpace(BOX_LINE_RIGHT);
}
-
/*--------------------------------------------------------------------
Beschreibung: Attribut aus dem Set loeschen
--------------------------------------------------------------------*/
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 8d37155..afa79a5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -180,7 +180,6 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] =
/*--------------------------------------------------------------------
Beschreibung: Seite verankert
--------------------------------------------------------------------*/
-
#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
@@ -215,7 +214,6 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Rahmen verankert
--------------------------------------------------------------------*/
-
#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
@@ -255,7 +253,6 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Absatz verankert
--------------------------------------------------------------------*/
-
#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT)
@@ -302,7 +299,6 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Relativ zum Zeichen verankert
--------------------------------------------------------------------*/
-
#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT|LB_REL_CHAR)
@@ -355,7 +351,6 @@ static FrmMap __FAR_DATA aVCharMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_VERT_LINE}
};
-
static FrmMap __FAR_DATA aVCharHtmlMap[] =
{
{SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR}
@@ -366,10 +361,10 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] =
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_CHAR},
{SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR}
};
+
/*--------------------------------------------------------------------
Beschreibung: Als Zeichen verankert
--------------------------------------------------------------------*/
-
static FrmMap __FAR_DATA aVAsCharMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE},
@@ -414,10 +409,6 @@ static USHORT __FAR_DATA aAddPgRg[] = {
0
};
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
size_t lcl_GetFrmMapCount( const FrmMap* pMap)
{
if ( pMap )
@@ -468,9 +459,7 @@ size_t lcl_GetFrmMapCount( const FrmMap* pMap)
}
return 0;
}
-/* -----------------------------08.08.2002 14:45------------------------------
- ---------------------------------------------------------------------------*/
void lcl_InsertVectors(ListBox& rBox,
const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis,
const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain)
@@ -497,9 +486,6 @@ void lcl_InsertVectors(ListBox& rBox,
::InsertStringSorted(*aIt, rBox, nStartPos );
}
-/* -----------------------------20.08.2002 16:12------------------------------
-
- ---------------------------------------------------------------------------*/
SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, BOOL bVertical, BOOL bRTL)
{
//special handling of STR_FROMLEFT
@@ -599,7 +585,6 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
/*--------------------------------------------------------------------
Beschreibung: StandardRahmenTabPage
--------------------------------------------------------------------*/
-
namespace
{
void HandleAutoCB( BOOL _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto )
@@ -609,7 +594,6 @@ namespace
}
}
-
SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet),
@@ -722,7 +706,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
/*--------------------------------------------------------------------
Beschreibung: Dtor
--------------------------------------------------------------------*/
-
SwFrmPage::~SwFrmPage()
{
}
@@ -947,11 +930,9 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
}
-
/*--------------------------------------------------------------------
Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
-
BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
{
BOOL bRet = FALSE;
@@ -1147,7 +1128,6 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Horizontale und vertikale Pos initialisieren
--------------------------------------------------------------------*/
-
void SwFrmPage::InitPos(RndStdIds eId,
USHORT nH,
USHORT nHRel,
@@ -1285,10 +1265,6 @@ void SwFrmPage::InitPos(RndStdIds eId,
UpdateExample();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
const USHORT _nAlign,
const USHORT _nRel,
@@ -1342,9 +1318,6 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
return GetMapPos(_pMap, _rLB);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
const USHORT _nLBSelPos,
const USHORT _nAlign,
@@ -1496,10 +1469,6 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
return nLBRelations;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
short SwFrmPage::GetRelation(FrmMap * /*pMap*/, ListBox &rRelationLB)
{
short nRel = 0;
@@ -1514,10 +1483,6 @@ short SwFrmPage::GetRelation(FrmMap * /*pMap*/, ListBox &rRelationLB)
return nRel;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
short SwFrmPage::GetAlignment(FrmMap *pMap, USHORT nMapPos,
ListBox &/*rAlignLB*/, ListBox &rRelationLB)
{
@@ -1554,10 +1519,6 @@ short SwFrmPage::GetAlignment(FrmMap *pMap, USHORT nMapPos,
return nAlign;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
USHORT SwFrmPage::GetMapPos( const FrmMap *pMap, ListBox &rAlignLB )
{
USHORT nMapPos = 0;
@@ -1591,10 +1552,6 @@ USHORT SwFrmPage::GetMapPos( const FrmMap *pMap, ListBox &rAlignLB )
return nMapPos;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
RndStdIds SwFrmPage::GetAnchor()
{
RndStdIds nRet = FLY_AT_PAGE;
@@ -1620,7 +1577,6 @@ RndStdIds SwFrmPage::GetAnchor()
/*--------------------------------------------------------------------
Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
-
void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
{
bNoModifyHdl = TRUE;
@@ -1657,7 +1613,6 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet)
/*--------------------------------------------------------------------
Beschreibung: Links/rechts mit Innen/aussen tauschen
--------------------------------------------------------------------*/
-
IMPL_LINK( SwFrmPage, MirrorHdl, CheckBox *, EMPTYARG )
{
RndStdIds eId = GetAnchor();
@@ -1666,10 +1621,6 @@ IMPL_LINK( SwFrmPage, MirrorHdl, CheckBox *, EMPTYARG )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
{
if (pBtn == &aRelWidthCB)
@@ -1699,7 +1650,6 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
/*--------------------------------------------------------------------
Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
-
IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
{
if (bNoModifyHdl)
@@ -1853,10 +1803,6 @@ IMPL_LINK( SwFrmPage, AnchorTypeHdl, RadioButton *, EMPTYARG )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
{
BOOL bHori = pLB == &aHorizontalDLB;
@@ -1964,7 +1910,6 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
/*--------------------------------------------------------------------
Beschreibung: Horizontale Pos
--------------------------------------------------------------------*/
-
IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
{
BOOL bHori = pLB == &aHoriRelationLB;
@@ -1997,7 +1942,6 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
return 0;
}
-
IMPL_LINK_INLINE_START( SwFrmPage, RealSizeHdl, Button *, EMPTYARG )
{
aWidthED.SetUserValue( aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP);
@@ -2008,7 +1952,6 @@ IMPL_LINK_INLINE_START( SwFrmPage, RealSizeHdl, Button *, EMPTYARG )
}
IMPL_LINK_INLINE_END( SwFrmPage, RealSizeHdl, Button *, EMPTYARG )
-
IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
@@ -2045,10 +1988,6 @@ IMPL_LINK( SwFrmPage, ModifyHdl, Edit *, pEdit )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwFrmPage::UpdateExample()
{
USHORT nPos = aHorizontalDLB.GetSelectEntryPos();
@@ -2280,9 +2219,7 @@ USHORT* SwFrmPage::GetRanges()
{
return aPageRg;
}
-/* -----------------------------03.11.00 10:52--------------------------------
- ---------------------------------------------------------------------------*/
void SwFrmPage::SetFormatUsed(BOOL bFmt)
{
bFormat = bFmt;
@@ -2304,10 +2241,6 @@ void SwFrmPage::SetFormatUsed(BOOL bFmt)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage( pParent, SW_RES(TP_GRF_EXT), rSet ),
aMirrorFL (this, SW_RES( FL_MIRROR )),
@@ -2331,28 +2264,16 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl));
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwGrfExtPage::~SwGrfExtPage()
{
delete pGrfDlg;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet &rSet )
{
return new SwGrfExtPage( pParent, rSet );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwGrfExtPage::Reset(const SfxItemSet &rSet)
{
const SfxPoolItem* pItem;
@@ -2369,10 +2290,6 @@ void SwGrfExtPage::Reset(const SfxItemSet &rSet)
ActivatePage(rSet);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
{
const SvxProtectItem& rProt = (const SvxProtectItem& )rSet.Get(RES_PROTECT);
@@ -2458,10 +2375,6 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
aBmpWin.Invalidate();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
BOOL SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
{
BOOL bModified = FALSE;
@@ -2500,9 +2413,6 @@ BOOL SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
}
return bModified;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet)
{
@@ -2511,10 +2421,6 @@ int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet)
return TRUE;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
{
if(!pGrfDlg)
@@ -2563,9 +2469,6 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
}
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG )
{
@@ -2587,7 +2490,6 @@ IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG )
/*--------------------------------------------------------------------
Beschreibung: BeispielWindow
--------------------------------------------------------------------*/
-
BmpWindow::BmpWindow( Window* pPar, USHORT nId,
const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC ) :
Window(pPar, SW_RES(nId)),
@@ -2660,8 +2562,6 @@ void BmpWindow::SetGraphic(const Graphic& rGrf)
/***************************************************************************
Beschreibung: URL und ImageMap an Rahmen einstellen
***************************************************************************/
-
-
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
aHyperLinkFL (this, SW_RES( FL_HYPERLINK )),
@@ -2681,18 +2581,10 @@ SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
aSearchPB.SetClickHdl(LINK(this, SwFrmURLPage, InsertFileHdl));
}
-/***************************************************************************
- Beschreibung:
-***************************************************************************/
-
SwFrmURLPage::~SwFrmURLPage()
{
}
-/***************************************************************************
- Beschreibung:
-***************************************************************************/
-
void SwFrmURLPage::Reset( const SfxItemSet &rSet )
{
const SfxPoolItem* pItem;
@@ -2739,12 +2631,6 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
aClientCB.SaveValue();
}
-
-
-/***************************************************************************
- Beschreibung:
-***************************************************************************/
-
BOOL SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
{
BOOL bModified = FALSE;
@@ -2784,19 +2670,11 @@ BOOL SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
return bModified;
}
-/***************************************************************************
- Beschreibung:
-***************************************************************************/
-
SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet &rSet)
{
return new SwFrmURLPage( pParent, rSet );
}
-/***************************************************************************
- Beschreibung:
-***************************************************************************/
-
IMPL_LINK( SwFrmURLPage, InsertFileHdl, PushButton *, EMPTYARG )
{
FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
@@ -2820,9 +2698,6 @@ IMPL_LINK( SwFrmURLPage, InsertFileHdl, PushButton *, EMPTYARG )
return 0;
}
-/* -----------------------------03.11.00 10:56--------------------------------
-
- ---------------------------------------------------------------------------*/
void lcl_Move(Window& rWin, sal_Int32 nDiff)
{
Point aPos(rWin.GetPosPixel());
@@ -2830,10 +2705,6 @@ void lcl_Move(Window& rWin, sal_Int32 nDiff)
rWin.SetPosPixel(aPos);
}
-/*-----------------13.11.96 13.15-------------------
-
---------------------------------------------------*/
-
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
@@ -2870,27 +2741,15 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
}
-/*-----------------13.11.96 13.15-------------------
-
---------------------------------------------------*/
-
SwFrmAddPage::~SwFrmAddPage()
{
}
-/*-----------------13.11.96 13.15-------------------
-
---------------------------------------------------*/
-
SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet &rSet)
{
return new SwFrmAddPage(pParent, rSet);
}
-/*-----------------13.11.96 13.14-------------------
-
---------------------------------------------------*/
-
void SwFrmAddPage::Reset(const SfxItemSet &rSet )
{
const SfxPoolItem* pItem;
@@ -3089,10 +2948,6 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
}
}
-/*-----------------13.11.96 13.20-------------------
-
---------------------------------------------------*/
-
BOOL SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
{
BOOL bRet = FALSE;
@@ -3155,19 +3010,11 @@ BOOL SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
return bRet;
}
-/*-----------------13.11.96 15.05-------------------
-
---------------------------------------------------*/
-
USHORT* SwFrmAddPage::GetRanges()
{
return aAddPgRg;
}
-/*-----------------13.11.96 16.12-------------------
-
---------------------------------------------------*/
-
IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG)
{
BOOL bEnable = 0 != aNameED.GetText().Len();
@@ -3176,7 +3023,7 @@ IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG)
return 0;
}
-//-----------------------------------------------------------------------------
+
void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
{
bFormat = bFmt;
@@ -3211,9 +3058,7 @@ void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
lcl_Move(*aWindows[nIdx++], nDiff);
}
}
-/* -----------------------------08.08.2002 16:24------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox)
{
String sCurrentPrevChain, sCurrentNextChain;
@@ -3246,4 +3091,3 @@ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox)
}
return 0;
}
-
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index fcc3775..94a4314 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -60,11 +60,6 @@
using namespace ::com::sun::star;
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
static USHORT __FAR_DATA aWrapPageRg[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_PROTECT, RES_SURROUND,
@@ -72,13 +67,6 @@ static USHORT __FAR_DATA aWrapPageRg[] = {
0
};
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode) :
SfxSingleTabDialog(pParent, rSet, 0),
pWrtShell(pSh)
@@ -94,18 +82,10 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bD
SetText(sTitle);
}
-
-
SwWrapDlg::~SwWrapDlg()
{
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, SW_RES(TP_FRM_WRAP), rSet),
@@ -187,23 +167,14 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
aWrapOutlineCB.SetClickHdl(LINK(this, SwWrapTabPage, ContourHdl));
}
-
-
SwWrapTabPage::~SwWrapTabPage()
{
}
-
-
SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet &rSet)
{
return new SwWrapTabPage(pParent, rSet);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwWrapTabPage::Reset(const SfxItemSet &rSet)
{
@@ -337,9 +308,6 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
-
-
-
BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
{
BOOL bModified = FALSE;
@@ -445,9 +413,6 @@ BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
-
-
-
void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
{
// Anchor
@@ -642,8 +607,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
ContourHdl(0);
}
-
-
int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
{
if(_pSet)
@@ -655,9 +618,6 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
/*--------------------------------------------------------------------
Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
{
if(bHtmlMode && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
@@ -695,12 +655,6 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwWrapTabPage, WrapTypeHdl, ImageRadioButton *, pBtn )
{
BOOL bWrapThrough = (pBtn == &aWrapThroughRB);
@@ -716,12 +670,6 @@ IMPL_LINK( SwWrapTabPage, WrapTypeHdl, ImageRadioButton *, pBtn )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
IMPL_LINK( SwWrapTabPage, ContourHdl, CheckBox *, EMPTYARG )
{
BOOL bEnable = !(aWrapOutlineCB.IsChecked() && aWrapOutlineCB.IsEnabled());
@@ -738,16 +686,11 @@ IMPL_LINK( SwWrapTabPage, ContourHdl, CheckBox *, EMPTYARG )
return 0;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
USHORT* SwWrapTabPage::GetRanges()
{
return aWrapPageRg;
}
-/* -----------------------------08.05.2002 14:28------------------------------
- ---------------------------------------------------------------------------*/
void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -756,9 +699,7 @@ void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
}
-/* -----------------------------08.05.2002 14:28------------------------------
- ---------------------------------------------------------------------------*/
void SwWrapTabPage::ApplyImageList()
{
ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
More information about the Libreoffice-commits
mailing list