diff options
| author | Urs Fässler <urs@bitzgi.ch> | 2013-03-12 20:27:21 +0100 |
|---|---|---|
| committer | Urs Fässler <urs@bitzgi.ch> | 2013-03-12 20:32:51 +0100 |
| commit | c4054a89e6805f5395df2dac879d2331cd5d0cf1 (patch) | |
| tree | 9a10421171025298b2f496b9c0b846b1ee52bed3 | |
| parent | f16d3484a723e33c6fee56f34ec00981f0dbd5af (diff) | |
translation and cleanup of comments in sd/source/ui/func/
Change-Id: Id2603c4d3340a220708272b4b8f73e2a59f36f5b
54 files changed, 486 insertions, 1594 deletions
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 0f58c1cd61f7..091fb525f628 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 345138393753..bf1727480388 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 2d8ac1d503dd..2a2321213076 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 41e96fc49765..c288767a55a6 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 3b853992f0b4..1d293edc4507 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 6a6f290094a1..9a365a826e41 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 9ae1ffc0f9f5..4ee9ca3f39bc 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 8109f9a2c3f7..ab7c3b369cdf 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 10a45b26e30d..3b3d8b2426de 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 333d8f71b571..628b70506365 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 3f925c8e9c84..2492a5335da3 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 7be66229c2a0..228f783ddaf0 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 f33aadecb03c..a9845356aec3 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 1ef4d09f2218..9687e9205bc3 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 cea2e3334c79..bb952019358c 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 6b27a460e82a..4e7904eabfba 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 e304323386e7..8a98b588f6df 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 c29c498f4a1d..2fe6e0984166 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 b75df1f575d6..31495124840c 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 1ea0167f3811..e9bb90c84319 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 2b1a0f7686f8..40d4eede8c42 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 1df79704c489..3e1d9d02ed7f 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 5d13cc7238d6..efe9a3f29f09 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 08fe55c135a3..c767083b1fc7 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 03e8864337d9..131b08753675 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 eb1d1be9996b..6f432909a83c 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 ) { const basegfx::BColor aLineColor(basegfx::interpolate(aStartLineCol.getBColor(), aEndLineCol.getBColor(), fFactor)); @@ -421,7 +418,7 @@ void FuMorph::ImpInsertPolygons( else if ( bIgnoreLine ) aSet.Put( XLineStyleItem( XLINE_NONE ) ); - // Fuellfarbe + // fill color if ( bFillColor ) { const basegfx::BColor aFillColor(basegfx::interpolate(aStartFillCol.getBColor(), aEndFillCol.getBColor(), fFactor)); @@ -430,7 +427,7 @@ void FuMorph::ImpInsertPolygons( else if ( bIgnoreFill ) aSet.Put( XFillStyleItem( XFILL_NONE ) ); - // Linienstaerke + // line width if ( bLineWidth ) aSet.Put( XLineWidthItem( nStartLineWidth + (long) ( fFactor * fDelta + 0.5 ) ) ); @@ -449,9 +446,9 @@ void FuMorph::ImpInsertPolygons( } } -////////////////////////////////////////////////////////////////////////////// -// create single morphed PolyPolygon -// +/** + * create single morphed PolyPolygon + */ ::basegfx::B2DPolyPolygon* FuMorph::ImpCreateMorphedPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, @@ -482,9 +479,9 @@ void FuMorph::ImpInsertPolygons( return pNewPolyPolygon; } -////////////////////////////////////////////////////////////////////////////// -// create morphed PolyPolygons -// +/** + * create morphed PolyPolygons + */ sal_Bool FuMorph::ImpMorphPolygons( const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 4552f15e056a..bb031057ad82 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -51,15 +51,10 @@ namespace sd { TYPEINIT1( FuObjectAnimationParameters, FuPoor ); -#define ATTR_MISSING 0 // Attribut nicht verfuegbar -#define ATTR_MIXED 1 // Attribut uneindeutig (bei Mehrfachselektion) -#define ATTR_SET 2 // Attribut eindeutig +#define ATTR_MISSING 0 ///< Attribute missing +#define ATTR_MIXED 1 ///< Attribute ambiguous (on multi-selection) +#define ATTR_SET 2 ///< Attribute unique -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ FuObjectAnimationParameters::FuObjectAnimationParameters ( ViewShell* pViewSh, @@ -127,7 +122,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdAnimationInfo* pInfo; SdrMark* pMark; - // das erste Objekt untersuchen + // inspect first object pMark = rMarkList.GetMark(0); pInfo = mpDoc->GetAnimationInfo(pMark->GetMarkedSdrObj()); if( pInfo ) @@ -181,7 +176,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) nSecondPlayFullSet = ATTR_SET; } - // ggfs. weitere Objekte untersuchen + // if necessary, inspect more objects for( nObject = 1; nObject < nCount; nObject++ ) { pMark = rMarkList.GetMark( nObject ); @@ -289,8 +284,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) } } - // Genau zwei Objekte mit Pfadeffekt? Dann gilt nur die Animationsinfo - // am bewegten Objekt. + /* Exactly two objects with path effect? + Then, only the animation info at the moved object is valid. */ if (nCount == 2) { SdrObject* pObject1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -302,18 +297,18 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo = NULL; if (pObject1->GetObjInventor() == SdrInventor && - ((eKind1 == OBJ_LINE) || // 2-Punkt-Linie + ((eKind1 == OBJ_LINE) || // 2 point line (eKind1 == OBJ_PLIN) || // Polygon - (eKind1 == OBJ_PATHLINE)) && // Bezier-Kurve + (eKind1 == OBJ_PATHLINE)) && // Bezier curve (pInfo2 && pInfo2->meEffect == presentation::AnimationEffect_PATH)) { pInfo = pInfo2; } if (pObject2->GetObjInventor() == SdrInventor && - ((eKind2 == OBJ_LINE) || // 2-Punkt-Linie + ((eKind2 == OBJ_LINE) || // 2 point line (eKind2 == OBJ_PLIN) || // Polygon - (eKind2 == OBJ_PATHLINE)) && // Bezier-Kurve + (eKind2 == OBJ_PATHLINE)) && // Bezier curve (pInfo1 && pInfo1->meEffect == presentation::AnimationEffect_PATH)) { pInfo = pInfo1; @@ -344,10 +339,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if(!pArgs) { - // ItemSet fuer Dialog fuellen + // fill ItemSet for dialog SfxItemSet aSet(mpDoc->GetPool(), ATTR_ANIMATION_START, ATTR_ACTION_END); - // das Set besetzen + // fill the set if (nAnimationSet == ATTR_SET) aSet.Put( SfxBoolItem( ATTR_ANIMATION_ACTIVE, bActive)); else if (nAnimationSet == ATTR_MIXED) @@ -469,7 +464,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) return; } - // Auswertung des ItemSets + // evaluation of the ItemSets if (pArgs->GetItemState(ATTR_ANIMATION_ACTIVE) == SFX_ITEM_SET) { bActive = ((SfxBoolItem&)pArgs->Get(ATTR_ANIMATION_ACTIVE)).GetValue(); @@ -605,7 +600,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else nSecondPlayFullSet = ATTR_MISSING; - // Wenn irgendwelche Attribute ausgewaehlt wurden + // if any attribute is chosen if (nEffectSet == ATTR_SET || nTextEffectSet == ATTR_SET || nSpeedSet == ATTR_SET || @@ -623,19 +618,19 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) nSecondSoundOnSet == ATTR_SET || nSecondPlayFullSet == ATTR_SET) { - // String fuer Undo-Group und List-Action + // String for undo-group and list-action String aComment(SdResId(STR_UNDO_ANIMATION)); - // bei 'an Kurve entlang' gibt's noch eine extra UndoAction, darum - // hier klammern + // with 'following curves', we have an additional UndoAction + // therefore cling? here pUndoMgr->EnterListAction(aComment, aComment); - // Undo Gruppe erzeugen + // create undo group SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc); pUndoGroup->SetComment(aComment); - // fuer den Pfad-Effekt einige Dinge merken + // for the path effect, remember some stuff SdrObject* pRunningObj = NULL; SdrPathObj* pPath = NULL; if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) @@ -647,18 +642,18 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier(); if (pObject1->GetObjInventor() == SdrInventor && - ((eKind1 == OBJ_LINE) || // 2-Punkt-Linie + ((eKind1 == OBJ_LINE) || // 2 point line (eKind1 == OBJ_PLIN) || // Polygon - (eKind1 == OBJ_PATHLINE))) // Bezier-Kurve + (eKind1 == OBJ_PATHLINE))) // Bezier curve { pPath = (SdrPathObj*)pObject1; pRunningObj = pObject2; } if (pObject2->GetObjInventor() == SdrInventor && - ((eKind2 == OBJ_LINE) || // 2-Punkt-Linie + ((eKind2 == OBJ_LINE) || // 2 point line (eKind2 == OBJ_PLIN) || // Polygon - (eKind2 == OBJ_PATHLINE))) // Bezier-Kurve + (eKind2 == OBJ_PATHLINE))) // Bezier curve { pPath = (SdrPathObj*)pObject2; pRunningObj = pObject1; @@ -667,7 +662,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) DBG_ASSERT(pPath, "no curve found"); - // das laufende Objekt auf das Kurvenende schieben + // push the running object to the end of the curve Rectangle aCurRect(pRunningObj->GetLogicRect()); Point aCurCenter(aCurRect.Center()); const ::basegfx::B2DPolyPolygon& rPolyPolygon = pPath->GetPathPoly(); @@ -695,7 +690,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) bCreated = sal_True; } - // das Pfadobjekt fuer 'an Kurve entlang'? + // path object for 'following curves'? if (eEffect == presentation::AnimationEffect_PATH && pObject == pPath) { SdAnimationPrmsUndoAction* pAction = new SdAnimationPrmsUndoAction @@ -723,7 +718,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else { - // Undo-Action mit alten und neuen Groessen erzeugen + // create undo action with old and new sizes SdAnimationPrmsUndoAction* pAction = new SdAnimationPrmsUndoAction (mpDoc, pObject, bCreated); pAction->SetActive(pInfo->mbActive, bActive); @@ -746,7 +741,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull,bSecondPlayFull); pUndoGroup->AddAction(pAction); - // neue Werte am Infoblock des Objekts eintragen + // insert new values at info block of the object if (nAnimationSet == ATTR_SET) pInfo->mbActive = bActive; @@ -806,7 +801,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) // Model changed mpDoc->SetChanged(); } - // sieht man nicht, also muss an den Bindings nicht invalidiert werden + // not seen, therefore we do not need to invalidate at the bindings } } // end of namespace sd diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 1a26678bc9dd..ae290329fbff 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -37,11 +37,6 @@ namespace sd { TYPEINIT1( FuOutlineBullet, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ FuOutlineBullet::FuOutlineBullet(ViewShell* pViewShell, ::sd::Window* pWindow, ::sd::View* pView, SdDrawDocument* pDoc, @@ -63,7 +58,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) if( !pArgs ) { - // ItemSet fuer Dialog fuellen + // fill ItemSet for Dialog SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); @@ -71,7 +66,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) EE_ITEMS_START, EE_ITEMS_END ); aNewAttr.Put( aEditAttr, sal_False ); - // Dialog hochfahren und ausfuehren + // create and execute dialog SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0; if( pDlg ) @@ -117,13 +112,12 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) } } - // nicht direkt an pOlView, damit SdDrawView::SetAttributes - // Aenderungen auf der Masterpage abfangen und in eine - // Vorlage umleiten kann + /* not direct to pOlView; therefore, SdDrawView::SetAttributes can catch + changes to master page and redirect to a template */ mpView->SetAttributes(*pArgs); /* #i35937# - // evtl. Betroffene Felder invalidieren + // invalidate possible affected fields mpViewShell->Invalidate( FN_NUM_BULLET_ON ); */ } diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 4def9317f6f1..250319e63e88 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -35,7 +35,7 @@ #include "ViewShell.hxx" #include "OutlineViewShell.hxx" -#include <stdio.h> // Fuer SlotFilter-Listing +#include <stdio.h> // for SlotFilter listing namespace sd { @@ -78,11 +78,6 @@ static sal_uInt16 SidArray[] = { TYPEINIT1( FuOutlineText, FuOutline ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ FuOutlineText::FuOutlineText(ViewShell* pViewShell, ::sd::Window* pWindow, ::sd::View* pView, SdDrawDocument* pDoc, @@ -98,11 +93,6 @@ FunctionReference FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* pWin, return xFunc; } -/************************************************************************* -|* -|* MouseButtonDown-event -|* -\************************************************************************/ sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) { @@ -112,7 +102,7 @@ sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) if (bReturn) { - // Attributierung der akt. Textstelle kann jetzt anders sein + // Now the attributs of the current text position can be different mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); } else @@ -123,11 +113,6 @@ sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* MouseMove-event -|* -\************************************************************************/ sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) { @@ -141,11 +126,6 @@ sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* MouseButtonUp-event -|* -\************************************************************************/ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) { @@ -153,7 +133,7 @@ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if (bReturn) { - // Attributierung der akt. Textstelle kann jetzt anders sein + // Now the attributs of the current text position can be different mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); } else @@ -174,13 +154,13 @@ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if ( rMEvt.IsMod1() ) { - // Im neuen Frame oeffnen + // open in new frame pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L); } else { - // Im aktuellen Frame oeffnen + // open in current frame SfxFrameItem aFrameItem( SID_DOCFRAME, pFrame ); pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); @@ -195,15 +175,10 @@ sal_Bool FuOutlineText::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 FuOutlineText::KeyInput(const KeyEvent& rKEvt) { sal_Bool bReturn = sal_False; @@ -265,56 +240,36 @@ void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent) -/************************************************************************* -|* -|* Function aktivieren -|* -\************************************************************************/ - void FuOutlineText::Activate() { FuOutline::Activate(); } -/************************************************************************* -|* -|* Function deaktivieren -|* -\************************************************************************/ void FuOutlineText::Deactivate() { FuOutline::Deactivate(); } -/************************************************************************* -|* -|* Cut object to clipboard -|* -\************************************************************************/ - +/** + * Cut object to clipboard + */ void FuOutlineText::DoCut() { pOutlineView->GetViewByWindow(mpWindow)->Cut(); } -/************************************************************************* -|* -|* Copy object to clipboard -|* -\************************************************************************/ - +/** + * Copy object to clipboard + */ void FuOutlineText::DoCopy() { pOutlineView->GetViewByWindow(mpWindow)->Copy(); } -/************************************************************************* -|* -|* Paste object from clipboard -|* -\************************************************************************/ - +/** + * Paste object from clipboard + */ void FuOutlineText::DoPaste() { pOutlineView->GetViewByWindow(mpWindow)->PasteSpecial(); diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 8ff096feb0f5..23d2a3754597 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -28,12 +28,6 @@ namespace sd { TYPEINIT1( FuOutline, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuOutline::FuOutline ( ViewShell* pViewShell, ::sd::Window* pWindow, @@ -46,12 +40,9 @@ FuOutline::FuOutline ( { } -/************************************************************************* -|* -|* Command, weiterleiten an OutlinerView -|* -\************************************************************************/ - +/** + * forward to OutlinerView + */ sal_Bool FuOutline::Command(const CommandEvent& rCEvt) { sal_Bool bResult = sal_False; @@ -62,7 +53,7 @@ sal_Bool FuOutline::Command(const CommandEvent& rCEvt) if (pOlView) { - pOlView->Command(rCEvt); // liefert leider keinen Returnwert + pOlView->Command(rCEvt); // unfortunately, we do not get a return value bResult = sal_True; } return bResult; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index add99a572965..31a1e889b9ed 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -21,7 +21,7 @@ #include <sfx2/viewfrm.hxx> -// Seite einrichten Tab-Page +// arrange Tab-Page #include <svx/svxids.hrc> #include <svx/dialogs.hrc> @@ -72,7 +72,7 @@ namespace sd { class Window; // 50 cm 28350 -// erstmal vom Writer uebernommen +// adapted from writer #define MAXHEIGHT 28350 #define MAXWIDTH 28350 @@ -101,12 +101,6 @@ void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) rTarget.Put(rSource); } -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuPage::FuPage( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), @@ -380,11 +374,10 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } } } - - // Sonderbehandlung: die INVALIDS auf NULL-Pointer - // zurueckgesetzen (sonst landen INVALIDs oder - // Pointer auf die DefaultItems in der Vorlage; - // beides wuerde die Attribut-Vererbung unterbinden) + /* Special treatment: reset the INVALIDS to + NULL-Pointer (otherwise INVALIDs or pointer point + to DefaultItems in the template; both would + prevent the attribute inheritance) */ pTempSet->ClearInvalidItems(); if( mbMasterPage ) @@ -556,7 +549,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) bSetPageSizeAndBorder = sal_True; } - // Papierschacht (PaperBin) + // Paper Bin if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), sal_True, &pPoolItem) == SFX_ITEM_SET ) { nPaperBin = ((const SvxPaperBinItem*) pPoolItem)->GetValue(); @@ -612,18 +605,12 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) mpBackgroundObjUndoAction = 0; } - /////////////////////////////////////////////////////////////////////////// - // - // Objekte koennen max. so gross wie die ViewSize werden - // + // Objects can not be bigger than ViewSize Size aPageSize = mpDoc->GetSdPage(0, ePageKind)->GetSize(); Size aViewSize = Size(aPageSize.Width() * 3, aPageSize.Height() * 2); mpDoc->SetMaxObjSize(aViewSize); - /////////////////////////////////////////////////////////////////////////// - // - // ggfs. Preview den neuen Kontext mitteilen - // + // if necessary, we tell Preview the new context mpDrawViewShell->UpdatePreview( mpDrawViewShell->GetActualPage() ); } diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 8376bc3e26d8..0c903f2e1f2f 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -40,12 +40,6 @@ namespace sd { TYPEINIT1( FuParagraph, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuParagraph::FuParagraph ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -83,9 +77,9 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) aNewAttr.Put( aEditAttr ); - // linker Rand als Offset + // left border is offset const long nOff = ( (SvxLRSpaceItem&)aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft(); - // Umrechnung, da TabulatorTabPage immer von Twips ausgeht ! + // conversion since TabulatorTabPage always uses Twips! SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff ); aNewAttr.Put( aOff ); @@ -116,7 +110,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) { delete pDlg; } - return; // Abbruch + return; // Cancel } delete( pDlg ); } @@ -141,7 +135,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) } } - // invalidieren der Slots + // invalidate slots static sal_uInt16 SidArray[] = { SID_ATTR_TABSTOP, SID_ATTR_PARA_ADJUST_LEFT, diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index f247a1582429..566d2dcbd71d 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -62,11 +62,6 @@ namespace sd { TYPEINIT0( FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ FuPoor::FuPoor ( ViewShell* pViewSh, @@ -102,11 +97,6 @@ FuPoor::FuPoor ( aDelayToScrollTimer.SetTimeout(2000); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ FuPoor::~FuPoor() { @@ -118,11 +108,6 @@ FuPoor::~FuPoor() delete pDialog; } -/************************************************************************* -|* -|* Function aktivieren -|* -\************************************************************************/ void FuPoor::Activate() { @@ -132,11 +117,6 @@ void FuPoor::Activate() } } -/************************************************************************* -|* -|* Function deaktivieren -|* -\************************************************************************/ void FuPoor::Deactivate() { @@ -154,13 +134,9 @@ void FuPoor::Deactivate() if (mpWindow) mpWindow->ReleaseMouse (); } -/************************************************************************* -|* -|* Scrollen bei Erreichen des Fensterrandes; wird von -|* MouseMove aufgerufen -|* -\************************************************************************/ - +/** + * scroll when approached the border of the window; is called by MouseMove + */ void FuPoor::ForceScroll(const Point& aPixPos) { aScrollTimer.Stop(); @@ -189,7 +165,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) { if (bScrollable) { - // Scrollaktion in abgeleiteter Klasse + // scroll action in derived class mpViewShell->ScrollLines(dx, dy); aScrollTimer.Start(); } @@ -199,12 +175,9 @@ void FuPoor::ForceScroll(const Point& aPixPos) } } -/************************************************************************* -|* -|* Timer-Handler fuer Fensterscrolling -|* -\************************************************************************/ - +/** + * timer handler for window scrolling + */ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) { Point aPnt(mpWindow->GetPointerPosPixel()); @@ -217,15 +190,10 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) } IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) -/************************************************************************* -|* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* sal_False. -|* -\************************************************************************/ - +/** + * handle keyboard events + * @returns sal_True if the event was handled, sal_False otherwise + */ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); @@ -354,7 +322,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { if (!mpView->IsTextEdit() && !bSlideShow && !mpDocSh->IsUIActive()) { - // Zoom vergroessern + // increase zoom mpViewShell->SetZoom(mpWindow->GetZoom() * 3 / 2); if (mpViewShell->ISA(DrawViewShell)) @@ -370,7 +338,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { if (!mpView->IsTextEdit() && !bSlideShow && !mpDocSh->IsUIActive()) { - // Zoom verringern + // decrease zoom mpViewShell->SetZoom(mpWindow->GetZoom() * 2 / 3); if (mpViewShell->ISA(DrawViewShell)) @@ -386,7 +354,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { if (!mpView->IsTextEdit() && !bSlideShow) { - // Zoom auf Seite + // zoom to page mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); bReturn = sal_True; @@ -398,7 +366,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { if (!mpView->IsTextEdit() && !bSlideShow) { - // Zoom auf selektierte Objekte + // zoom to selected objects mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); bReturn = sal_True; @@ -412,7 +380,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if (!mpView->IsTextEdit() && pZoomList->IsNextPossible() && !bSlideShow && !mpDocSh->IsUIActive()) { - // Naechstes ZoomRect einstellen + // use next ZoomRect mpViewShell->SetZoomRect(pZoomList->GetNextZoomRect()); bReturn = sal_True; } @@ -425,7 +393,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if (!mpView->IsTextEdit() && pZoomList->IsPreviousPossible() && !bSlideShow && !mpDocSh->IsUIActive()) { - // Vorheriges ZoomRect einstellen + // use previous ZoomRect mpViewShell->SetZoomRect(pZoomList->GetPreviousZoomRect()); bReturn = sal_True; } @@ -438,7 +406,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { - // Sprung zu erster Seite + // jump to first page static_cast<DrawViewShell*>(mpViewShell)->SwitchPage(0); bReturn = sal_True; } @@ -451,7 +419,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { - // Sprung zu letzter Seite + // jump to last page SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); static_cast<DrawViewShell*>(mpViewShell) @@ -629,25 +597,25 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if (nCode == KEY_UP) { - // Scroll nach oben + // scroll up nX = 0; nY =-1; } else if (nCode == KEY_DOWN) { - // Scroll nach unten + // scroll down nX = 0; nY = 1; } else if (nCode == KEY_LEFT) { - // Scroll nach links + // scroll left nX =-1; nY = 0; } else if (nCode == KEY_RIGHT) { - // Scroll nach rechts + // scroll right nX = 1; nY = 0; } @@ -818,7 +786,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) } else { - // Seite scrollen + // scroll page mpViewShell->ScrollLines(nX, nY); } @@ -936,12 +904,9 @@ void FuPoor::SelectionHasChanged() ((SdrHdlList&)rHdlList).ResetFocusHdl(); } -/************************************************************************* -|* -|* Cut object to clipboard -|* -\************************************************************************/ - +/** + * Cut object to clipboard + */ void FuPoor::DoCut() { if (mpView) @@ -950,12 +915,9 @@ void FuPoor::DoCut() } } -/************************************************************************* -|* -|* Copy object to clipboard -|* -\************************************************************************/ - +/** + * Copy object to clipboard + */ void FuPoor::DoCopy() { if (mpView) @@ -964,12 +926,9 @@ void FuPoor::DoCopy() } } -/************************************************************************* -|* -|* Paste object from clipboard -|* -\************************************************************************/ - +/** + * Paste object from clipboard + */ void FuPoor::DoPaste() { if (mpView) @@ -978,12 +937,9 @@ void FuPoor::DoPaste() } } -/************************************************************************* -|* -|* Timer-Handler fuer Drag&Drop -|* -\************************************************************************/ - +/** + * Timer handler for Drag&Drop + */ IMPL_LINK_NOARG(FuPoor, DragHdl) { if( mpView ) @@ -1002,23 +958,14 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) return 0; } -/************************************************************************* -|* -|* Command-event -|* -\************************************************************************/ - sal_Bool FuPoor::Command(const CommandEvent& rCEvt) { return( mpView->Command(rCEvt,mpWindow) ); } -/************************************************************************* -|* -|* Timer-Handler fuer Fensterscrolling -|* -\************************************************************************/ - +/** + * Timer handler for window scrolling + */ IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl) { aDelayToScrollTimer.Stop (); @@ -1034,12 +981,6 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl) } IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer ) -/************************************************************************* -|* -|* Handler fuer Maustaste -|* -\************************************************************************/ - sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents @@ -1058,24 +999,12 @@ sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) return sal_False; } -/************************************************************************* -|* -|* Handler fuer Maustaste -|* -\************************************************************************/ - void FuPoor::StartDelayToScrollTimer () { bDelayActive = sal_True; aDelayToScrollTimer.Start (); } -/************************************************************************* -|* -|* Help-event -|* -\************************************************************************/ - sal_Bool FuPoor::RequestHelp(const HelpEvent& rHEvt) { sal_Bool bReturn = sal_False; @@ -1099,12 +1028,6 @@ void FuPoor::Paint(const Rectangle&, ::sd::Window* ) { } -/************************************************************************* -|* -|* Request verarbeiten -|* -\************************************************************************/ - void FuPoor::ReceiveRequest(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 44e0b546b870..2d33d0a079c1 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -59,12 +59,6 @@ TYPEINIT1( FuPresentationLayout, FuPoor ); #define DOCUMENT_TOKEN (sal_Unicode('#')) -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuPresentationLayout::FuPresentationLayout ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -84,8 +78,7 @@ FunctionReference FuPresentationLayout::Create( ViewShell* pViewSh, ::sd::Window void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { - // damit nicht Objekte, die gerade editiert werden oder selektiert - // sind , verschwinden + // prevent selected objects or objects which are under editing from disappearing mpView->SdrEndTextEdit(); if(mpView->GetSdrPageView()) @@ -95,7 +88,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) sal_Bool bError = sal_False; - // die aktive Seite ermitteln + // determine the active page sal_uInt16 nSelectedPage = SDRPAGE_NOTFOUND; for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++) { @@ -112,8 +105,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) String aOldLayoutName(aOldPageLayoutName); aOldLayoutName.Erase(aOldLayoutName.SearchAscii(SD_LT_SEPARATOR)); - // wenn wir auf einer Masterpage sind, gelten die Aenderungen fuer alle - // Seiten und Notizseiten, die das betreffende Layout benutzen + /* if we are on a master page, the changes apply for all pages and notes- + pages who are using the relevant layout */ sal_Bool bOnMaster = sal_False; if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { @@ -125,8 +118,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) sal_Bool bMasterPage = bOnMaster; sal_Bool bCheckMasters = sal_False; - // Dialog aufrufen - sal_Bool bLoad = sal_False; // tauchen neue Masterpages auf? + // call dialog + sal_Bool bLoad = sal_False; // appear the new master pages? String aFile; SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); @@ -184,13 +177,12 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { mpDocSh->SetWaitCursor( sal_True ); - // Hier werden nur Masterpages ausgewechselt, d.h. die aktuelle Seite - // bleibt aktuell. Damit beim Ein- und Ausfuegen der Masterpages nicht - // dauernd via PageOrderChangedHint die Methode ResetActualPage gerufen - // wird, wird jetzt blockiert. - // That isn't quitely right. If the masterpageview is active and you are - // removing a masterpage, it's possible that you are removing the - // current masterpage. So you have to call ResetActualPage ! + /* Here, we only exchange masterpages, therefore the current page + remains the current page. To prevent calling PageOrderChangedHint + during insertion and extraction of the masterpages, we block. */ + /* That isn't quitely right. If the masterpageview is active and you are + removing a masterpage, it's possible that you are removing the + current masterpage. So you have to call ResetActualPage ! */ if( mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_True); @@ -211,17 +203,15 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) } else { - // MasterPage mit dem LayoutNamen aFile aus aktuellem Doc verwenden + // use master page with the layout name aFile from current Doc mpDoc->SetMasterPage(nSelectedPage, aFile, mpDoc, bMasterPage, bCheckMasters); } - // Blockade wieder aufheben + // remove blocking if (mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_False); - /************************************************************************* - |* Falls dargestellte Masterpage sichtbar war, neu darstellen - \************************************************************************/ + // if the master page was visible, show it again if (!bError && nSelectedPage != SDRPAGE_NOTFOUND) { if (bOnMaster) @@ -239,7 +229,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) pView->ShowSdrPage(pView->GetModel()->GetMasterPage(nPgNum)); } - // damit TabBar aktualisiert wird + // force update of TabBar mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_MASTERPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } else diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 4bbe51d23359..1b4535143d2a 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -46,12 +46,6 @@ namespace sd { TYPEINIT1( FuPresentationObjects, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuPresentationObjects::FuPresentationObjects ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -76,8 +70,8 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) if( !pOutlineViewShell ) return; - // ergibt die Selektion ein eindeutiges Praesentationslayout? - // wenn nicht, duerfen die Vorlagen nicht bearbeitet werden + /* does the selections end in a unique presentation layout? + if not, it is not allowed to edit the templates */ SfxItemSet aSet(mpDoc->GetItemPool(), SID_STATUS_LAYOUT, SID_STATUS_LAYOUT); pOutlineViewShell->GetStatusBarState( aSet ); String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 6ff29fd42b19..59f67d7038ca 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -29,7 +29,7 @@ #include "drawdoc.hxx" #include "DrawViewShell.hxx" #include "ViewShell.hxx" -#include "fuzoom.hxx" // wegen SidArrayZoom[] +#include "fuzoom.hxx" // because of SidArrayZoom[] #include <vcl/msgbox.hxx> #include <svx/svdpagv.hxx> @@ -44,12 +44,6 @@ namespace sd { TYPEINIT1( FuScale, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuScale::FuScale ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -81,7 +75,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) nValue = (sal_Int16) mpWindow->GetZoom(); - // Zoom auf Seitengroesse ? + // zoom on page size? if( mpViewShell && mpViewShell->ISA( DrawViewShell ) && static_cast<DrawViewShell*>(mpViewShell)->IsZoomOnPage() ) { @@ -92,7 +86,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nValue ); } - // Bereich einschraenken + // limit range if( mpViewShell ) { if( mpViewShell->ISA( DrawViewShell ) ) @@ -133,7 +127,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) delete pDlg; delete pZoomItem; rReq.Ignore (); - return; // Abbruch + return; // Cancel } default: { @@ -165,8 +159,8 @@ void FuScale::DoExecute( SfxRequest& rReq ) { if( mpViewShell->ISA( DrawViewShell ) ) { - // Namensverwirrung: SID_SIZE_ALL -> Zoom auf alle Objekte - // --> Wird als Optimal im Programm angeboten + // name confusion: SID_SIZE_ALL -> zoom onto all objects + // --> the program offers it as optimal mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } } diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 24f9e83de20b..2509c7500f3e 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -50,12 +50,6 @@ static sal_uInt16 SidArraySpell[] = { TYPEINIT1( FuSearch, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuSearch::FuSearch ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -94,12 +88,6 @@ void FuSearch::DoExecute( SfxRequest& ) pSdOutliner->PrepareSpelling(); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - FuSearch::~FuSearch() { if ( ! mpDocSh->IsInDestruction() && mpDocSh->GetViewShell()!=NULL) @@ -113,12 +101,6 @@ FuSearch::~FuSearch() } -/************************************************************************* -|* -|* Suchen&Ersetzen -|* -\************************************************************************/ - void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) { ViewShellBase* pBase = PTR_CAST(ViewShellBase, SfxViewShell::Current()); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 4cca3a950bde..c6e14a9d9d45 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -76,12 +76,6 @@ namespace sd { TYPEINIT1( FuSelection, FuDraw ); -/************************************************************************* -|* -|* Constructor -|* -\************************************************************************/ - FuSelection::FuSelection ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -115,12 +109,6 @@ void FuSelection::DoExecute( SfxRequest& rReq ) SelectionHasChanged(); } -/************************************************************************* -|* -|* Destructor -|* -\************************************************************************/ - FuSelection::~FuSelection() { mpView->UnmarkAllPoints(); @@ -132,12 +120,6 @@ FuSelection::~FuSelection() } } -/************************************************************************* -|* -|* MouseButtonDown-event -|* -\************************************************************************/ - sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // Hack for #?????# @@ -232,7 +214,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - // Handle oder marked object hit + // hit handle or marked object bFirstMouseMove = sal_True; aDragTimer.Start(); } @@ -576,12 +558,6 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -/************************************************************************* -|* -|* MouseMove-event -|* -\************************************************************************/ - sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) { sal_Bool bReturn = FuDraw::MouseMove(rMEvt); @@ -620,12 +596,6 @@ sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* MouseButtonUp-event -|* -\************************************************************************/ - sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { sal_Bool bReturn = sal_False; @@ -922,15 +892,10 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* Process keyboard input -|* -|* If a KeyEvent is being processed, the Return-Wert is sal_True, -|* sal_False otherwise. -|* -\************************************************************************/ - +/** + * Process keyboard input + * @returns sal_True if a KeyEvent is being processed, sal_False otherwise + */ sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) { sal_Bool bReturn = sal_False; @@ -961,12 +926,6 @@ sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) } -/************************************************************************* -|* -|* Activate function -|* -\************************************************************************/ - void FuSelection::Activate() { SdrDragMode eMode; @@ -1108,24 +1067,12 @@ void FuSelection::Activate() -/************************************************************************* -|* -|* Deactivate function -|* -\************************************************************************/ - void FuSelection::Deactivate() { FuDraw::Deactivate(); } -/************************************************************************* -|* -|* Selection was changed -|* -\************************************************************************/ - void FuSelection::SelectionHasChanged() { bSelectionChanged = sal_True; @@ -1145,12 +1092,9 @@ void FuSelection::SelectionHasChanged() } -/************************************************************************* -|* -|* Set current bezier edit mode -|* -\************************************************************************/ - +/** + * Set current bezier edit mode + */ void FuSelection::SetEditMode(sal_uInt16 nMode) { nEditMode = nMode; @@ -1171,12 +1115,9 @@ void FuSelection::SetEditMode(sal_uInt16 nMode) rBindings.Invalidate(SID_BEZIER_INSERT); } -/************************************************************************* -|* -|* Execute animation or interaction -|* -\************************************************************************/ - +/** + * Execute animation or interaction + */ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { sal_Bool bAnimated = sal_False; diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index af3eecd3e49e..fecabb9d3fa8 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -40,12 +40,6 @@ namespace sd { TYPEINIT1( FuSlideShowDlg, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuSlideShowDlg::FuSlideShowDlg ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -87,7 +81,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) aPageNameList[ nPage ] = aStr; - // ist dies unsere (vorhandene) erste Seite? + // is this our (existing) first page? if ( rPresPage == aStr ) aFirstPage = rPresPage; else if ( pPage->IsSelected() && !aFirstPage.Len() ) @@ -229,7 +223,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) pOptions->SetDisplay( ITEMVALUE( aDlgSet, ATTR_PRESENT_DISPLAY, SfxInt32Item ) ); - // wenn sich etwas geaendert hat, setzen wir das Modified-Flag, + // is something has changed, we set the modified flag if ( bValuesChanged ) mpDoc->SetChanged( sal_True ); } diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index ea348d307f56..6bcb368183a9 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -41,12 +41,6 @@ namespace sd { TYPEINIT1( FuSnapLine, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuSnapLine::FuSnapLine(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) @@ -161,7 +155,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) break; case RET_SNAP_DELETE: - // Fangobjekt loeschen + // delete snap object if ( !bCreateNew ) pPV->DeleteHelpLine(nHelpLine); /*fall-through*/ diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 2d0bda1131f5..1d915002af9a 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -42,11 +42,6 @@ namespace sd { TYPEINIT1( FuSummaryPage, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ FuSummaryPage::FuSummaryPage ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -75,11 +70,9 @@ void FuSummaryPage::DoExecute( SfxRequest& ) while (i < nCount && nSelectedPages <= 1) { - /********************************************************************** - * Wieviele Seiten sind selektiert? - * Genau eine Seite selektiert: Ab dieser Seite alles zusammenfassen - * sonst: Nur die selektierten Seiten zusammenfassen - **********************************************************************/ + /* How many pages are selected? + exactly one: pool everything from this page + otherwise: only pool the selected pages */ SdPage* pActualPage = mpDoc->GetSdPage(i, PK_STANDARD); if (pActualPage->IsSelected()) @@ -112,9 +105,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) { if (!pSummaryPage) { - /********************************************************** - * Inhaltsverzeichnis-Seite einfuegen und Outliner anlegen - **********************************************************/ + // insert "table of content"-page and create outliner const bool bUndo = mpView->IsUndoEnabled(); if( bUndo ) @@ -125,7 +116,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); - // Seite mit Titel & Gliederung! + // page with title & structuring! pSummaryPage = (SdPage*) mpDoc->AllocPage(sal_False); pSummaryPage->SetSize(pActualPage->GetSize() ); pSummaryPage->SetBorder(pActualPage->GetLftBorder(), @@ -133,19 +124,19 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pActualPage->GetRgtBorder(), pActualPage->GetLwrBorder() ); - // Seite hinten einfuegen + // insert page at the back mpDoc->InsertPage(pSummaryPage, nCount * 2 + 1); if( bUndo ) mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pSummaryPage)); - // MasterPage der aktuellen Seite verwenden + // use MasterPage of the current page pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pSummaryPage->SetLayoutName(pActualPage->GetLayoutName()); pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); - // Notiz-Seite + // notes-page SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), @@ -154,13 +145,13 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pActualNotesPage->GetLwrBorder() ); pNotesPage->SetPageKind(PK_NOTES); - // Seite hinten einfuegen + // insert page at the back mpDoc->InsertPage(pNotesPage, nCount * 2 + 2); 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); @@ -180,9 +171,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pOutl->SetStyleSheet( 0, pStyle ); } - /************************************************************** - * Text hinzufuegen - **************************************************************/ + // add text OutlinerParaObject* pParaObj = pTextObj->GetOutlinerParaObject(); // #118876#, check if the OutlinerParaObject is created successfully if( pParaObj ) @@ -198,7 +187,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) { SdrTextObj* pTextObj = (SdrTextObj*) pSummaryPage->GetPresObj(PRESOBJ_OUTLINE); - // Harte Absatz- und Zeichenattribute entfernen + // remove hard break- and character attributes SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END); sal_uLong nParaCount = pOutl->GetParagraphCount(); @@ -213,7 +202,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pTextObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); pTextObj->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/futempl.cxx b/sd/source/ui/func/futempl.cxx index 2f53d3055927..c59e3e59aebf 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -77,12 +77,6 @@ namespace sd TYPEINIT1( FuTemplate, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuTemplate::FuTemplate ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -105,7 +99,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); sal_uInt16 nSId = rReq.GetSlot(); - // StyleSheet-Parameter holen + // get StyleSheet parameter SfxStyleSheetBasePool* pSSPool = mpDoc->GetDocSh()->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; @@ -191,8 +185,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) case SID_STYLE_NEW_BY_EXAMPLE: { - // Z.Z. geht immer noch der Dialog auf, um den Namen - // der Vorlage einzugeben. + // at the moment, the dialog to enter the name of the template is still opened mpView->AreObjectsMarked(); SfxStyleSheetBase *p = pSSPool->Find(aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_ALL ); if(p) @@ -231,7 +224,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) break; case SID_STYLE_APPLY: - // Anwenden der Vorlage auf das Dokument + // apply the template to the document pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); // do not set presentation styles, they will be set implicit @@ -269,13 +262,12 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SD_MOD()->SetWaterCan( sal_True ); pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); } - // keine Praesentationsobjektvorlagen, die werden nur - // implizit zugewiesen + // no presentation object templates, they are only allowed implicitly if( pStyleSheet && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_PSEUDO ) { ( (SdStyleSheetPool*) pSSPool )->SetActualStyleSheet( pStyleSheet ); - // Es wird explizit in den Selektionsmodus geschaltet + // we switch explicitly into selection mode mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); @@ -286,7 +278,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else { SD_MOD()->SetWaterCan( sal_False ); - // Werkzeugleiste muss wieder enabled werden + // we have to re-enable to tools-bar mpViewShell->Invalidate(); } } @@ -356,8 +348,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) nDlgId = TAB_PRES_LAYOUT_TEMPLATE; String aOutlineStr((SdResId(STR_PSEUDOSHEET_OUTLINE))); - // die Nummer ermitteln; ein Leerzeichen zwischen - // Name und Nummer beachten + // determine number, mind the blank between name and number String aNumStr(aName.Copy(aOutlineStr.Len() + 1)); sal_uInt16 nLevel = (sal_uInt16)aNumStr.ToInt32(); switch (nLevel) @@ -412,10 +403,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxItemSet aTempSet(*pOutSet); ((SdStyleSheet*)pStyleSheet)->AdjustToFontHeight(aTempSet); - // Sonderbehandlung: die INVALIDS auf NULL-Pointer - // zurueckgesetzen (sonst landen INVALIDs oder - // Pointer auf die DefaultItems in der Vorlage; - // beides wuerde die Attribut-Vererbung unterbinden) + /* Special treatment: reset the INVALIDS to + NULL-Pointer (otherwise INVALIDs or pointer point + to DefaultItems in the template; both would + prevent the attribute inheritance) */ aTempSet.ClearInvalidItems(); // EE_PARA_NUMBULLET item is only valid in first outline template @@ -596,7 +587,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) delete pStdDlg; delete pPresDlg; } - return; // Abbruch + return; // Cancel } delete pStdDlg; delete pPresDlg; @@ -612,11 +603,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxItemSet aCoreSet( mpDoc->GetPool() ); mpView->GetAttributes( aCoreSet, sal_True ); - // wenn das Objekt eine Vorlage hatte, wird diese Parent - // der neuen Vorlage + // if the object had a template, this becomes parent of the new template SfxStyleSheet* pOldStyle = mpView->GetStyleSheet(); - // Wenn pOldStyle == pStyleSheet -> Rekursion + // if pOldStyle == pStyleSheet -> recursion if( pOldStyle != pStyleSheet ) { if (pOldStyle) @@ -627,9 +617,9 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxItemSet* pStyleSet = &pStyleSheet->GetItemSet(); pStyleSet->Put(aCoreSet); - // Vorlage anwenden (Aber nicht, wenn gerade ein Text - // editiert wird, denn dazu muesste die Edit Engine - // Vorlagen auf Zeichenebene beherrschen.) + /* apply template (but not when somebody is editing a text. + To do this, the edit engine had to be capable to use + templates on a character level. */ if (!mpView->GetTextEditObject()) { mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index c30ec8049165..17de3c9c5d04 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -120,12 +120,9 @@ TYPEINIT1( FuText, FuConstruct ); static sal_Bool bTestText = 0; -/************************************************************************* -|* -|* Basisklasse fuer Textfunktionen -|* -\************************************************************************/ - +/** + * base class for text functions + */ FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) , bFirstObjCreated(sal_False) @@ -140,12 +137,7 @@ FunctionReference FuText::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: return xFunc; } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - +/** Destruktor */ void FuText::disposing() { if(mpView) @@ -153,8 +145,7 @@ void FuText::disposing() if(mpView->SdrEndTextEdit(sal_False) == SDRENDTEXTEDIT_DELETED) mxTextObj.reset( 0 ); - // die RequestHandler der benutzten Outliner zuruecksetzen auf den - // Handler am Dokument + // reset the RequestHandler of the used Outliner to the handler of the document ::Outliner* pOutliner = mpView->GetTextEditOutliner(); if (pOutliner) @@ -242,12 +233,6 @@ void FuText::DoExecute( SfxRequest& ) SetInEditMode(aMEvt, bQuickDrag); } -/************************************************************************* -|* -|* MouseButtonDown-event -|* -\************************************************************************/ - sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { bMBDown = sal_True; @@ -261,7 +246,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SDRHIT_TEXTEDIT) { - // Text getroffen -> Event von SdrView auswerten lassen + // hit text -> SdrView handles event if (mpView->MouseButtonDown(rMEvt, mpWindow)) return (sal_True); } @@ -270,17 +255,17 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { if (mpView->IsTextEdit() && eHit != SDRHIT_MARKEDOBJECT && eHit != SDRHIT_HANDLE) { - // Texteingabe beenden + // finish text input if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) { - // Bugfix von MBA: bei Doppelclick auf der Wiese im Modus Text wird - // beim zweiten Click eHit = SDRHIT_TEXTEDITOBJ erhalten, weil ja der - // zweite Click auf das im ersten Click angelegte TextObject geht. - // Dieses wird aber in SdrEndTextEdit entfernt, weil es leer ist. Es - // befindet sich aber noch in der Mark-Liste und der Aufruf MarkObj - // weiter unten greift dann auf das tote Object zu. - // Als einfacher Fix wird nach SdrEndTextEdit noch einmal eHit ermittelt, - // was dann SDRHIT_NONE liefert. + /* Bugfix from MBA: during a double click onto the unused? area + in text mode, we get with the second click eHit = + SDRHIT_TEXTEDITOBJ since it goes to the TextObject which was + created with the first click. But this is removed by + SdrEndTextEdit since it is empty. But it is still in the mark + list. The call MarkObj further below accesses then the dead + object. As a simple fix, we determine eHit after + SdrEndTextEdit again, this returns then SDRHIT_NONE. */ mxTextObj.reset( NULL ); eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); } @@ -305,7 +290,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO)) { - // Makro + // Macro sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); mpView->BegMacroObj(aMDPos,nHitLog,pObj,pPV,mpWindow); } @@ -313,7 +298,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { if (eHit != SDRHIT_HANDLE) { - // Selektion aufheben + // deselect selection if (!rMEvt.IsShift() && eHit == SDRHIT_TEXTEDITOBJ) { mpView->UnmarkAll(); @@ -328,15 +313,11 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) ( eHit == SDRHIT_UNMARKEDOBJECT && bFirstObjCreated && !bPermanent ) ) { - /********************************************************** - * Handle, markiertes oder unmarkiertes Objekt getroffen - **********************************************************/ + // Handle, hit marked or umarked object if (eHit == SDRHIT_TEXTEDITOBJ) { - /****************************************************** - * Text eines unmarkierten Objekts getroffen: - * Objekt wird selektiert und in EditMode versetzt - ******************************************************/ + /* hit text of unmarked object: + select object and set to EditMode */ mpView->MarkObj(aVEvt.pRootObj, pPV); if (aVEvt.pObj && aVEvt.pObj->ISA(SdrTextObj)) @@ -348,9 +329,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2()) { - /****************************************************** - * URL ausfuehren - ******************************************************/ + // execute URL mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); @@ -360,13 +339,13 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (rMEvt.IsMod1()) { - // Im neuen Frame oeffnen + // open in new frame pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L); } else { - // Im aktuellen Frame oeffnen + // open in current frame SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); @@ -374,9 +353,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } else { - /****************************************************** - * Objekt oder Handle draggen - ******************************************************/ + // drag object or handle // #i78748# // do the EndTextEdit first, it will delete the handles and force a @@ -434,9 +411,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) else if ( nSlotId != SID_TEXTEDIT && (bPermanent || !bFirstObjCreated) ) { - /********************************************************** - * Objekt erzeugen - **********************************************************/ + // create object mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); @@ -444,9 +419,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } else { - /********************************************************** - * Selektieren - **********************************************************/ + // select if( !rMEvt.IsShift() ) mpView->UnmarkAll(); @@ -471,12 +444,6 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* MouseMove-event -|* -\************************************************************************/ - sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) { sal_Bool bReturn = FuDraw::MouseMove(rMEvt); @@ -503,21 +470,15 @@ sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* MouseButtonUp-event -|* -\************************************************************************/ - void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) { if(mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) { if( nSlotId == SID_ATTR_CHAR ) { - // Impress-Textobjekt wird erzeugt (faellt auf Zeilenhoehe zusammen) - // Damit das Objekt beim anschliessenden Erzeugen gleich die richtige - // Hoehe bekommt (sonst wird zuviel gepainted) + /* Create Impress text object (rescales to line height) + We get the correct height during the subsequent creation of the + object, otherwise we draw to much */ SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); @@ -566,7 +527,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) { - // FitToSize (An Rahmen anpassen) + // FitToSize (fit to frame) SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); @@ -595,7 +556,7 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) { if( nSlotId == SID_ATTR_CHAR ) { - // Impress-Textobject (faellt auf Zeilenhoehe zusammen) + // Impress text object (rescales to line height) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextMaxFrameHeightItem(0)); @@ -633,7 +594,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 ) - return (sal_True); // Event von der SdrView ausgewertet + return (sal_True); // handle event from SdrView sal_Bool bEmptyTextObj = sal_False; @@ -657,9 +618,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if( mpView && mpView->IsDragObj()) { - /********************************************************************** - * Objekt wurde verschoben - **********************************************************************/ + // object was moved FrameView* pFrameView = mpViewShell->GetFrameView(); sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); @@ -698,9 +657,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } else if( mpView && mpView->IsCreateObj() && rMEvt.IsLeft()) { - /********************************************************************** - * Objekt wurde erzeugt - **********************************************************************/ + // object was created mxTextObj.reset( dynamic_cast< SdrTextObj* >( mpView->GetCreateObj() ) ); if( mxTextObj.is() ) @@ -738,7 +695,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if (!mpView->EndCreateObj(SDRCREATE_FORCEEND)) { - // Textobjekt konnte nicht erzeugt werden + // it was not possible to create text object mxTextObj.reset(0); } else if (nSlotId == SID_TEXT_FITTOSIZE) @@ -757,7 +714,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { ImpSetAttributesFitCommon(GetTextObj()); - // Damit die Handles und der graue Rahmen stimmen + // thereby the handles and the gray frame are correct mpView->AdjustMarkHdl(); mpView->PickHandle(aPnt); SetInEditMode(rMEvt, sal_False); @@ -790,9 +747,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) !mpDocSh->IsReadOnly() && nSlotId != SID_TEXTEDIT ) { - /********************************************************************** - * Mengentext (linksbuendiges AutoGrow) - **********************************************************************/ + // text body (left-justified AutoGrow) mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); @@ -904,7 +859,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } else { - // In die Fkt. Selektion wechseln + // switch to selection if (mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED) { mxTextObj.reset(0); @@ -924,15 +879,10 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) return (bReturn); } -/************************************************************************* -|* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* sal_False. -|* -\************************************************************************/ - +/** + * handle keyboard events + * @returns sal_True if the event was handled, sal_False otherwise + */ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) { sal_Bool bReturn = sal_False; @@ -961,7 +911,7 @@ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { - // Titeltext-Objekt: immer "weiche" Umbrueche + // title text object: always soft breaks bShift = sal_True; } @@ -1008,12 +958,6 @@ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) -/************************************************************************* -|* -|* Function aktivieren -|* -\************************************************************************/ - void FuText::Activate() { mpView->SetQuickTextEditMode(mpViewShell->GetFrameView()->IsQuickEdit()); @@ -1034,12 +978,6 @@ void FuText::Activate() } -/************************************************************************* -|* -|* Function deaktivieren -|* -\************************************************************************/ - void FuText::Deactivate() { OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1053,12 +991,9 @@ void FuText::Deactivate() } -/************************************************************************* -|* -|* Objekt in Edit-Mode setzen -|* -\************************************************************************/ - +/** + * Sets the object into the edit mode. + */ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) { SdrPageView* pPV = mpView->GetSdrPageView(); @@ -1081,7 +1016,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) if (nParaAnz==1 && p1stPara) { - // Bei nur einem Pararaph + // with only one paragraph if (pOutl->GetText(p1stPara).Len() == 0) { bEmptyOutliner = sal_True; @@ -1099,7 +1034,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT || !mxTextObj->IsEmptyPresObj() ) ) { - // Neuen Outliner machen (gehoert der SdrObjEditView) + // create new outliner (owned by SdrObjEditView) SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); if (bEmptyOutliner) @@ -1133,7 +1068,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) if (eHit == SDRHIT_TEXTEDIT) { - // Text getroffen + // hit text if (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT || @@ -1172,12 +1107,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) } } -/************************************************************************* -|* -|* Texteingabe wird gestartet, ggf. Default-Text loeschen -|* -\************************************************************************/ - +/** + * Text entry is started, if necessary delete the default text. + */ sal_Bool FuText::DeleteDefaultText() { sal_Bool bDeleted = sal_False; @@ -1220,23 +1152,11 @@ sal_Bool FuText::DeleteDefaultText() return(bDeleted); } -/************************************************************************* -|* -|* Command-event -|* -\************************************************************************/ - sal_Bool FuText::Command(const CommandEvent& rCEvt) { return( FuPoor::Command(rCEvt) ); } -/************************************************************************* -|* -|* Help-event -|* -\************************************************************************/ - sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) { sal_Bool bReturn = sal_False; @@ -1252,9 +1172,7 @@ sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) if (pField && pField->ISA(SvxURLField)) { - /****************************************************************** - * URL-Field - ******************************************************************/ + // URL-Field aHelpText = INetURLObject::decode( ((const SvxURLField*)pField)->GetURL(), '%', INetURLObject::DECODE_WITH_CHARSET ); } if (aHelpText.Len()) @@ -1282,17 +1200,11 @@ sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) return(bReturn); } -/************************************************************************* -|* -|* Request verarbeiten -|* -\************************************************************************/ - void FuText::ReceiveRequest(SfxRequest& rReq) { nSlotId = rReq.GetSlot(); - // Dann Basisklasse rufen (dort wird u.a. nSlotId NICHT gesetzt) + // then we call the base class (besides others, nSlotId is NOT set there) FuPoor::ReceiveRequest(rReq); if (nSlotId == SID_TEXTEDIT || mpViewShell->GetFrameView()->IsQuickEdit() || SID_ATTR_CHAR == nSlotId) @@ -1303,7 +1215,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) if (nSlotId == SID_TEXTEDIT) { - // Wird gerade editiert? + // are we currently editing? if(!bTestText) mxTextObj.reset( dynamic_cast< SdrTextObj* >( mpView->GetTextEditObject() ) ); @@ -1348,7 +1260,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) && (sal_uInt16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { - // Anwahl per Doppelklick -> kein QuickDrag zulassen + // selection wit double click -> do not allow QuickDrag bQuickDrag = sal_False; } diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 69d6e53a0bdd..cdb8a9d861f7 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -53,12 +53,6 @@ namespace sd { TYPEINIT1( FuThesaurus, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuThesaurus::FuThesaurus( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 41339e773deb..26ce80449cbe 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -37,12 +37,6 @@ namespace sd { TYPEINIT1( FuTransform, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index fc4d1b658bc0..754500c6a49a 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -31,12 +31,6 @@ namespace sd { TYPEINIT1( FuTextAttrDlg, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuTextAttrDlg::FuTextAttrDlg ( ViewShell* pViewSh, ::sd::Window* pWin, @@ -82,7 +76,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) { delete( pDlg ); } - return; // Abbruch + return; // Cancel } delete( pDlg ); } diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index a4b54eadc461..ecf9893c45a1 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -36,12 +36,6 @@ namespace sd TYPEINIT1( FuVectorize, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuVectorize::FuVectorize ( ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index f04468dc6c1f..254396ed4b08 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -42,12 +42,6 @@ sal_uInt16 SidArrayZoom[] = { TYPEINIT1( FuZoom, FuPoor ); -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - FuZoom::FuZoom( ViewShell* pViewSh, ::sd::Window* pWin, @@ -60,12 +54,6 @@ FuZoom::FuZoom( { } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - FuZoom::~FuZoom() { if (bVisible) @@ -84,12 +72,6 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: return xFunc; } -/************************************************************************* -|* -|* MouseButtonDown-event -|* -\************************************************************************/ - sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents @@ -104,12 +86,6 @@ sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) return sal_True; } -/************************************************************************* -|* -|* MouseMove-event -|* -\************************************************************************/ - sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) { if (bStartDrag) @@ -155,12 +131,6 @@ sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) return bStartDrag; } -/************************************************************************* -|* -|* MouseButtonUp-event -|* -\************************************************************************/ - sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents @@ -183,7 +153,7 @@ sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() < (long) nTol ) { - // Klick auf der Stelle: Zoomfaktor verdoppeln + // click at place: double zoom factor Point aPos = mpWindow->PixelToLogic(aPosPix); Size aSize = mpWindow->PixelToLogic(mpWindow->GetOutputSizePixel()); aSize.Width() /= 2; @@ -208,12 +178,6 @@ sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) return sal_True; } -/************************************************************************* -|* -|* Function aktivieren -|* -\************************************************************************/ - void FuZoom::Activate() { aPtr = mpWindow->GetPointer(); @@ -228,12 +192,6 @@ void FuZoom::Activate() } } -/************************************************************************* -|* -|* Function deaktivieren -|* -\************************************************************************/ - void FuZoom::Deactivate() { mpWindow->SetPointer( aPtr ); diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 29d4f534442a..013f538a1329 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -22,12 +22,6 @@ TYPEINIT1(SdUndoGroup, SdUndoAction); -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - SdUndoGroup::~SdUndoGroup() { size_t nLast = aCtn.size(); @@ -38,12 +32,6 @@ SdUndoGroup::~SdUndoGroup() aCtn.clear(); } -/************************************************************************* -|* -|* Merge -|* -\************************************************************************/ - sal_Bool SdUndoGroup::Merge( SfxUndoAction* pNextAction ) { sal_Bool bRet = sal_False; @@ -62,12 +50,9 @@ sal_Bool SdUndoGroup::Merge( SfxUndoAction* pNextAction ) return bRet; } -/************************************************************************* -|* -|* Undo, umgekehrte Reihenfolge der Ausfuehrung -|* -\************************************************************************/ - +/** + * Undo, reverse order of execution + */ void SdUndoGroup::Undo() { long nLast = aCtn.size(); @@ -78,12 +63,6 @@ void SdUndoGroup::Undo() } -/************************************************************************* -|* -|* Redo -|* -\************************************************************************/ - void SdUndoGroup::Redo() { size_t nLast = aCtn.size(); @@ -94,12 +73,6 @@ void SdUndoGroup::Redo() } -/************************************************************************* -|* -|* eine Aktion hinzufuegen -|* -\************************************************************************/ - void SdUndoGroup::AddAction(SdUndoAction* pAction) { aCtn.push_back(pAction); diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index dcc5e64c4d17..255ec111be70 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -24,10 +24,6 @@ #include "strings.hrc" #include <svl/itemset.hxx> -// --------------------------- -// - BackgroundObjUndoAction - -// --------------------------- - TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index 2da0f44d28ff..f8de55a85149 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -36,22 +36,10 @@ TYPEINIT1(SdPageLRUndoAction, SdUndoAction); TYPEINIT1(SdPageULUndoAction, SdUndoAction); -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - SdPageFormatUndoAction::~SdPageFormatUndoAction() { } -/************************************************************************* -|* -|* Undo() -|* -\************************************************************************/ - void SdPageFormatUndoAction::Undo() { Rectangle aOldBorderRect(mnOldLeft, mnOldUpper, mnOldRight, mnOldLower); @@ -114,12 +102,9 @@ void SdPageULUndoAction::Undo() mpPage->SetLwrBorder(mnOldLower); } -/************************************************************************* -|* -|* UL-Redo() -|* -\************************************************************************/ - +/** + * UL-Redo() + */ void SdPageULUndoAction::Redo() { mpPage->SetUppBorder(mnNewUpper); diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 834c71e2ee20..7553e4c9e34e 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -31,7 +31,7 @@ SdMoveStyleSheetsUndoAction::SdMoveStyleSheetsUndoAction( SdDrawDocument* pTheDo maStyles.swap( rTheStyles ); maListOfChildLists.resize( maStyles.size() ); - // Liste mit den Listen der StyleSheet-Kinder erstellen + // create list with lists of style sheet children std::size_t i = 0; for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); ++iter ) { @@ -39,12 +39,6 @@ SdMoveStyleSheetsUndoAction::SdMoveStyleSheetsUndoAction( SdDrawDocument* pTheDo } } -/************************************************************************* -|* -|* Undo() -|* -\************************************************************************/ - void SdMoveStyleSheetsUndoAction::Undo() { SfxStyleSheetBasePool* pPool = mpDoc->GetStyleSheetPool(); diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index ec4946dbb448..9f5321e18e5e 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -25,15 +25,9 @@ TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction); -/************************************************************************* -|* -|* Undo() -|* -\************************************************************************/ - void SdAnimationPrmsUndoAction::Undo() { - // keine neu Info erzeugt: Daten restaurieren + // no new info created: restore data if (!bInfoCreated) { SdDrawDocument* pDoc = (SdDrawDocument*)pObject->GetModel(); @@ -62,23 +56,16 @@ void SdAnimationPrmsUndoAction::Undo() pInfo->mbSecondPlayFull = bOldSecondPlayFull; } } - // Info wurde durch Aktion erzeugt: Info loeschen + // info was created by action: delete info else { pObject->DeleteUserData(0); } - // Damit ein ModelHasChanged() ausgeloest wird, um das Effekte-Window - // auf Stand zu bringen (Animations-Reihenfolge) + // force ModelHasChanged() in order to update effect window (animation order) pObject->SetChanged(); pObject->BroadcastObjectChange(); } -/************************************************************************* -|* -|* Redo() -|* -\************************************************************************/ - void SdAnimationPrmsUndoAction::Redo() { SdAnimationInfo* pInfo = NULL; @@ -105,18 +92,11 @@ void SdAnimationPrmsUndoAction::Redo() pInfo->mbSecondSoundOn = bNewSecondSoundOn; pInfo->mbSecondPlayFull = bNewSecondPlayFull; - // Damit ein ModelHasChanged() ausgeloest wird, um das Effekte-Window - // auf Stand zu bringen (Animations-Reihenfolge) + // force ModelHasChanged() in order to update effect window (animation order) pObject->SetChanged(); pObject->BroadcastObjectChange(); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - SdAnimationPrmsUndoAction::~SdAnimationPrmsUndoAction() { } diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 4cb0840e9c4f..96d7268280ad 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -28,13 +28,6 @@ TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction); - -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( SdDrawDocument* pTheDoc, String aTheOldLayoutName, @@ -56,12 +49,6 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( aComment = String(SdResId(STR_UNDO_SET_PRESLAYOUT)); } -/************************************************************************* -|* -|* Undo() -|* -\************************************************************************/ - void SdPresentationLayoutUndoAction::Undo() { pPage->SetPresentationLayout(aOldLayoutName, sal_True, sal_True, sal_True); @@ -69,12 +56,6 @@ void SdPresentationLayoutUndoAction::Undo() pPage->SetAutoLayout(eOldAutoLayout, sal_True); } -/************************************************************************* -|* -|* Redo() -|* -\************************************************************************/ - void SdPresentationLayoutUndoAction::Redo() { pPage->SetPresentationLayout(aNewLayoutName); @@ -82,22 +63,10 @@ void SdPresentationLayoutUndoAction::Redo() pPage->SetAutoLayout(eNewAutoLayout, sal_True); } -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction() { } -/************************************************************************* -|* -|* Kommentar liefern -|* -\************************************************************************/ - rtl::OUString SdPresentationLayoutUndoAction::GetComment() const { return aComment; |