sw/source/core/docnode/ndnum.cxx | 8 ++++----
sw/source/core/docnode/ndsect.cxx | 2 +-
sw/source/core/draw/dcontact.cxx | 32 ++++++++++++++++----------------
sw/source/core/draw/dpage.cxx | 12 ++++++------
sw/source/core/draw/drawdoc.cxx | 14 +++++++-------
5 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 2230dd01ff923d7e86143379fa96c3f3a114b913
Author: Matthias Freund <matti...@yahoo.de>
Date: Wed Feb 13 19:39:39 2013 +0100
Comment translation german - english - redo of 5 files
I have send it again and abandon the old changes. Hope this is correct?
:-D
Change-Id: Ib7668f30d4c813ce656e9d8d5fcc0060d1a6aff5
Reviewed-on: https://gerrit.libreoffice.org/2143
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 86d3e44..91b861ec 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -21,7 +21,7 @@
#include <doc.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-#include <fldbas.hxx> // UpdateFlds der KapitelNummerierung
+#include <fldbas.hxx> // UpdateFlds of the chapter numbering
#include <docary.hxx>
bool CompareSwOutlineNodes::operator()( SwNode* const& lhs, SwNode* const&
rhs) const
@@ -67,20 +67,20 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
pTxtNd->UpdateOutlineState();
- // die Gliederungs-Felder Updaten
+ // update the structure fields
GetDoc()->GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
}
}
void SwNodes::UpdtOutlineIdx( const SwNode& rNd )
{
- if( pOutlineNds->empty() ) // keine OutlineNodes vorhanden ?
+ if( pOutlineNds->empty() ) // no OutlineNodes present ?
return;
const SwNodePtr pSrch = (SwNodePtr)&rNd;
sal_uInt16 nPos;
pOutlineNds->Seek_Entry( pSrch, &nPos );
- if( nPos == pOutlineNds->size() ) // keine zum Updaten vorhanden ?
+ if( nPos == pOutlineNds->size() ) // none present for updating ?
return;
if( nPos )
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 42983c9..d798fa1 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1227,7 +1227,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc,
const SwNodeIndex& rIdx ) c
// In which array am I: Nodes, UndoNodes?
const SwNodes& rNds = GetNodes();
- // Copy the das SectionFrmFmt
+ // Copy the SectionFrmFmt
SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
pSectFmt->CopyAttrs( *GetSection().GetFmt() );
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3449521..ed69adb 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -89,11 +89,11 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor
)
}
-//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 @@ sal_Bool HasWrap( const SdrObject* pObj )
/*****************************************************************************
*
- * GetBoundRect liefert das BoundRect _inklusive_ Abstand des Objekts.
+ * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
*
*****************************************************************************/
@@ -151,7 +151,7 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj )
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 @@ SwContact* GetUserCall( const SdrObject* pObj )
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 @@ sal_Bool IsMarqueeTextObj( const SdrObject& rObj )
/*************************************************************************
|*
-|* SwContact, Ctor und Dtor
+|* SwContact, Ctor and Dtor
|*
|*************************************************************************/
@@ -643,8 +643,8 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn,
SdrObject* pObj ) :
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,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
return;
}
- //Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft.
+ //Put on Action, but not if presently anywhere an action runs.
ViewShell *pSh = 0, *pOrg;
SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
if ( pTmpRoot && pTmpRoot->IsCallbackActionEnabled() )
@@ -1125,7 +1125,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
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 +1203,7 @@ class NestedUserCallHdl
};
//
-// !!!ACHTUNG!!! The object may commit suicide!!!
+// !!!ATTENTION!!! The object may commit suicide!!!
//
void SwDrawContact::_Changed( const SdrObject& rObj,
SdrUserCallType eType,
@@ -1485,7 +1485,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld,
const SfxPoolItem *pNew )
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 +1812,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor*
pAnch )
pPage->AppendDrawObj( maAnchoredDrawObj );
}
else
- //Sieht doof aus, ist aber erlaubt (vlg.
SwFEShell::SetPageObjsNewPage)
+ //Looks stupid but is allowed (compare
SwFEShell::SetPageObjsNewPage)
pRoot->SetAssertFlyPages();
}
break;
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index c10134d..dbb61e2 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -111,7 +111,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList(
if ( pRect )
{
- //Das Drawing verlang alle Seiten, die mit dem Rect
ueberlappen.
+ //The drawing demands all pages which overlap with the rest.
const SwRect aRect( *pRect );
const SwFrm *pPg = pSh->GetLayout()->Lower();
do
@@ -122,7 +122,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList(
}
else
{
- //Das Drawing verlangt alle sichbaren Seiten
+ //The drawing demands all visible pages
const SwFrm *pPg = pSh->Imp()->GetFirstVisPage();
if ( pPg )
do
@@ -174,11 +174,11 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView*
pView,
if( rURL.IsServerMap() )
{
- // dann die rel. Pixel Position anhaengen !!
+ // then append the relative pixel position!!
Point aPt( aPos );
aPt -= pFly->Frm().Pos();
- // ohne MapMode-Offset !!!!!
- // ohne MapMode-Offset, ohne Offset, o ... !!!!!
+ // without MapMode-Offset !!!!!
+ // without MapMode-Offset, without Offset, w ... !!!!!
aPt = pWindow->LogicToPixel(
aPt, MapMode( MAP_TWIP ) );
((( sTxt += '?' ) += String::CreateFromInt32( aPt.X() ))
@@ -209,7 +209,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView*
pView,
}
else
{
- // dann zeige die Hilfe mal an:
+ // then display the help:
Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
Help::ShowQuickHelp( pWindow, aRect, sTxt );
}
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index ef814bc..ee35d1e9 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
/*************************************************************************
|*
-|* Konstruktor
+|* Constructor
|*
\************************************************************************/
@@ -122,7 +122,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
/*************************************************************************
|*
-|* Destruktor
+|* Destructor
|*
\************************************************************************/
@@ -136,10 +136,10 @@ SwDrawDocument::~SwDrawDocument()
/*************************************************************************
|*
-|* Diese Methode erzeugt eine neue Seite (SdPage) und gibt einen Zeiger
-|* darauf zurueck. Die Drawing Engine benutzt diese Methode beim Laden
-|* zur Erzeugung von Seiten (deren Typ sie ja nicht kennt, da es ABLEITUNGEN
-|* der SdrPage sind).
+|* This method creates a new page (SdPage) and thereupon returns a pointer
+|* to it back. The drawing engine is using this method while loading for
+|* the creating of pages (whose type it not even know, because they are
+|* inherited from SdrPage).
|*
\************************************************************************/
@@ -158,7 +158,7 @@ uno::Reference<embed::XStorage>
SwDrawDocument::GetDocumentStorage() const
SdrLayerID SwDrawDocument::GetControlExportLayerId( const SdrObject & ) const
{
- //fuer Versionen < 5.0, es gab nur Hell und Heaven
+ //for versions < 5.0, there was only Hell and Heaven
return (SdrLayerID)pDoc->GetHeavenId();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
