Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2124

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2124/1

Comment translation german - english

Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
---
M sw/source/core/draw/dcontact.cxx
1 file changed, 17 insertions(+), 16 deletions(-)



diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3449521..e1a5b53 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -89,11 +89,11 @@
 }
 
 
-//Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
-//Wenn das Object ein SwVirtFlyDrawObj ist so wird das Format von
-//selbigem besorgt.
-//Anderfalls ist es eben ein einfaches Zeichenobjekt. Diese hat einen
-//UserCall und der ist Client vom gesuchten Format.
+// The Get reverse way: seeks the format to the specified object.
+// If the object is a SwVirtFlyDrawObj then the format of this
+// will be acquired.
+// Otherwise it is just a simple drawing object. This has a
+// UserCall and is the client of the searched format.
 
 SwFrmFmt *FindFrmFmt( SdrObject *pObj )
 {
@@ -130,7 +130,7 @@
 
 /*****************************************************************************
  *
- * GetBoundRect liefert das BoundRect _inklusive_ Abstand des Objekts.
+ * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
  *
  *****************************************************************************/
 
@@ -151,7 +151,7 @@
     return aRet;
 }
 
-//Liefert den UserCall ggf. vom Gruppenobjekt
+// Returns the UserCall if applicable from the group object
 // OD 2004-03-31 #i26791# - change return type
 SwContact* GetUserCall( const SdrObject* pObj )
 {
@@ -163,7 +163,7 @@
     return static_cast<SwContact*>(pObj->GetUserCall());
 }
 
-// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
 sal_Bool IsMarqueeTextObj( const SdrObject& rObj )
 {
     SdrTextAniKind eTKind;
@@ -175,7 +175,7 @@
 
 /*************************************************************************
 |*
-|*  SwContact, Ctor und Dtor
+|*  SwContact, Ctor and Dtor
 |*
 |*************************************************************************/
 
@@ -643,8 +643,8 @@
                                 InsertObject( pObj, pObj->GetOrdNumDirect() );
     }
 
-    //Controls muessen immer im Control-Layer liegen. Das gilt auch fuer
-    //Gruppenobjekte, wenn diese Controls enthalten.
+    //Controls have to be always in the Control-Layer. This is also true for
+    //group objects, if they contain controls.
     if ( ::CheckControlLayer( pObj ) )
     {
         // set layer of object to corresponding invisible layer.
@@ -1105,7 +1105,8 @@
         return;
     }
 
-    //Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft.
+    //Put on Action, but not if presently anywhere an action runs.
+aber nicht wenn gerade irgendwo eine Action laeuft.
     ViewShell *pSh = 0, *pOrg;
     SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
     if ( pTmpRoot && pTmpRoot->IsCallbackActionEnabled() )
@@ -1125,7 +1126,7 @@
             pTmpRoot->StartAllAction();
     }
     SdrObjUserCall::Changed( rObj, eType, rOldBoundRect );
-    _Changed( rObj, eType, &rOldBoundRect );    //Achtung, ggf. Suizid!
+    _Changed( rObj, eType, &rOldBoundRect );    //Attention, possibly suicidal!
 
     if ( pSh )
         pTmpRoot->EndAllAction();
@@ -1203,7 +1204,7 @@
 };
 
 //
-// !!!ACHTUNG!!! The object may commit suicide!!!
+// !!!ATTENTION!!! The object may commit suicide!!!
 //
 void SwDrawContact::_Changed( const SdrObject& rObj,
                               SdrUserCallType eType,
@@ -1485,7 +1486,7 @@
 
     if ( pNewAnchorFmt )
     {
-        // nicht auf ein Reset Anchor reagieren !!!!!
+        // Do not respond to a Reset Anchor !!!!!
         if ( SFX_ITEM_SET ==
                 GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, sal_False ) )
         {
@@ -1812,7 +1813,7 @@
                     pPage->AppendDrawObj( maAnchoredDrawObj );
                 }
                 else
-                    //Sieht doof aus, ist aber erlaubt (vlg. SwFEShell::SetPageObjsNewPage)
+                    //Looks stupid but is allowed (compare SwFEShell::SetPageObjsNewPage)
                     pRoot->SetAssertFlyPages();
                 }
                 break;

-- 
To view, visit https://gerrit.libreoffice.org/2124
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.