[Libreoffice-commits] .: sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Tue Oct 12 13:31:16 PDT 2010
sw/source/ui/shells/basesh.cxx | 63 -----------------------------------
sw/source/ui/shells/beziersh.cxx | 19 ----------
sw/source/ui/shells/drawdlg.cxx | 21 -----------
sw/source/ui/shells/drawsh.cxx | 27 ---------------
sw/source/ui/shells/drwbassh.cxx | 29 +---------------
sw/source/ui/shells/drwtxtex.cxx | 16 --------
sw/source/ui/shells/drwtxtsh.cxx | 70 ---------------------------------------
sw/source/ui/shells/frmsh.cxx | 20 -----------
sw/source/ui/shells/mediash.cxx | 8 ----
sw/source/ui/shells/tabsh.cxx | 34 ------------------
sw/source/ui/shells/textdrw.cxx | 6 ---
sw/source/ui/shells/textfld.cxx | 9 -----
sw/source/ui/shells/textglos.cxx | 3 -
sw/source/ui/shells/textidx.cxx | 6 ---
sw/source/ui/shells/textsh.cxx | 32 -----------------
sw/source/ui/shells/textsh1.cxx | 13 -------
sw/source/ui/shells/textsh2.cxx | 10 +----
17 files changed, 5 insertions(+), 381 deletions(-)
New commits:
commit 7053280a7959903191979dbf3179083a8d1f72e4
Author: Prashant Shah <pshah.mumbai at gmail.com>
Date: Tue Oct 12 21:30:25 2010 +0100
cleanup redundant / empty comments.
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 4dbee8e..a10b66b 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -119,7 +119,6 @@
FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
-
//Fuer die Erkennung der Id, die variable von Gallery mit SID_GALLERY_BG_BRUSH
//ankommt.
static BYTE nParagraphPos;
@@ -155,7 +154,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
-
SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0))
{
SFX_CHILDWINDOW_REGISTRATION(SvxIMapDlgChildWindow::GetChildWindowId());
@@ -167,8 +165,6 @@ TYPEINIT1(SwBaseShell,SfxShell)
/*--------------------------------------------------------------------
Beschreibung: statics
--------------------------------------------------------------------*/
-
-
void lcl_UpdateIMapDlg( SwWrtShell& rSh )
{
Graphic aGrf( rSh.GetIMapGraphic() );
@@ -193,7 +189,6 @@ void lcl_UpdateIMapDlg( SwWrtShell& rSh )
delete pList;
}
-
BOOL lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel )
{
Graphic aGraf( rSh.GetIMapGraphic() );
@@ -215,7 +210,6 @@ BOOL lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel )
/*--------------------------------------------------------------------
Beschreibung: loeschen
--------------------------------------------------------------------*/
-
void SwBaseShell::ExecDelete(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -264,10 +258,6 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
rTmpEditWin.SetUseInputLanguage( sal_False );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
{
//Achtung: Suizid gefaehrdet! Nach Paste, Paste special kann der die
@@ -433,7 +423,6 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
/*--------------------------------------------------------------------
Beschreibung: ClipBoard-Status
--------------------------------------------------------------------*/
-
void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
@@ -490,7 +479,6 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Undo ausfuehren
--------------------------------------------------------------------*/
-
void SwBaseShell::ExecUndo(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -531,7 +519,6 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
/*--------------------------------------------------------------------
Beschreibung: Zustand Undo
--------------------------------------------------------------------*/
-
void SwBaseShell::StateUndo(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
@@ -599,7 +586,6 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Slot-Id auswerten bzw. Dispatchen
--------------------------------------------------------------------*/
-
void SwBaseShell::Execute(SfxRequest &rReq)
{
const SfxPoolItem *pItem;
@@ -1809,8 +1795,6 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
/*--------------------------------------------------------------------
Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
-
-
void SwBaseShell::StateDisableItems( SfxItemSet &rSet )
{
SfxWhichIter aIter(rSet);
@@ -1826,8 +1810,6 @@ void SwBaseShell::StateDisableItems( SfxItemSet &rSet )
/*--------------------------------------------------------------------
Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
-
-
void SwBaseShell::StateStyle( SfxItemSet &rSet )
{
BOOL bParentCntProt = GetShell().IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
@@ -1852,11 +1834,6 @@ void SwBaseShell::StateStyle( SfxItemSet &rSet )
GetView().GetDocShell()->StateStyleSheet(rSet, &GetShell());
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwBaseShell::SetWrapMode( USHORT nSlot )
{
SwWrtShell &rSh = GetShell();
@@ -1948,7 +1925,6 @@ void SwBaseShell::SetWrapMode( USHORT nSlot )
/*--------------------------------------------------------------------
Beschreibung: Update der Statuszeile erzwingen
--------------------------------------------------------------------*/
-
void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
{
eFrameMode = eMode;
@@ -1975,7 +1951,6 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
/*--------------------------------------------------------------------
Beschreibung: Ctor
--------------------------------------------------------------------*/
-
SwBaseShell::SwBaseShell(SwView& rVw) :
SfxShell( &rVw ),
rView(rVw),
@@ -1988,7 +1963,6 @@ SwBaseShell::SwBaseShell(SwView& rVw) :
rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl));
}
-
SwBaseShell::~SwBaseShell()
{
if( rView.GetCurShell() == this )
@@ -1999,10 +1973,6 @@ SwBaseShell::~SwBaseShell()
rView.GetWrtShell().SetGrfArrivedLnk( Link() );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -2128,10 +2098,6 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
rReq.Done();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwBaseShell::GetTxtCtrlState( SfxItemSet& rSet )
{
SwWrtShell &rSh = GetShell();
@@ -2218,10 +2184,6 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet )
delete pFntCoreSet;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwBaseShell::GetBckColState(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
@@ -2279,10 +2241,6 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwBaseShell::ExecBckCol(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -2387,11 +2345,6 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
rReq.Done();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwBaseShell::GetBorderState(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
@@ -2423,11 +2376,6 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( SID_BORDER_REDUCED_MODE, !bTableMode ));
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwBaseShell::ExecDlg(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -2604,23 +2552,16 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
rReq.Done();
}
-// ----------------------------------------------------------------------------
-
-
SwWrtShell& SwBaseShell::GetShell()
{
return rView.GetWrtShell();
}
-// ----------------------------------------------------------------------------
-
SwWrtShell* SwBaseShell::GetShellPtr()
{
return rView.GetWrtShellPtr();
}
-// ----------------------------------------------------------------------------
-
void SwBaseShell::InsertTable( SfxRequest& _rRequest )
{
const SfxItemSet* pArgs = _rRequest.GetArgs();
@@ -2757,8 +2698,6 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
}
}
-// ----------------------------------------------------------------------------
-
void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
{
SwWrtShell &rSh = GetShell();
@@ -2839,7 +2778,6 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
}
}
-
void SwBaseShell::ExecuteGallery(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -2920,4 +2858,3 @@ void SwBaseShell::ExecField( SfxRequest& rReq )
ASSERT(FALSE, falscher Dispatcher);
}
}
-
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index b227f3d..80221f1 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -54,7 +54,6 @@
#include <unomid.h>
-
SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRAW_POPUPMENU));
@@ -63,11 +62,6 @@ SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER))
TYPEINIT1(SwBezierShell,SwBaseShell)
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
{
@@ -79,11 +73,6 @@ SwBezierShell::SwBezierShell(SwView &_rView):
pSdrView->SetEliminatePolyPointLimitAngle(1500L);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwBezierShell::Execute(SfxRequest &rReq)
{
SwWrtShell *pSh = &GetShell();
@@ -239,11 +228,6 @@ void SwBezierShell::Execute(SfxRequest &rReq)
pSdrView->GetModel()->SetChanged(TRUE);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwBezierShell::GetState(SfxItemSet &rSet)
{
SdrView* pSdrView = GetShell().GetDrawView();
@@ -351,6 +335,3 @@ void SwBezierShell::GetState(SfxItemSet &rSet)
nWhich = aIter.NextWhich();
}
}
-
-
-
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 103655d..bc41777 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -29,9 +29,6 @@
#include "precompiled_sw.hxx"
-
-
-
#include <svx/svxids.hrc>
#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
@@ -51,11 +48,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
{
SwWrtShell* pSh = &GetShell();
@@ -182,11 +174,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
pDoc->SetChanged(TRUE);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
{
SwWrtShell* pSh = &GetShell();
@@ -231,11 +218,6 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
pView->GetModel()->SetChanged(TRUE);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet)
{
SdrView* pSdrView = GetShell().GetDrawView();
@@ -250,6 +232,3 @@ void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet)
else
rSet.Put(pSdrView->GetDefaultAttr());
}
-
-
-
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index dcfaa48..61c1cda 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -83,11 +83,6 @@ SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW))
TYPEINIT1(SwDrawShell,SwDrawBaseShell)
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwDrawShell::Execute(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -298,12 +293,6 @@ void SwDrawShell::Execute(SfxRequest &rReq)
pSdrView->GetModel()->SetChanged(TRUE);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwDrawShell::GetState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -377,12 +366,6 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
svx::FontworkBar::getState( pSdrView, rSet );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
SwDrawShell::SwDrawShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
@@ -395,9 +378,6 @@ SwDrawShell::SwDrawShell(SwView &_rView) :
|* SfxRequests fuer FontWork bearbeiten
|*
\************************************************************************/
-
-
-
void SwDrawShell::ExecFormText(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -449,9 +429,6 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
|* Statuswerte fuer FontWork zurueckgeben
|*
\************************************************************************/
-
-
-
void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -491,7 +468,3 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
pDrView->GetAttributes( rSet );
}
}
-
-
-
-
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index a99abc9..2e0f7e3 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -85,11 +85,6 @@ SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0))
TYPEINIT1(SwDrawBaseShell,SwBaseShell)
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
SwDrawBaseShell::SwDrawBaseShell(SwView &_rView):
SwBaseShell( _rView )
{
@@ -105,11 +100,6 @@ SwDrawBaseShell::SwDrawBaseShell(SwView &_rView):
SwTransferable::CreateSelection( GetShell() );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
SwDrawBaseShell::~SwDrawBaseShell()
{
GetView().ExitDraw();
@@ -117,11 +107,6 @@ SwDrawBaseShell::~SwDrawBaseShell()
SwTransferable::ClearSelection( GetShell() );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
SwWrtShell *pSh = &GetShell();
@@ -631,6 +616,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
GetView().AttrChangedNotify(pSh); // ggf Shellwechsel...
}
}
+
/* -----------------------------27.02.2002 15:27------------------------------
Checks whether a given name is allowed for a group shape
---------------------------------------------------------------------------*/
@@ -678,9 +664,7 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam
}
return nRet;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
+
void SwDrawBaseShell::GetState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -773,11 +757,6 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
BOOL SwDrawBaseShell::Disable(SfxItemSet& rSet, USHORT nWhich)
{
BOOL bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT);
@@ -989,7 +968,3 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation
pValidation->nHeight = pValidation->nMaxHeight;
return 0;
}
-
-
-
-
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 3004ebd..eb3e5eb 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -136,10 +136,6 @@
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDrawTextShell::Execute( SfxRequest &rReq )
{
SwWrtShell &rSh = GetShell();
@@ -575,10 +571,6 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDrawTextShell::GetState(SfxItemSet& rSet)
{
if (!IsTextEdit()) // Sonst manchmal Absturz!
@@ -801,9 +793,6 @@ ASK_ESCAPE:
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
{
if (!IsTextEdit()) // Sonst Absturz!
@@ -868,9 +857,6 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq)
{
if (!IsTextEdit()) // Sonst Absturz!
@@ -958,7 +944,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
/*--------------------------------------------------------------------
Beschreibung: Hyperlink-Status
--------------------------------------------------------------------*/
-
void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
{
if (!IsTextEdit()) // Sonst Absturz!
@@ -1009,4 +994,3 @@ void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
nWhich = aIter.NextWhich();
}
}
-
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index f7ddf88..741d2c7 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -95,8 +95,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::i18n;
-
-
SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_DRWTXT_POPUPMENU));
@@ -106,12 +104,6 @@ SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
TYPEINIT1(SwDrawTextShell,SfxShell)
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::Init()
{
SwWrtShell &rSh = GetShell();
@@ -140,11 +132,6 @@ void SwDrawTextShell::Init()
pOLV->ShowCursor();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
SwDrawTextShell::SwDrawTextShell(SwView &rV) :
SfxShell(&rV),
rView(rV)
@@ -159,12 +146,6 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
SetHelpId(SW_DRWTXTSHELL);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
__EXPORT SwDrawTextShell::~SwDrawTextShell()
{
if ( GetView().GetCurShell() == this )
@@ -188,11 +169,9 @@ SwWrtShell& SwDrawTextShell::GetShell()
return rView.GetWrtShell();
}
-
/*--------------------------------------------------------------------
Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
-
void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
{
SfxWhichIter aIter(rSet);
@@ -205,15 +184,11 @@ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
}
}
-
/*************************************************************************
|*
|* Attribute setzen
|*
\************************************************************************/
-
-
-
void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
{
Rectangle aNullRect;
@@ -227,23 +202,11 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
BOOL SwDrawTextShell::IsTextEdit()
{
return pSdrView->IsTextEdit();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::ExecFontWork(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -262,12 +225,6 @@ void SwDrawTextShell::ExecFontWork(SfxRequest& rReq)
pVFrame->GetBindings().Invalidate(SID_FONTWORK);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::StateFontWork(SfxItemSet& rSet)
{
const USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
@@ -279,9 +236,6 @@ void SwDrawTextShell::StateFontWork(SfxItemSet& rSet)
|* SfxRequests fuer FontWork bearbeiten
|*
\************************************************************************/
-
-
-
void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -331,9 +285,6 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
|* Statuswerte fuer FontWork zurueckgeben
|*
\************************************************************************/
-
-
-
void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -373,12 +324,6 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -472,9 +417,6 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -596,9 +538,6 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
/*--------------------------------------------------------------------
Beschreibung: Undo ausfuehren
--------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
{
if( IsTextEdit() )
@@ -644,9 +583,6 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
/*--------------------------------------------------------------------
Beschreibung: Zustand Undo
--------------------------------------------------------------------*/
-
-
-
void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
{
if ( !IsTextEdit() )
@@ -757,7 +693,6 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq )
/*--------------------------------------------------------------------
Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX)
--------------------------------------------------------------------*/
-
void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
{
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -890,9 +825,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
rReq.Done();
}
}
-/*-- 22.10.2003 14:26:32---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxUndoManager* SwDrawTextShell::GetUndoManager()
{
SwWrtShell &rSh = GetShell();
@@ -901,6 +834,3 @@ SfxUndoManager* SwDrawTextShell::GetUndoManager()
pOutliner = pSdrView->GetTextEditOutliner();
return &pOutliner->GetUndoManager();
}
-
-
-
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 70841ce..c7bd712 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -91,7 +91,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
// Prototypen ------------------------------------------------------------
-
void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const String& rName)
{
@@ -115,8 +114,6 @@ SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell, SW_RES(STR_SHELLNAME_FRAME))
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_FRAME_TOOLBOX));
}
-
-
void SwFrameShell::Execute(SfxRequest &rReq)
{
//Erstmal die, die keinen FrmMgr benoetigen.
@@ -650,11 +647,6 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwFrameShell::GetState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
@@ -894,8 +886,6 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
/*--------------------------------------------------------------------
Beschreibung: Ctor fuer FrameShell
--------------------------------------------------------------------*/
-
-
SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
{
@@ -914,12 +904,6 @@ SwFrameShell::~SwFrameShell()
SwTransferable::ClearSelection( GetShell(), (ViewShell *) this );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -1095,8 +1079,6 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
}
-
-
void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine)
{
if(pBorderLine->GetInWidth() > rBorderLine.GetInWidth())
@@ -1111,8 +1093,6 @@ void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBo
rBorderLine.SetColor(pBorderLine->GetColor());
}
-
-
void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 7e43aea..3f15966 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -29,8 +29,6 @@
#include "precompiled_sw.hxx"
-
-
#include <cmdid.h>
#include <hintids.hxx>
#include <tools/urlobj.hxx>
@@ -88,8 +86,6 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA))
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_MEDIA_TOOLBOX));
}
-// ------------------------------------------------------------------------------
-
void SwMediaShell::ExecMedia(SfxRequest &rReq)
{
SwWrtShell* pSh = &GetShell();
@@ -161,8 +157,6 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
}
}
-// ------------------------------------------------------------------------------
-
void SwMediaShell::GetMediaState(SfxItemSet &rSet)
{
SfxWhichIter aIter( rSet );
@@ -205,8 +199,6 @@ void SwMediaShell::GetMediaState(SfxItemSet &rSet)
}
}
-// ------------------------------------------------------------------------------
-
SwMediaShell::SwMediaShell(SwView &_rView) :
SwBaseShell(_rView)
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 61f087b..c3d6404 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -85,8 +85,6 @@
#include <dialog.hrc>
-
-
//!!! new: insert table
/*
#include <svx/htmlmode.hxx>
@@ -113,19 +111,14 @@
using namespace ::com::sun::star;
-//-----------------------------------------------------------------------------
-
SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TAB_POPUPMENU));
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
}
-
TYPEINIT1(SwTableShell,SwBaseShell)
-/************************************************************************/
-
const USHORT __FAR_DATA aUITableAttrRange[] =
{
FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME,
@@ -165,9 +158,6 @@ static void lcl_SetAttr( SwWrtShell &rSh, const SfxPoolItem &rItem )
rSh.SetTblAttr( aSet );
}
-/************************************************************************/
-
-
static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
{
SwFrmFmt *pFmt = rSh.GetTableFmt();
@@ -295,9 +285,6 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
return pRep;
}
-/************************************************************************/
-
-
void ItemSetToTableParam( const SfxItemSet& rSet,
SwWrtShell &rSh )
{
@@ -475,9 +462,6 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
rSh.EndAllAction();
}
-/************************************************************************/
-
-
static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine)
{
if(pBorderLine->GetInWidth() > rBorderLine.GetInWidth())
@@ -492,7 +476,6 @@ static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLi
rBorderLine.SetColor(pBorderLine->GetColor());
}
-
void SwTableShell::Execute(SfxRequest &rReq)
{
BOOL bUseDialog = TRUE;
@@ -1234,9 +1217,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
if(bCallDone)
rReq.Done();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SwTableShell::GetState(SfxItemSet &rSet)
{
@@ -1419,10 +1399,6 @@ void SwTableShell::GetState(SfxItemSet &rSet)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwTableShell::SwTableShell(SwView &_rView) :
SwBaseShell(_rView)
{
@@ -1430,10 +1406,6 @@ SwTableShell::SwTableShell(SwView &_rView) :
SetHelpId(SW_TABSHELL);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwTableShell::GetFrmBorderState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
@@ -1445,10 +1417,6 @@ void SwTableShell::GetFrmBorderState(SfxItemSet &rSet)
rSet.Put( aCoreSet );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwTableShell::ExecTableStyle(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
@@ -1503,7 +1471,6 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
}
}
-
void SwTableShell::GetLineStyleState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
@@ -1586,4 +1553,3 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
}
}
-
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx
index 856d5de..9693da9 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/ui/shells/textdrw.cxx
@@ -51,12 +51,8 @@
#include <unomid.h>
-
using namespace ::com::sun::star;
using ::rtl::OUString;
-/*---------------------------------------------------------------------------
- Beschreibung:
- ----------------------------------------------------------------------------*/
void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, const String& rTxt)
{
@@ -137,5 +133,3 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con
rSh.EndUndo( UNDO_UI_INSERT_URLBTN );
rSh.EndAction();
}
-
-
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 7bef6d5..c4c23e8 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -84,7 +84,6 @@
using namespace nsSwDocInfoSubType;
-
extern BOOL bNoInterrupt; // in mainwn.cxx
String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId )
@@ -104,7 +103,6 @@ String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId )
}
// STATIC DATA -----------------------------------------------------------
-
void SwTextShell::ExecField(SfxRequest &rReq)
{
SwWrtShell& rSh = GetShell();
@@ -722,11 +720,6 @@ void SwTextShell::StateField( SfxItemSet &rSet )
}
}
-/*---------------------------------------------------------------------------
- Beschreibung:
- ----------------------------------------------------------------------------*/
-
-
void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
{
const String& rName = rHlnkItem.GetName();
@@ -890,5 +883,3 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
return 0;
}
-
-
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index 117320a..0cc3de7 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -46,7 +46,6 @@
#include <misc.hrc>
// STATIC DATA -----------------------------------------------------------
-
void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
USHORT nSlot = rReq.GetSlot();
@@ -141,5 +140,3 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
pList->Update();
}
}
-
-
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index d9b4593..817e69d 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -51,9 +51,7 @@
#include <index.hrc>
#include <globals.hrc>
-
// STATIC DATA -----------------------------------------------------------
-
void SwTextShell::ExecIdx(SfxRequest &rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -179,7 +177,6 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
}
}
-
void SwTextShell::GetIdxState(SfxItemSet &rSet)
{
SwWrtShell& rSh = GetShell();
@@ -256,6 +253,3 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
rSet.DisableItem(FN_REMOVE_CUR_TOX);
}
}
-
-// -----------------------------------------------------------------------
-
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index de1c0ec..22997f3 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -128,12 +128,6 @@ using ::rtl::OUString;
#include <frmui.hrc>
#include <unomid.h>
-
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TEXT_POPUPMENU));
@@ -145,12 +139,8 @@ SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT))
SFX_CHILDWINDOW_REGISTRATION(SID_RUBY_DIALOG);
}
-
-
TYPEINIT1(SwTextShell,SwBaseShell)
-
-
void SwTextShell::ExecInsert(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -790,7 +780,6 @@ bool lcl_IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect )
return bRet;
}
-
void SwTextShell::StateInsert( SfxItemSet &rSet )
{
USHORT nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
@@ -963,10 +952,6 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwTextShell::ExecDelete(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -1059,13 +1044,6 @@ void SwTextShell::ExecTransliteration( SfxRequest & rReq )
}
}
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
SwTextShell::SwTextShell(SwView &_rView) :
SwBaseShell(_rView), pPostItFldMgr( 0 )
{
@@ -1073,18 +1051,10 @@ SwTextShell::SwTextShell(SwView &_rView) :
SetHelpId(SW_TEXTSHELL);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SwTextShell::~SwTextShell()
{
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwTextShell::InsertSymbol( SfxRequest& rReq )
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -1258,5 +1228,3 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
}
}
}
-
-
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 129f59c..f8276ac 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -132,7 +132,6 @@
using namespace ::com::sun::star;
-
void lcl_CharDialog( SwWrtShell &rWrtSh, BOOL bUseDialog, USHORT nSlot,const SfxItemSet *pArgs, SfxRequest *pReq )
{
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rWrtSh.GetView()));
@@ -262,10 +261,6 @@ void lcl_CharDialog( SwWrtShell &rWrtSh, BOOL bUseDialog, USHORT nSlot,const Sfx
delete pDlg;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
short lcl_AskRedlineMode(Window *pWin)
{
MessBox aQBox( pWin, 0,
@@ -1349,12 +1344,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
}
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
void SwTextShell::GetState( SfxItemSet &rSet )
{
SwWrtShell &rSh = GetShell();
@@ -1737,6 +1726,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
nWhich = aIter.NextWhich();
}
}
+
/* -----------------------------2002/07/05 10:31------------------------------
Switch on/off header of footer of a page style - if an empty name is
given all styles are changed
@@ -1802,4 +1792,3 @@ void SwTextShell::ChangeHeaderOrFooter(
rSh.EndUndo( UNDO_HEADER_FOOTER ); // #i7983#
rSh.EndAllAction();
}
-
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 403669a..93ff2b5 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -88,7 +88,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
-
#define DB_DD_DELIM 0x0b
struct DBTextStruct_Impl
@@ -98,10 +97,12 @@ struct DBTextStruct_Impl
Reference<XResultSet> xCursor;
Reference<XConnection> xConnection;
};
+
inline void AddSelList( List& rLst, long nRow )
{
rLst.Insert( (void*)nRow , LIST_APPEND );
}
+
void SwTextShell::ExecDB(SfxRequest &rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -254,10 +255,6 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
{
if( pDBStruct )
@@ -305,6 +302,3 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
delete pDBStruct;
return 0;
}
-
-
-
More information about the Libreoffice-commits
mailing list