[Libreoffice-commits] core.git: 2 commits - sd/source
Urs Fässler
urs at bitzgi.ch
Tue Mar 12 12:35:17 PDT 2013
sd/source/ui/docshell/docshel2.cxx | 59 ++--------
sd/source/ui/docshell/docshel3.cxx | 21 +--
sd/source/ui/docshell/docshel4.cxx | 163 +++++++++---------------------
sd/source/ui/docshell/docshell.cxx | 96 ++---------------
sd/source/ui/docshell/sdclient.cxx | 31 +----
sd/source/ui/func/bulmaper.cxx | 3
sd/source/ui/func/fuarea.cxx | 7 -
sd/source/ui/func/fubullet.cxx | 29 ++---
sd/source/ui/func/fuchar.cxx | 7 -
sd/source/ui/func/fucon3d.cxx | 49 +--------
sd/source/ui/func/fuconarc.cxx | 45 --------
sd/source/ui/func/fuconbez.cxx | 66 +-----------
sd/source/ui/func/fuconcs.cxx | 47 +-------
sd/source/ui/func/fuconnct.cxx | 5
sd/source/ui/func/fuconrec.cxx | 121 ++++++----------------
sd/source/ui/func/fuconstr.cxx | 56 +---------
sd/source/ui/func/fuconuno.cxx | 42 -------
sd/source/ui/func/fucopy.cxx | 26 +---
sd/source/ui/func/fucushow.cxx | 5
sd/source/ui/func/fudraw.cxx | 124 +++++-----------------
sd/source/ui/func/fudspord.cxx | 35 ------
sd/source/ui/func/fuediglu.cxx | 98 ++----------------
sd/source/ui/func/fuexpand.cxx | 29 ++---
sd/source/ui/func/fuhhconv.cxx | 20 ---
sd/source/ui/func/fuinsert.cxx | 48 +-------
sd/source/ui/func/fuinsfil.cxx | 93 +++++++----------
sd/source/ui/func/fuline.cxx | 7 -
sd/source/ui/func/fulinend.cxx | 17 +--
sd/source/ui/func/fulink.cxx | 5
sd/source/ui/func/fumeasur.cxx | 5
sd/source/ui/func/fumorph.cxx | 51 ++++-----
sd/source/ui/func/fuoaprms.cxx | 63 +++++------
sd/source/ui/func/fuolbull.cxx | 16 --
sd/source/ui/func/fuoltext.cxx | 81 +++-----------
sd/source/ui/func/fuoutl.cxx | 17 ---
sd/source/ui/func/fupage.cxx | 31 +----
sd/source/ui/func/fuparagr.cxx | 14 --
sd/source/ui/func/fupoor.cxx | 155 +++++++---------------------
sd/source/ui/func/fuprlout.cxx | 42 ++-----
sd/source/ui/func/fuprobjs.cxx | 10 -
sd/source/ui/func/fuscale.cxx | 18 +--
sd/source/ui/func/fusearch.cxx | 18 ---
sd/source/ui/func/fusel.cxx | 81 ++------------
sd/source/ui/func/fusldlg.cxx | 10 -
sd/source/ui/func/fusnapln.cxx | 8 -
sd/source/ui/func/fusumry.cxx | 37 ++----
sd/source/ui/func/futempl.cxx | 44 +++-----
sd/source/ui/func/futext.cxx | 200 ++++++++++---------------------------
sd/source/ui/func/futhes.cxx | 6 -
sd/source/ui/func/futransf.cxx | 6 -
sd/source/ui/func/futxtatt.cxx | 8 -
sd/source/ui/func/fuvect.cxx | 6 -
sd/source/ui/func/fuzoom.cxx | 44 --------
sd/source/ui/func/sdundogr.cxx | 33 ------
sd/source/ui/func/undoback.cxx | 4
sd/source/ui/func/undopage.cxx | 21 ---
sd/source/ui/func/unmovss.cxx | 8 -
sd/source/ui/func/unoaprms.cxx | 28 -----
sd/source/ui/func/unprlout.cxx | 31 -----
59 files changed, 579 insertions(+), 1871 deletions(-)
New commits:
commit c4054a89e6805f5395df2dac879d2331cd5d0cf1
Author: Urs Fässler <urs at bitzgi.ch>
Date: Tue Mar 12 20:27:21 2013 +0100
translation and cleanup of comments in sd/source/ui/func/
Change-Id: Id2603c4d3340a220708272b4b8f73e2a59f36f5b
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 0f58c1c..091fb52 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -56,8 +56,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet&
if(rSrcLevel.GetNumberingType() != com::sun::star::style::NumberingType::CHAR_SPECIAL &&
rSrcLevel.GetNumberingType() != com::sun::star::style::NumberingType::NUMBER_NONE )
{
- // wenn Aufzaehlung statt Bullet gewaehlt wurde, wird der Bullet-Font
- // dem Vorlagen-Font angeglichen
+ // if enumeration instead bullet is chosen, adjust bullet font to template font
// to be implemented if module supports CJK
long nFontID = SID_ATTR_CHAR_FONT;
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 3451383..bf17274 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -38,11 +38,6 @@
namespace sd {
TYPEINIT1( FuArea, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuArea::FuArea( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, _pView, pDoc, rReq)
@@ -75,7 +70,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
}
- // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden
+ // attributes changed, update Listboxes in Objectbars
static sal_uInt16 SidArray[] = {
SID_ATTR_FILL_STYLE,
SID_ATTR_FILL_COLOR,
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 2d8ac1d..2a23212 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -53,11 +53,6 @@ const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060);
TYPEINIT1( FuBullet, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuBullet::FuBullet (
ViewShell* pViewSh,
@@ -201,7 +196,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
if( !pDlg )
return;
- // Wenn Zeichen selektiert ist kann es angezeigt werden
+ // If a character is selected, it can be shown
// pDLg->SetFont( );
// pDlg->SetChar( );
sal_uInt16 nResult = pDlg->Execute();
@@ -229,7 +224,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
OutlinerView* pOV = NULL;
::Outliner* pOL = NULL;
- // je nach ViewShell Outliner und OutlinerView bestimmen
+ // determine depending on ViewShell Outliner and OutlinerView
if(mpViewShell && mpViewShell->ISA(DrawViewShell))
{
pOV = mpView->GetTextEditOutlinerView();
@@ -245,18 +240,18 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
mpViewShell->GetActiveWindow());
}
- // Sonderzeichen einfuegen
+ // insert special character
if (pOV)
{
- // nicht flackern
+ // prevent flicker
pOV->HideCursor();
pOL->SetUpdateMode(sal_False);
- // alte Attributierung merken;
- // dazu vorher selektierten Bereich loeschen, denn der muss eh weg
- // und so gibt es immer eine eindeutige Attributierung (und da es
- // kein DeleteSelected() an der OutlinerView gibt, wird durch
- // Einfuegen eines Leerstrings geloescht)
+ /* remember old attributes:
+ To do that, remove selected area before (it has to go anyway).
+ With that, we get unique attributes (and since there is no
+ DeleteSelected() in OutlinerView, it is deleted by inserting an
+ empty string). */
pOV->InsertText( aEmptyStr );
SfxItemSet aOldSet( mpDoc->GetPool(), EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, 0 );
@@ -267,7 +262,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
aEmptyStr );
pOV->InsertText(aChars, sal_True);
- // attributieren (Font setzen)
+ // set attributes (set font)
SfxItemSet aSet(pOL->GetEmptyItemSet());
SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
@@ -283,12 +278,12 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
aSel.nStartPos = aSel.nEndPos;
pOV->SetSelection(aSel);
- // nicht mit Sonderzeichenattributierung weiterschreiben
+ // do not go ahead with setting attributes of special characters
pOV->GetOutliner()->QuickSetAttribs(aOldSet, aSel);
rUndoMgr.LeaveListAction();
- // ab jetzt wieder anzeigen
+ // show it again
pOL->SetUpdateMode(sal_True);
pOV->ShowCursor();
}
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 41e96fc..c288767 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -39,11 +39,6 @@ namespace sd {
TYPEINIT1( FuChar, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuChar::FuChar (
ViewShell* pViewSh,
@@ -97,7 +92,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
}
mpView->SetAttributes(*pArgs);
- // invalidieren der Slots, die in der DrTxtObjBar auftauchen
+ // invalidate the Slots which are in DrTxtObjBar
static sal_uInt16 SidArray[] = {
SID_ATTR_CHAR_FONT,
SID_ATTR_CHAR_POSTURE,
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 3b85399..1d293ed 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -53,11 +53,6 @@ namespace sd {
TYPEINIT1( FuConstruct3dObject, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstruct3dObject::FuConstruct3dObject (
ViewShell* pViewSh,
@@ -86,11 +81,6 @@ void FuConstruct3dObject::DoExecute( SfxRequest& rReq )
ToolBarManager::msDrawingObjectToolBar);
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
{
@@ -129,8 +119,8 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
}
p3DObj = new E3dLatheObj(mpView->Get3DDefaultAttributes(), ::basegfx::B2DPolyPolygon(aB2DPolygon));
- // Dies ist ein offenes Objekt, muss daher defaultmaessig
- // doppelseitig behandelt werden
+ /* this is an open object, therefore it has to be handled double-
+ sided by default */
p3DObj->SetMergedItem(Svx3DDoubleSidedItem(sal_True));
break;
}
@@ -338,7 +328,7 @@ sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
SfxItemSet aAttr(mpDoc->GetPool());
SetStyleSheet(aAttr, pObj);
- // LineStyle rausnehmen
+ // extract LineStyle
aAttr.Put(XLineStyleItem (XLINE_NONE));
pObj->SetMergedItemSet(aAttr);
@@ -348,22 +338,12 @@ sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -383,25 +363,15 @@ sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt)
{
return( FuConstruct::KeyInput(rKEvt) );
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstruct3dObject::Activate()
{
@@ -410,11 +380,6 @@ void FuConstruct3dObject::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstruct3dObject::Deactivate()
{
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 6a6f290..9a365a8 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -47,11 +47,6 @@ namespace sd {
TYPEINIT1( FuConstructArc, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstructArc::FuConstructArc (
ViewShell* pViewSh,
@@ -96,7 +91,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
pCenterX->GetValue () + pAxisX->GetValue () / 2,
pCenterY->GetValue () + pAxisY->GetValue () / 2);
- Activate(); // Setzt aObjKind
+ Activate(); // sets aObjKind
SdrCircObj* pNewCircle =
new SdrCircObj((SdrObjKind) mpView->GetCurrentObjIdentifier(),
aNewRectangle,
@@ -108,11 +103,6 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -140,22 +130,12 @@ sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt )
{
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
{
@@ -185,26 +165,16 @@ sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstructArc::Activate()
{
@@ -249,11 +219,6 @@ void FuConstructArc::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstructArc::Deactivate()
{
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 9ae1ffc..4ee9ca3 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -54,11 +54,6 @@ namespace sd {
TYPEINIT1( FuConstructBezierPolygon, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell* pViewSh,
@@ -93,11 +88,6 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -117,7 +107,7 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
if (aVEvt.eEvent == SDREVENT_BEGTEXTEDIT)
{
- // Texteingabe hier nicht zulassen
+ // here, we do not allow text input
aVEvt.eEvent = SDREVENT_BEGDRAGOBJ;
mpView->EnableExtendedMouseEventDispatcher(sal_False);
}
@@ -128,9 +118,7 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
{
- /******************************************************************
- * Klebepunkt einfuegen
- ******************************************************************/
+ // insert clue point
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
}
else
@@ -150,11 +138,6 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
return(bReturn);
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
{
@@ -162,11 +145,6 @@ sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
return(bReturn);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
{
@@ -196,7 +174,7 @@ sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
bCreated = sal_True;
}
- // Trick, um FuDraw::DoubleClick nicht auszuloesen
+ // trick to suppress FuDraw::DoubleClick
bMBDown = sal_False;
}
@@ -246,15 +224,10 @@ sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
return(bReturn);
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
@@ -262,11 +235,6 @@ sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstructBezierPolygon::Activate()
{
@@ -326,11 +294,6 @@ void FuConstructBezierPolygon::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstructBezierPolygon::Deactivate()
{
@@ -340,11 +303,6 @@ void FuConstructBezierPolygon::Deactivate()
}
-/*************************************************************************
-|*
-|* Selektion hat sich geaendert
-|*
-\************************************************************************/
void FuConstructBezierPolygon::SelectionHasChanged()
{
@@ -356,13 +314,9 @@ void FuConstructBezierPolygon::SelectionHasChanged()
}
-
-/*************************************************************************
-|*
-|* Aktuellen Bezier-Editmodus setzen
-|*
-\************************************************************************/
-
+/**
+ * Set current bezier edit mode
+ */
void FuConstructBezierPolygon::SetEditMode(sal_uInt16 nMode)
{
nEditMode = nMode;
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 8109f9a..ab7c3b3 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -73,11 +73,6 @@ namespace sd {
TYPEINIT1( FuConstructCustomShape, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstructCustomShape::FuConstructCustomShape (
ViewShell* pViewSh,
@@ -114,11 +109,6 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq )
ToolBarManager::msDrawingObjectToolBar);
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -153,22 +143,12 @@ sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -190,26 +170,16 @@ sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstructCustomShape::Activate()
{
@@ -217,12 +187,9 @@ void FuConstructCustomShape::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Attribute fuer das zu erzeugende Objekt setzen
-|*
-\************************************************************************/
-
+/**
+ * set attribute for the object to be created
+ */
void FuConstructCustomShape::SetAttributes( SdrObject* pObj )
{
sal_Bool bAttributesAppliedFromGallery = sal_False;
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index 10a45b2..3b3d8b2 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -30,11 +30,6 @@ namespace sd {
TYPEINIT1( FuConnectionDlg, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConnectionDlg::FuConnectionDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 333d8f7..628b705 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -68,11 +68,6 @@ namespace sd {
TYPEINIT1( FuConstructRectangle, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstructRectangle::FuConstructRectangle (
ViewShell* pViewSh,
@@ -185,11 +180,6 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -230,22 +220,12 @@ sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -293,26 +273,16 @@ sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstructRectangle::Activate()
{
@@ -328,7 +298,7 @@ void FuConstructRectangle::Activate()
case SID_LINE_ARROW_SQUARE:
case SID_LINE_SQUARE_ARROW:
mpView->SetGlueVisible();
- // keine break !
+ // no break !
case SID_DRAW_LINE :
case SID_DRAW_XLINE:
aObjKind = OBJ_LINE;
@@ -415,11 +385,6 @@ void FuConstructRectangle::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstructRectangle::Deactivate()
{
@@ -465,12 +430,9 @@ void FuConstructRectangle::Deactivate()
}
-/*************************************************************************
-|*
-|* Attribute fuer das zu erzeugende Objekt setzen
-|*
-\************************************************************************/
-
+/**
+ * set attribute for the object to be created
+ */
void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
{
if (nSlotId == SID_DRAW_RECT_ROUND ||
@@ -478,9 +440,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
nSlotId == SID_DRAW_SQUARE_ROUND ||
nSlotId == SID_DRAW_SQUARE_ROUND_NOFILL)
{
- /**********************************************************************
- * Abgerundete Ecken
- **********************************************************************/
+ // round corner
rAttr.Put(SdrEckenradiusItem(500));
}
else if (nSlotId == SID_CONNECTOR_LINE ||
@@ -491,9 +451,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
nSlotId == SID_CONNECTOR_LINE_CIRCLE_END ||
nSlotId == SID_CONNECTOR_LINE_CIRCLES)
{
- /**********************************************************************
- * Direkt-Verbinder
- **********************************************************************/
+ // direct connector
rAttr.Put(SdrEdgeKindItem(SDREDGE_ONELINE));
}
else if (nSlotId == SID_CONNECTOR_LINES ||
@@ -504,9 +462,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
nSlotId == SID_CONNECTOR_LINES_CIRCLE_END ||
nSlotId == SID_CONNECTOR_LINES_CIRCLES)
{
- /**********************************************************************
- * Linien-Verbinder
- **********************************************************************/
+ // line connector
rAttr.Put(SdrEdgeKindItem(SDREDGE_THREELINES));
}
else if (nSlotId == SID_CONNECTOR_CURVE ||
@@ -517,16 +473,12 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
nSlotId == SID_CONNECTOR_CURVE_CIRCLE_END ||
nSlotId == SID_CONNECTOR_CURVE_CIRCLES)
{
- /**********************************************************************
- * Kurven-Verbinder
- **********************************************************************/
+ // curve connector
rAttr.Put(SdrEdgeKindItem(SDREDGE_BEZIER));
}
else if ( nSlotId == SID_DRAW_CAPTION || nSlotId == SID_DRAW_CAPTION_VERTICAL )
{
- /**********************************************************************
- * Legendenobjekt
- **********************************************************************/
+ // legend object
Size aSize(pObj->GetLogicRect().GetSize());
rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) );
rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) );
@@ -547,9 +499,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
}
else if (nSlotId == SID_DRAW_MEASURELINE)
{
- /**********************************************************************
- * Masslinie
- **********************************************************************/
+ // dimension line
SdPage* pPage = (SdPage*) mpView->GetSdrPageView()->GetPage();
String aName(SdResId(STR_POOLSHEET_MEASURE));
SfxStyleSheet* pSheet = (SfxStyleSheet*) pPage->GetModel()->
@@ -572,12 +522,9 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
}
-/*************************************************************************
-|*
-|* Linienanfaenge und -enden fuer das zu erzeugende Objekt setzen
-|*
-\************************************************************************/
-
+/**
+ * set line starts and ends for the object to be created
+ */
::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc )
{
::basegfx::B2DPolyPolygon aRetval;
@@ -617,11 +564,9 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
nSlotId == SID_LINE_ARROW_SQUARE ||
nSlotId == SID_LINE_SQUARE_ARROW )
{
- /**************************************************************
- * Linienanfaenge und -enden attributieren
- **************************************************************/
+ // set attributes of line start and ends
- // Pfeilspitze
+ // arrowhead
::basegfx::B2DPolyPolygon aArrow( getPolygon( RID_SVXSTR_ARROW, mpDoc ) );
if( !aArrow.count() )
{
@@ -633,7 +578,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
aArrow.append(aNewArrow);
}
- // Kreis
+ // Circles
::basegfx::B2DPolyPolygon aCircle( getPolygon( RID_SVXSTR_CIRCLE, mpDoc ) );
if( !aCircle.count() )
{
@@ -643,7 +588,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
aCircle.append(aNewCircle);
}
- // Quadrat
+ // Square
::basegfx::B2DPolyPolygon aSquare( getPolygon( RID_SVXSTR_SQUARE, mpDoc ) );
if( !aSquare.count() )
{
@@ -664,7 +609,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
// it was decided to change the default to 0.03 cm for all situations.
long nWidth = 300; // (1/100th mm)
- // Linienstaerke ermitteln und daraus die Linienendenstaerke berechnen
+ // determine line width and calculate with it the line end width
if( aSet.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE )
{
long nValue = ( ( const XLineWidthItem& ) aSet.Get( XATTR_LINEWIDTH ) ).GetValue();
@@ -680,7 +625,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_CURVE_ARROWS:
case SID_LINE_ARROWS:
{
- // Verbinder mit Pfeil-Enden
+ // connector with arrow ends
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
@@ -696,7 +641,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROW_CIRCLE:
case SID_LINE_ARROW_SQUARE:
{
- // Verbinder mit Pfeil-Anfang
+ // connector with arrow start
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
}
@@ -710,7 +655,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_CIRCLE_ARROW:
case SID_LINE_SQUARE_ARROW:
{
- // Verbinder mit Pfeil-Ende
+ // connector with arrow end
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineEndWidthItem(nWidth));
}
@@ -721,7 +666,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_LINES_CIRCLES:
case SID_CONNECTOR_CURVE_CIRCLES:
{
- // Verbinder mit Kreis-Enden
+ // connector with circle ends
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
@@ -734,7 +679,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_LINES_CIRCLE_START:
case SID_CONNECTOR_CURVE_CIRCLE_START:
{
- // Verbinder mit Kreis-Anfang
+ // connector with circle start
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
}
@@ -745,19 +690,19 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_LINES_CIRCLE_END:
case SID_CONNECTOR_CURVE_CIRCLE_END:
{
- // Verbinder mit Kreis-Ende
+ // connector with circle ends
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
};
- // Und nochmal fuer die noch fehlenden Enden
+ // and again, for the still missing ends
switch (nSlotId)
{
case SID_LINE_ARROW_CIRCLE:
{
- // Kreis-Ende
+ // circle end
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
@@ -765,7 +710,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_CIRCLE_ARROW:
{
- // Kreis-Anfang
+ // circle start
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
}
@@ -773,7 +718,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROW_SQUARE:
{
- // Quadrat-Ende
+ // square end
rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineEndWidthItem(nWidth));
}
@@ -781,7 +726,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_SQUARE_ARROW:
{
- // Quadrat-Anfang
+ // square start
rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineStartWidthItem(nWidth));
}
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 3f925c8..2492a53 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -45,11 +45,6 @@ namespace sd {
TYPEINIT1( FuConstruct, FuDraw );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstruct::FuConstruct (
ViewShell* pViewSh,
@@ -67,11 +62,6 @@ void FuConstruct::DoExecute( SfxRequest& rReq )
FuDraw::DoExecute( rReq );
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -113,11 +103,6 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
@@ -143,11 +128,6 @@ sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
return sal_True;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -208,9 +188,7 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
Abs(aPnt.X() - aMDPos.X()) < nDrgLog &&
Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
- /**************************************************************
- * Toggle zw. Selektion und Rotation
- **************************************************************/
+ // toggle between selection and rotation
SdrObject* pSingleObj = NULL;
sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
@@ -244,15 +222,10 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = sal_False;
@@ -263,11 +236,6 @@ sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstruct::Activate()
{
@@ -275,11 +243,6 @@ void FuConstruct::Activate()
FuDraw::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstruct::Deactivate()
{
@@ -287,12 +250,9 @@ void FuConstruct::Deactivate()
mpView->SetEditMode(SDREDITMODE_EDIT);
}
-/*************************************************************************
-|*
-|* StyleSheet fuer das zu erzeugende Objekt setzen
-|*
-\************************************************************************/
-
+/**
+ * set style sheet for the object to be created
+ */
void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj)
{
sal_Bool bUseFillStyle, bUseNoFillStyle;
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 7be6622..228f783 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -45,11 +45,6 @@ namespace sd {
TYPEINIT1( FuConstructUnoControl, FuConstruct );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuConstructUnoControl::FuConstructUnoControl (
ViewShell* pViewSh,
@@ -86,11 +81,6 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq )
ToolBarManager::msDrawingObjectToolBar);
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
{
sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
@@ -106,21 +96,11 @@ sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt)
{
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bReturn = sal_False;
@@ -139,25 +119,16 @@ sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
return (bReturn);
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
return(bReturn);
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuConstructUnoControl::Activate()
{
mpView->SetCurrentObj( nIdentifier, nInventor );
@@ -173,11 +144,6 @@ void FuConstructUnoControl::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuConstructUnoControl::Deactivate()
{
FuConstruct::Deactivate();
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index f33aade..a984535 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -43,11 +43,6 @@ namespace sd {
TYPEINIT1( FuCopy, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuCopy::FuCopy (
ViewShell* pViewSh,
@@ -83,7 +78,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
SfxItemSet aSet( mpViewShell->GetPool(),
ATTR_COPY_START, ATTR_COPY_END, 0 );
- // Farb-Attribut angeben
+ // indicate color attribute
SfxItemSet aAttr( mpDoc->GetPool() );
mpView->GetAttributes( aAttr );
const SfxPoolItem* pPoolItem = NULL;
@@ -124,7 +119,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
delete pDlg;
mpView->EndUndo();
}
- return; // Abbruch
+ return; // Cancel
}
delete( pDlg );
}
@@ -138,11 +133,11 @@ void FuCopy::DoExecute( SfxRequest& rReq )
sal_Bool bColor = sal_False;
const SfxPoolItem* pPoolItem = NULL;
- // Anzahl
+ // Count
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) )
nNumber = ( ( const SfxUInt16Item* ) pPoolItem )->GetValue();
- // Verschiebung
+ // translation
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) )
lSizeX = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) )
@@ -150,13 +145,13 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) )
lAngle = ( ( const SfxInt32Item* )pPoolItem )->GetValue();
- // Verrgroesserung / Verkleinerung
+ // scale
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) )
lWidth = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) )
lHeight = ( ( const SfxInt32Item* ) pPoolItem )->GetValue();
- // Startfarbe / Endfarbe
+ // start/end color
if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
{
aStartColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
@@ -171,7 +166,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
else
bColor = sal_False;
- // Handles wegnehmen
+ // remove handles
//HMHmpView->HideMarkHdl();
SfxProgress* pProgress = NULL;
@@ -192,7 +187,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
const sal_uLong nMarkCount = aMarkList.GetMarkCount();
SdrObject* pObj = NULL;
- // Anzahl moeglicher Kopien berechnen
+ // calculate number of possible copies
aRect = mpView->GetAllMarkedRect();
if( lWidth < 0L )
@@ -273,8 +268,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( bColor )
{
- // Koennte man sicher noch optimieren, wuerde aber u.U.
- // zu Rundungsfehlern fuehren
+ // probably room for optimizations, but may can lead to rounding errors
sal_uInt8 nRed = aStartColor.GetRed() + (sal_uInt8) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber );
sal_uInt8 nGreen = aStartColor.GetGreen() + (sal_uInt8) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber );
sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
@@ -292,7 +286,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if ( bWaiting )
mpDocSh->SetWaitCursor( sal_False );
- // Handles zeigen
+ // show handles
mpView->AdjustMarkHdl(); //HMH sal_True );
//HMHpView->ShowMarkHdl();
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 1ef4d09..9687e92 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -38,11 +38,6 @@ namespace sd {
TYPEINIT1( FuCustomShowDlg, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuCustomShowDlg::FuCustomShowDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index cea2e33..bb952019 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -70,12 +70,9 @@ namespace sd {
TYPEINIT1( FuDraw, FuPoor );
-/*************************************************************************
-|*
-|* Base-class for all drawmodul-specific functions
-|*
-\************************************************************************/
-
+/**
+ * Base-class for all drawmodul-specific functions
+ */
FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq) :
FuPoor(pViewSh, pWin, pView, pDoc, rReq),
@@ -85,22 +82,12 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
{
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
FuDraw::~FuDraw()
{
mpView->BrkAction();
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -226,11 +213,6 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
{
@@ -341,11 +323,6 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -383,14 +360,10 @@ sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
return sal_False;
}
-/*************************************************************************
-|*
-|* Process keyboard-events
-|*
-|* When processing a KeyEvent the returnvalue is sal_True, otherwise sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = sal_False;
@@ -414,14 +387,11 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
}
else
{
- // Falls IP-Client aktiv, werden die Pointer
- // auf das OLE- und das alte Graphic-Object
- // am SdClient zurueckgesetzt, damit bei
- // ::SelectionHasChanged nach dem Loeschen
- // nicht mehr versucht wird, ein Grafik-Objekt
- // zu restaurieren, das gar nicht mehr existiert.
- // Alle anderen OLE-Objekte sind davon nicht
- // betroffen
+ /* If IP-Client active, we reset the pointer to the OLE- and
+ to the old graphic object of SdClient. With this, we
+ avoid the restoration of an no more existing object in
+ ::SelectionHasChanged after deletion. All other OLE
+ objects are not affected. */
OSL_ASSERT (mpViewShell->GetViewShell()!=NULL);
Client* pIPClient = static_cast<Client*>(
mpViewShell->GetViewShell()->GetIPClient());
@@ -522,11 +492,6 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
return (bReturn);
}
-/*************************************************************************
-|*
-|* Aktivate function
-|*
-\************************************************************************/
void FuDraw::Activate()
{
@@ -534,11 +499,6 @@ void FuDraw::Activate()
ForcePointer();
}
-/*************************************************************************
-|*
-|* Deaktivate function
-|*
-\************************************************************************/
void FuDraw::Deactivate()
{
@@ -546,12 +506,9 @@ void FuDraw::Deactivate()
}
-/*************************************************************************
-|*
-|* Toggle mouse-pointer
-|*
-\************************************************************************/
-
+/**
+ * Toggle mouse-pointer
+ */
void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
Point aPnt;
@@ -574,9 +531,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
{
if (SD_MOD()->GetWaterCan() && !mpView->PickHandle(aPnt))
{
- /******************************************************************
- * Giesskannenmodus
- ******************************************************************/
+ // water can mode
bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_FILL));
}
@@ -587,18 +542,14 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (SD_MOD()->GetWaterCan() && !pHdl)
{
- /******************************************************************
- * Giesskannenmodus
- ******************************************************************/
+ // water can mode
bDefPointer = sal_False;
mpWindow->SetPointer(Pointer(POINTER_FILL));
}
else if (!pHdl &&
mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()))
{
- /******************************************************************
- * Pipettenmodus
- ******************************************************************/
+ // pipette mode
SvxBmpMask* pMask = (SvxBmpMask*) mpViewShell->GetViewFrame()->GetChildWindow(SvxBmpMaskChildWindow::GetChildWindowId())->GetWindow();
if (pMask && pMask->IsEyedropping())
@@ -661,12 +612,12 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (pObj && pMEvt && !pMEvt->IsMod2() && this->ISA(FuSelection))
{
- // Auf Animation oder ImageMap pruefen
+ // test for animation or ImageMap
bDefPointer = !SetPointer(pObj, aPnt);
if (bDefPointer && (pObj->ISA(SdrObjGroup) || pObj->ISA(E3dPolyScene)))
{
- // In die Gruppe hineinschauen
+ // take a glance into the group
if (mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
bDefPointer = !SetPointer(pObj, aPnt);
}
@@ -681,12 +632,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
-/*************************************************************************
-|*
-|* Set cursor for animaton or imagemap
-|*
-\************************************************************************/
-
+/**
+ * Set cursor for animaton or imagemap
+ */
sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
{
sal_Bool bSet = sal_False;
@@ -752,7 +700,7 @@ sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
( pInfo->meEffect != presentation::AnimationEffect_NONE ||
pInfo->meTextEffect != presentation::AnimationEffect_NONE )))))
{
- // Animations-Objekt
+ // Animation object
bSet = sal_True;
mpWindow->SetPointer(Pointer(POINTER_REFHAND));
}
@@ -774,12 +722,9 @@ sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
-/*************************************************************************
-|*
-|* Response of doubleclick
-|*
-\************************************************************************/
-
+/**
+ * Response of doubleclick
+ */
void FuDraw::DoubleClick(const MouseEvent& rMEvt)
{
sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
@@ -836,11 +781,6 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
}
-/*************************************************************************
-|*
-|* Help-event
-|*
-\************************************************************************/
sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
{
@@ -864,7 +804,7 @@ sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
if (!bReturn && (pObj->ISA(SdrObjGroup) || pObj->ISA(E3dPolyScene)))
{
- // In die Gruppe hineinschauen
+ // take a glance into the group
SdrPageView* pPV = NULL;
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(aPosPixel)));
@@ -885,19 +825,13 @@ sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
-/*************************************************************************
-|*
-|* Command-event
-|*
-\************************************************************************/
-
sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt)
{
sal_Bool bSet = sal_False;
String aHelpText;
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
- // URL fuer IMapObject unter Pointer ist Hilfetext
+ // URL for IMapObject underneath pointer is help text
if ( mpDoc->GetIMapInfo(pObj) )
{
IMapObject* pIMapObj = mpDoc->GetHitIMapObject(pObj, aPos, *mpWindow );
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index 6b27a46..4e7904e 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -33,11 +33,6 @@ namespace sd {
TYPEINIT1( FuDisplayOrder, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq)
@@ -46,11 +41,6 @@ FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::Vi
{
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
FuDisplayOrder::~FuDisplayOrder()
{
@@ -72,11 +62,6 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin
return xFunc;
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -86,11 +71,6 @@ sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
return sal_True;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
{
@@ -121,11 +101,6 @@ sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
return sal_True;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -152,11 +127,6 @@ sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
return sal_True;
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
void FuDisplayOrder::Activate()
{
@@ -164,11 +134,6 @@ void FuDisplayOrder::Activate()
mpWindow->SetPointer( Pointer( POINTER_REFHAND ) );
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
void FuDisplayOrder::Deactivate()
{
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index e304323..8a98b58 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -40,11 +40,6 @@ namespace sd {
TYPEINIT1( FuEditGluePoints, FuDraw );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuEditGluePoints::FuEditGluePoints (
ViewShell* pViewSh,
@@ -74,11 +69,6 @@ void FuEditGluePoints::DoExecute( SfxRequest& rReq )
ToolBarManager::msGluePointsToolBar);
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
FuEditGluePoints::~FuEditGluePoints()
{
@@ -87,11 +77,6 @@ FuEditGluePoints::~FuEditGluePoints()
mpView->SetInsGluePointMode(sal_False);
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -119,9 +104,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
if (eHit == SDRHIT_HANDLE)
{
- /******************************************************************
- * Handle draggen
- ******************************************************************/
+ // drag handle
SdrHdl* pHdl = aVEvt.pHdl;
if (mpView->IsGluePointMarked(aVEvt.pObj, aVEvt.nGlueId) && rMEvt.IsShift())
@@ -132,22 +115,18 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
if (pHdl)
{
- // Handle draggen
+ // drag handle
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog);
}
}
else if (eHit == SDRHIT_MARKEDOBJECT && mpView->IsInsGluePointMode())
{
- /******************************************************************
- * Klebepunkt einfuegen
- ******************************************************************/
+ // insert clue points
mpView->BegInsGluePoint(aMDPos);
}
else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
{
- /******************************************************************
- * Klebepunkt selektieren
- ******************************************************************/
+ // select clue points
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
@@ -155,16 +134,12 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
{
- /******************************************************************
- * Objekt verschieben
- ******************************************************************/
+ // move object
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, NULL, nDrgLog);
}
else if (eHit == SDRHIT_GLUEPOINT)
{
- /******************************************************************
- * Klebepunkt selektieren
- ******************************************************************/
+ // select clue points
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
@@ -178,9 +153,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- /******************************************************************
- * Objekt selektieren oder draggen
- ******************************************************************/
+ // select or drag object
if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SDRHIT_UNMARKEDOBJECT)
{
mpView->UnmarkAllObj();
@@ -203,14 +176,12 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
if (bMarked &&
(!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT))
{
- // Objekt verschieben
+ // move object
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog);
}
else if (mpView->AreObjectsMarked())
{
- /**************************************************************
- * Klebepunkt selektieren
- **************************************************************/
+ // select clue point
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
@@ -218,9 +189,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- /**************************************************************
- * Objekt selektieren
- **************************************************************/
+ // select object
mpView->BegMarkObj(aMDPos);
}
}
@@ -231,11 +200,6 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
{
@@ -256,11 +220,6 @@ sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
return sal_True;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
{
@@ -288,7 +247,7 @@ sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
if (eHit == SDRHIT_NONE)
{
- // Klick auf der Stelle: deselektieren
+ // click on position: deselect
mpView->UnmarkAllObj();
}
}
@@ -298,15 +257,10 @@ sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Tastaturereignisse bearbeiten
-|*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
-|* sal_False.
-|*
-\************************************************************************/
-
+/**
+ * Process keyboard input
+ * @returns sal_True if a KeyEvent is being processed, sal_False otherwise
+ */
sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
{
mpView->SetActualWin( mpWindow );
@@ -316,11 +270,6 @@ sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Command-event
-|*
-\************************************************************************/
sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt)
{
@@ -328,11 +277,6 @@ sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt)
return FuPoor::Command( rCEvt );
}
-/*************************************************************************
-|*
-|* Funktion aktivieren
-|*
-\************************************************************************/
void FuEditGluePoints::Activate()
{
@@ -340,11 +284,6 @@ void FuEditGluePoints::Activate()
FuDraw::Activate();
}
-/*************************************************************************
-|*
-|* Funktion deaktivieren
-|*
-\************************************************************************/
void FuEditGluePoints::Deactivate()
{
@@ -352,11 +291,6 @@ void FuEditGluePoints::Deactivate()
FuDraw::Deactivate();
}
-/*************************************************************************
-|*
-|* Request verarbeiten
-|*
-\************************************************************************/
void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq)
{
@@ -442,7 +376,7 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq)
break;
}
- // Zum Schluss Basisklasse rufen
+ // at the end, call base class
FuPoor::ReceiveRequest(rReq);
}
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index c29c498..2fe6e09 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -47,11 +47,6 @@ namespace sd {
TYPEINIT1( FuExpandPage, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuExpandPage::FuExpandPage (
ViewShell* pViewSh,
@@ -75,7 +70,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
if ( mpView && mpView->IsTextEdit() )
mpView->SdrEndTextEdit();
- // Selektierte Seite finden (nur Standard-Seiten)
+ // find selected page (only standard pages)
SdPage* pActualPage = NULL;
sal_uInt16 i = 0;
sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD);
@@ -115,11 +110,11 @@ void FuExpandPage::DoExecute( SfxRequest& )
if( bUndo )
mpView->BegUndo(String(SdResId(STR_UNDO_EXPAND_PAGE)));
- // Aktuelles Gliederungsobjekt in Outliner setzen
+ // set current structuring-object into outliner
OutlinerParaObject* pParaObj = pActualOutline->GetOutlinerParaObject();
pOutl->SetText(*pParaObj);
- // Harte Absatz- und Zeichenattribute entfernen
+ // remove hard paragraph- and character attributes
SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END);
sal_uLong nParaCount1 = pOutl->GetParagraphCount();
@@ -138,7 +133,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) nParaPos );
if ( nDepth == 0 )
{
- // Seite mit Titel & Gliederung!
+ // page with title & structuring!
SdPage* pPage = (SdPage*) mpDoc->AllocPage(sal_False);
pPage->SetSize(pActualPage->GetSize() );
pPage->SetBorder(pActualPage->GetLftBorder(),
@@ -147,20 +142,20 @@ void FuExpandPage::DoExecute( SfxRequest& )
pActualPage->GetLwrBorder() );
pPage->SetName(String());
- // Seite hinter aktueller Seite einfuegen
+ // insert page after current page
mpDoc->InsertPage(pPage, nActualPageNum + nPos);
nPos++;
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pPage));
- // MasterPage der aktuellen Seite verwenden
+ // use MasterPage of the current page
pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage());
pPage->SetLayoutName(pActualPage->GetLayoutName());
pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
- // Notiz-Seite
+ // notes-page
SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False);
pNotesPage->SetSize(pActualNotesPage->GetSize());
pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(),
@@ -170,20 +165,20 @@ void FuExpandPage::DoExecute( SfxRequest& )
pNotesPage->SetPageKind(PK_NOTES);
pNotesPage->SetName(String());
- // Seite hinter aktueller Seite einfuegen
+ // insert page after current page
mpDoc->InsertPage(pNotesPage, nActualPageNum + nPos);
nPos++;
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
- // MasterPage der aktuellen Seite verwenden
+ // use MasterPage of the current page
pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage());
pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName());
pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True);
pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
- // Title-Textobjekt erstellen
+ // create title text objects
SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE);
OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (sal_uInt16) nParaPos, 1);
@@ -214,7 +209,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
if (nChildCount > 0)
{
- // Gliederungs-Textobjekt erstellen
+ // create structuring text objects
SdrTextObj* pOutlineObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_OUTLINE);
pPara = pOutl->GetParagraph( ++nParaPos );
@@ -239,7 +234,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pOutlineObj->SetOutlinerParaObject( pOPO );
pOutlineObj->SetEmptyPresObj(sal_False);
- // Harte Attribute entfernen (Flag auf sal_True)
+ // remove hard attributes (Flag to sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
aAttr.Put(XLineStyleItem(XLINE_NONE));
aAttr.Put(XFillStyleItem(XFILL_NONE));
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index b75df1f..3149512 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -54,11 +54,6 @@ class ViewShell;
TYPEINIT1( FuHangulHanjaConversion, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuHangulHanjaConversion::FuHangulHanjaConversion (
ViewShell* pViewSh,
@@ -87,12 +82,6 @@ FuHangulHanjaConversion::FuHangulHanjaConversion (
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuHangulHanjaConversion::~FuHangulHanjaConversion()
{
if (pSdOutliner)
@@ -108,12 +97,9 @@ FunctionReference FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd::Win
return xFunc;
}
-/*************************************************************************
-|*
-|* Suchen&Ersetzen
-|*
-\************************************************************************/
-
+/**
+ * Search and replace
+ */
void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive )
{
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 1ea0167..e9bb90c 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -89,12 +89,6 @@ TYPEINIT1( FuInsertClipboard, FuPoor );
TYPEINIT1( FuInsertOLE, FuPoor );
TYPEINIT1( FuInsertAVMedia, FuPoor );
-/*************************************************************************
-|*
-|* FuInsertGraphic::Konstruktor
-|*
-\************************************************************************/
-
FuInsertGraphic::FuInsertGraphic (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -160,11 +154,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& )
}
}
-/*************************************************************************
-|*
-|* FuInsertClipboard::Konstruktor
-|*
-\************************************************************************/
FuInsertClipboard::FuInsertClipboard (
ViewShell* pViewSh,
@@ -238,11 +227,6 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
}
-/*************************************************************************
-|*
-|* FuInsertOLE::Konstruktor
-|*
-\************************************************************************/
FuInsertOLE::FuInsertOLE (
ViewShell* pViewSh,
@@ -271,10 +255,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
SdrObject* pPickObj = mpView->GetEmptyPresentationObject( ePresObjKind );
- /**********************************************************************
- * Diagramm oder StarCalc-Tabelle einfuegen
- **********************************************************************/
-
+ // insert diagram or Calc table
::rtl::OUString aObjName;
SvGlobalName aName;
if (nSlotId == SID_INSERT_DIAGRAM)
@@ -318,7 +299,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if (aSize.Height() == 0 || aSize.Width() == 0)
{
- // Rechteck mit ausgewogenem Kantenverhaeltnis
+ // rectangle with balanced edge ratio
aSize.Width() = 14100;
aSize.Height() = 10000;
Size aTmp = OutputDevice::LogicToLogic( aSize, MAP_100TH_MM, aUnit );
@@ -400,9 +381,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
}
else
{
- /**********************************************************************
- * Objekt einfuegen
- **********************************************************************/
+ // insert object
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
sal_Bool bCreateNew = sal_False;
uno::Reference < embed::XEmbeddedObject > xObj;
@@ -494,7 +473,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
}
else
{
- // PlugIn konnte nicht erzeugt werden
+ // unable to create PlugIn
String aStrErr( SdResId( STR_ERROR_OBJNOCREATE_PLUGIN ) );
String aMask;
aMask += sal_Unicode('%');
@@ -535,7 +514,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) );
if (aSize.Height() == 0 || aSize.Width() == 0)
{
- // Rechteck mit ausgewogenem Kantenverhaeltnis
+ // rectangle with balanced edge ratio
aSize.Width() = 14100;
aSize.Height() = 10000;
Size aTmp = OutputDevice::LogicToLogic( aSize, MAP_100TH_MM, aMapUnit );
@@ -551,9 +530,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if ( mpView->AreObjectsMarked() )
{
- /**********************************************************
- * Ist ein leeres OLE-Objekt vorhanden?
- **********************************************************/
+ // as an empty OLE object available?
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
if (rMarkList.GetMarkCount() == 1)
@@ -566,9 +543,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
{
if ( !( (SdrOle2Obj*) pObj)->GetObjRef().is() )
{
- /**************************************************
- * Das leere OLE-Objekt bekommt ein neues IPObj
- **************************************************/
+ // the empty OLE object gets a new IPObj
bInsertNewObject = sal_False;
pObj->SetEmptyPresObj(sal_False);
( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL);
@@ -596,9 +571,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if (bInsertNewObject)
{
- /**************************************************************
- * Ein neues OLE-Objekt wird erzeugt
- **************************************************************/
+ // we create a new OLE object
SdrPageView* pPV = mpView->GetSdrPageView();
Size aPageSize = pPV->GetPage()->GetSize();
@@ -672,11 +645,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
}
-/*************************************************************************
-|*
-|* FuInsertAVMedia::Konstruktor
-|*
-\************************************************************************/
FuInsertAVMedia::FuInsertAVMedia(
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 2b1a0f7..40d4eed 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -74,11 +74,6 @@ namespace sd {
TYPEINIT1( FuInsertFile, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuInsertFile::FuInsertFile (
ViewShell* pViewSh,
@@ -333,8 +328,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( !pDlg )
return sal_False;
- // Ev. wird eine QueryBox geoeffnet ("Links aktualisieren?"),
- // daher wird der Dialog der aktuelle DefModalDialogParent
+ /* Maybe a QueryBox is opened ("update links?"), therefore the dialog
+ becomes the current DefModalDialogParent */
::Window* pDefParent = GetpApp()->GetDefDialogParent();
GetpApp()->SetDefDialogParent(pDlg->GetWindow());
@@ -346,9 +341,9 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( nRet == RET_OK )
{
- // Liste mit Seitennamen (wenn NULL, dann alle Seiten)
- // Zuerst Seiten einfuegen
- std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // Seiten
+ /* list with page names (if NULL, then all pages)
+ First, insert pages */
+ std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // pages
sal_Bool bLink = pDlg->IsLink();
sal_Bool bReplace = sal_False;
SdPage* pPage = NULL;
@@ -379,16 +374,16 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
sal_Bool bNameOK;
std::vector<rtl::OUString> aExchangeList;
- std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // Objekte
+ std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects
- // Es werden ausgewaehlte Seiten und/oder ausgewaehlte Objekte oder
- // alles eingefuegt, wenn pBookmarkList NULL ist!
+ /* if pBookmarkList is NULL, we insert selected pages, and/or selected
+ objects or everything. */
if( !aBookmarkList.empty() || aObjectBookmarkList.empty() )
{
- // Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden
- // die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste
- // aufgenommen
- // bNameOK == sal_False -> Benutzer hat abgebrochen
+ /* To ensure that all page names are unique, we check the ones we
+ want to insert and insert them into a substitution list if
+ necessary.
+ bNameOK is sal_False if the user has canceled. */
bNameOK = mpView->GetExchangeList( aExchangeList, aBookmarkList, 0 );
if( bNameOK )
@@ -400,7 +395,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
aExchangeList.clear();
}
- // Um zu gewaehrleisten... (s.o.)
+ // to ensure ... (see above)
bNameOK = mpView->GetExchangeList( aExchangeList, aObjectBookmarkList, 1 );
if( bNameOK )
@@ -432,7 +427,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
if( nRet == RET_OK )
{
- // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text)
+ // selected file format: text, RTF or HTML (default is text)
sal_uInt16 nFormat = EE_FORMAT_TEXT;
if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
@@ -440,16 +435,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND )
nFormat = EE_FORMAT_HTML;
- // einen eigenen Outliner erzeugen, denn:
- // der Dokument-Outliner koennte gerade vom Gliederungsmodus
- // benutzt werden;
- // der Draw-Outliner der Drawing Engine koennte zwischendurch
- // was zeichnen muessen;
- // der globale Outliner koennte in SdPage::CreatePresObj
- // benutzt werden
+ /* create our own outline since:
+ - it is possible that the document outliner is actually used in the
+ structuring mode
+ - the draw outliner of the drawing engine has to draw something in
+ between
+ - the global outliner could be used in SdPage::CreatePresObj */
SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
- // Referenz-Device setzen
+ // set reference device
pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage();
@@ -472,16 +466,16 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
}
else
{
- // ist es eine Masterpage?
+ // is it a master page?
if (static_cast<DrawViewShell*>(mpViewShell)->GetEditMode() == EM_MASTERPAGE &&
!pPage->IsMasterPage())
{
pPage = (SdPage*)(&(pPage->TRG_GetMasterPage()));
}
- DBG_ASSERT(pPage, "Seite nicht gefunden");
+ DBG_ASSERT(pPage, "page not found");
- // wenn gerade editiert wird, in dieses Textobjekt einfliessen lassen
+ // if editing is going on right now, let it flow into this text object
OutlinerView* pOutlinerView = mpView->GetTextEditOutlinerView();
if( pOutlinerView )
{
@@ -491,7 +485,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
pObj->GetObjIdentifier() == OBJ_TITLETEXT &&
pOutliner->GetParagraphCount() > 1 )
{
- // In Titelobjekten darf nur ein Absatz vorhanden sein
+ // in title objects, only one paragraph is allowed
while ( pOutliner->GetParagraphCount() > 1 )
{
Paragraph* pPara = pOutliner->GetParagraph( 0 );
@@ -519,15 +513,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
mpView->BegUndo(String(SdResId(STR_UNDO_INSERT_TEXTFRAME)));
pPage->InsertObject(pTO);
- // koennte groesser sein als die max. erlaubte Groesse:
- // falls noetig, die Objektgroesse begrenzen
+ /* can be bigger as the maximal allowed size:
+ limit object size if necessary */
Size aSize(pOutliner->CalcTextSize());
Size aMaxSize = mpDoc->GetMaxObjSize();
aSize.Height() = Min(aSize.Height(), aMaxSize.Height());
aSize.Width() = Min(aSize.Width(), aMaxSize.Width());
aSize = mpWindow->LogicToPixel(aSize);
- // in der Mitte des Fensters absetzen
+ // put it at the center of the window
Size aTemp(mpWindow->GetOutputSizePixel());
Point aPos(aTemp.Width() / 2, aTemp.Height() / 2);
aPos.X() -= aSize.Width() / 2;
@@ -558,7 +552,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
{
- // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text)
+ // selected file format: text, RTF or HTML (default is text)
sal_uInt16 nFormat = EE_FORMAT_TEXT;
if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND )
@@ -573,13 +567,13 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
Paragraph* pPara = aSelList.empty() ? NULL : *(aSelList.begin());
- // wo soll eingefuegt werden?
+ // what should we insert?
while( !pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
pPara = pDocliner->GetParent(pPara);
sal_uLong nTargetPos = pDocliner->GetAbsPos(pPara) + 1;
- // Layout der Vorgaengerseite uebernehmen
+ // apply layout of predecessor page
sal_uInt16 nPage = 0;
pPara = pDocliner->GetParagraph( pDocliner->GetAbsPos( pPara ) - 1 );
while (pPara)
@@ -593,17 +587,16 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
aLayoutName = pPage->GetLayoutName();
aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR));
- // einen eigenen Outliner erzeugen, denn:
- // der Dokument-Outliner koennte gerade vom Gliederungsmodus
- // benutzt werden;
- // der Draw-Outliner der Drawing Engine koennte zwischendurch
- // was zeichnen muessen;
- // der globale Outliner koennte in SdPage::CreatePresObj
- // benutzt werden
+ /* create our own outline since:
+ - it is possible that the document outliner is actually used in the
+ structuring mode
+ - the draw outliner of the drawing engine has to draw something in
+ between
+ - the global outliner could be used in SdPage::CreatePresObj */
::Outliner* pOutliner = new ::Outliner( &mpDoc->GetItemPool(), OUTLINERMODE_OUTLINEOBJECT );
pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool());
- // Referenz-Device setzen
+ // set reference device
pOutliner->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh ));
pOutliner->SetPaperSize(Size(0x7fffffff, 0x7fffffff));
@@ -623,7 +616,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
{
sal_uLong nParaCount = pOutliner->GetParagraphCount();
- // fuer Fortschrittsanzeige: Anzahl der Ebene-0-Absaetze
+ // for progress bar: number of level-0-paragraphs
sal_uInt16 nNewPages = 0;
pPara = pOutliner->GetParagraph( 0 );
while (pPara)
@@ -653,7 +646,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
sal_uLong nPos = pOutliner->GetAbsPos( pSourcePara );
sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nPos );
- // den letzte Absatz nur uebernehmen, wenn er gefuellt ist
+ // only take the last paragraph if it is filled
if (nSourcePos < nParaCount - 1 ||
pOutliner->GetText(pSourcePara).Len() > 0)
{
@@ -695,7 +688,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
{
OutlineView* pOlView = static_cast<OutlineView*>(mpView);
- // Outliner-Inhalte ins SdDrawDocument uebertragen
+ // transfer Outliner content to SdDrawDocument
pOlView->PrepareClose();
// einlesen wie im Zeichenmodus
@@ -703,7 +696,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
{
::Outliner* pOutliner = pOlView->GetViewByWindow(mpWindow)->GetOutliner();
- // Benachrichtigungs-Links temporaer trennen
+ // cut notification links temporarily
Link aOldParagraphInsertedHdl = pOutliner->GetParaInsertedHdl();
pOutliner->SetParaInsertedHdl( Link(NULL, NULL));
Link aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl();
@@ -721,7 +714,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
pOutliner->Clear();
pOlView->FillOutliner();
- // Links wieder setzen
+ // set links again
pOutliner->SetParaInsertedHdl(aOldParagraphInsertedHdl);
pOutliner->SetParaRemovingHdl(aOldParagraphRemovingHdl);
pOutliner->SetDepthChangedHdl(aOldDepthChangedHdl);
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 1df7970..3e1d9d0 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -41,11 +41,6 @@ namespace sd {
TYPEINIT1( FuLine, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuLine::FuLine (
ViewShell* pViewSh,
@@ -87,7 +82,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
}
- // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden
+ // some attributes are changed, we have to update the listboxes in the objectbars
static sal_uInt16 SidArray[] = {
SID_ATTR_LINE_STYLE,
SID_ATTR_LINE_DASH,
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 5d13cc7..efe9a3f 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -40,11 +40,6 @@ namespace sd {
TYPEINIT1( FuLineEnd, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuLineEnd::FuLineEnd(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
@@ -81,21 +76,21 @@ void FuLineEnd::DoExecute( SfxRequest& )
if( aInfoRec.bCanConvToPath &&
pObj->GetObjInventor() == SdrInventor &&
pObj->GetObjIdentifier() != OBJ_GRUP )
- // bCanConvToPath ist bei Gruppenobjekten sal_True,
- // stuerzt aber bei ConvertToPathObj() ab !
+ // bCanConvToPath is sal_True for group objects,
+ // but it crashes on ConvertToPathObj()!
{
pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False );
if( !pNewObj || !pNewObj->ISA( SdrPathObj ) )
- return; // Abbruch, zusaetzliche Sicherheit, die bei
- // Gruppenobjekten aber nichts bringt.
+ return; // Cancel, additional security, but it does not help
+ // for group objects
}
- else return; // Abbruch
+ else return; // Cancel
}
const ::basegfx::B2DPolyPolygon aPolyPolygon = ( (SdrPathObj*) pNewObj )->GetPathPoly();
- // Loeschen des angelegten PolyObjektes
+ // Delete the created poly-object
SdrObject::Free( pConvPolyObj );
XLineEndListRef pLineEndList = mpDoc->GetLineEndList();
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 08fe55c..c767083 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -37,11 +37,6 @@ namespace sd {
TYPEINIT1( FuLink, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuLink::FuLink (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 03e8864..131b087 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -30,11 +30,6 @@ namespace sd {
TYPEINIT1( FuMeasureDlg, FuPoor );
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
FuMeasureDlg::FuMeasureDlg (
ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index eb1d1be..6f43290 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -50,9 +50,7 @@ namespace sd {
#define ITEMVALUE( ItemSet, Id, Cast ) ( ( (const Cast&) (ItemSet).Get( (Id) ) ).GetValue() )
TYPEINIT1( FuMorph, FuPoor );
-//////////////////////////////////////////////////////////////////////////////
-// constructor
-//
+
FuMorph::FuMorph (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -82,17 +80,17 @@ void FuMorph::DoExecute( SfxRequest& )
if(rMarkList.GetMarkCount() == 2)
{
- // Clones erzeugen
+ // create clones
SdrObject* pObj1 = rMarkList.GetMark(0)->GetMarkedSdrObj();
SdrObject* pObj2 = rMarkList.GetMark(1)->GetMarkedSdrObj();
SdrObject* pCloneObj1 = pObj1->Clone();
SdrObject* pCloneObj2 = pObj2->Clone();
- // Text am Clone loeschen, da wir sonst kein richtiges PathObj bekommen
+ // delete text at clone, otherwise we do net get a correct PathObj
pCloneObj1->SetOutlinerParaObject(NULL);
pCloneObj2->SetOutlinerParaObject(NULL);
- // Path-Objekte erzeugen
+ // create path objects
SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(sal_False, sal_False);
SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(sal_False, sal_False);
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
@@ -124,7 +122,7 @@ void FuMorph::DoExecute( SfxRequest& )
aPolyPoly2.append(((SdrPathObj*)pObj)->GetPathPoly());
}
- // Morphing durchfuehren
+ // perform morphing
if(aPolyPoly1.count() && aPolyPoly2.count())
{
aPolyPoly1 = ::basegfx::tools::correctOrientations(aPolyPoly1);
@@ -241,9 +239,9 @@ void FuMorph::DoExecute( SfxRequest& )
}
}
-//////////////////////////////////////////////////////////////////////////////
-// make the point count of the polygons equal in adding points
-//
+/**
+ * make the point count of the polygons equal in adding points
+ */
void FuMorph::ImpEqualizePolyPointCount(
::basegfx::B2DPolygon& rSmall,
const ::basegfx::B2DPolygon& rBig
@@ -277,8 +275,7 @@ void FuMorph::ImpEqualizePolyPointCount(
rSmall = aPoly2;
}
-//////////////////////////////////////////////////////////////////////////////
-//
+
sal_uInt32 FuMorph::ImpGetNearestIndex(
const ::basegfx::B2DPolygon& rPoly,
const ::basegfx::B2DPoint& rPos
@@ -301,9 +298,9 @@ sal_uInt32 FuMorph::ImpGetNearestIndex(
return nActInd;
}
-//////////////////////////////////////////////////////////////////////////////
-// add to a point reduced polys until count is same
-//
+/**
+ * add to a point reduced polys until count is same
+ */
void FuMorph::ImpAddPolys(
::basegfx::B2DPolyPolygon& rSmaller,
const ::basegfx::B2DPolyPolygon& rBigger
@@ -331,9 +328,9 @@ void FuMorph::ImpAddPolys(
}
}
-//////////////////////////////////////////////////////////////////////////////
-// create group object with morphed polygons
-//
+/**
+ * create group object with morphed polygons
+ */
void FuMorph::ImpInsertPolygons(
B2DPolyPolygonList_impl& rPolyPolyList3D,
sal_Bool bAttributeFade,
@@ -412,7 +409,7 @@ void FuMorph::ImpInsertPolygons(
const ::basegfx::B2DPolyPolygon& rPolyPoly3D = *rPolyPolyList3D[ i ];
SdrPathObj* pNewObj = new SdrPathObj(OBJ_POLY, rPolyPoly3D);
- // Linienfarbe
+ // line color
if ( bLineColor )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list