[Libreoffice-commits] .: sw/source
Philipp Weissenbacher
p.weissenbacher at kemper.freedesktop.org
Thu Apr 12 11:15:09 PDT 2012
sw/source/core/text/frminf.cxx | 51 +++++++++++++++++-----------------
sw/source/core/text/itrtxt.hxx | 60 ++++++++++++++++++++---------------------
sw/source/core/text/porfld.hxx | 44 +++++++++++++++---------------
sw/source/core/text/porlin.hxx | 37 ++++++++++++-------------
4 files changed, 95 insertions(+), 97 deletions(-)
New commits:
commit c5718b012fcbd19c79ff6eb07ca00a39ae643d8d
Author: Philipp Weissenbacher <p.weissenbacher at gmail.com>
Date: Thu Apr 12 20:09:53 2012 +0200
Translate German comments
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 8808032..93b4c01 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -75,7 +75,7 @@ xub_StrLen SwTxtMargin::GetTxtEnd() const
* SwTxtFrmInfo::IsOneLine()
*************************************************************************/
-// Passt der Absatz in eine Zeile?
+// Does the paragraph fit into one line?
sal_Bool SwTxtFrmInfo::IsOneLine() const
{
const SwLineLayout *pLay = pFrm->GetPara();
@@ -83,7 +83,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const
return sal_False;
else
{
- // 6575: bei Follows natuerlich sal_False
+ // For follows sal_False of course
if( pFrm->GetFollow() )
return sal_False;
pLay = pLay->GetNext();
@@ -101,7 +101,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const
* SwTxtFrmInfo::IsFilled()
*************************************************************************/
-// Ist die Zeile zu X% gefuellt?
+// Is the line filled for X percent?
sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
{
const SwLineLayout *pLay = pFrm->GetPara();
@@ -120,7 +120,7 @@ sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
* SwTxtFrmInfo::GetLineStart()
*************************************************************************/
-// Wo beginnt der Text (ohne whitespaces)? ( Dokument global )
+// Where does the text start (without whitespace)? (document global)
SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const
{
xub_StrLen nTxtStart = rLine.GetTxtStart();
@@ -143,7 +143,7 @@ SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const
* SwTxtFrmInfo::GetLineStart()
*************************************************************************/
-// Wo beginnt der Text (ohne whitespaces)? (rel. im Frame)
+// Where does the text start (without whitespace)? (relative in the Frame)
SwTwips SwTxtFrmInfo::GetLineStart() const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
@@ -151,7 +151,7 @@ SwTwips SwTxtFrmInfo::GetLineStart() const
return GetLineStart( aLine ) - pFrm->Frm().Left() - pFrm->Prt().Left();
}
-// errechne die Position des Zeichens und gebe die Mittelposition zurueck
+// Calculates the character's position and returns the middle position
SwTwips SwTxtFrmInfo::GetCharPos( xub_StrLen nChar, sal_Bool bCenter ) const
{
SWRECTFN( pFrm )
@@ -197,11 +197,11 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
{
if( nLen )
{
- // Es koennte auch der erste sein.
+ // It could be the first
if( pPam->HasMark() )
{
- // liegt die neue Position genau hinter der aktuellen, dann
- // erweiter den Pam einfach
+ // If the new position is right after the current one, then
+ // simply extend the Pam
if( nPos == pPam->GetPoint()->nContent.GetIndex() )
{
pPam->GetPoint()->nContent += nLen;
@@ -218,7 +218,7 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
return pPam;
}
-// Sammelt die whitespaces am Zeilenbeginn und -ende im Pam
+// Accumulates the whitespace at line start and end in the Pam
void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
@@ -230,14 +230,14 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
if( aLine.GetCurr()->GetLen() )
{
xub_StrLen nPos = aLine.GetTxtStart();
- // Bug 49649: von der ersten Line die Blanks/Tabs NICHT
- // mit selektieren
+ // Do NOT include the blanks/tabs from the first line
+ // in the selection
if( !bFirstLine && nPos > aLine.GetStart() )
pPam = AddPam( pPam, pFrm, aLine.GetStart(),
nPos - aLine.GetStart() );
- // Bug 49649: von der letzten Line die Blanks/Tabs NICHT
- // mit selektieren
+ // Do NOT include the blanks/tabs from the last line
+ // in the selection
if( aLine.GetNext() )
{
nPos = aLine.GetTxtEnd();
@@ -260,7 +260,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
* SwTxtFrmInfo::IsBullet()
*************************************************************************/
-// Ist an der Textposition ein Bullet/Symbol etc?
+// Is there a bullet/symbol etc. at the text position?
// Fonts: CharSet, SYMBOL und DONTKNOW
sal_Bool SwTxtFrmInfo::IsBullet( xub_StrLen nTxtStart ) const
{
@@ -274,11 +274,10 @@ sal_Bool SwTxtFrmInfo::IsBullet( xub_StrLen nTxtStart ) const
* SwTxtFrmInfo::GetFirstIndent()
*************************************************************************/
-// Ermittelt Erstzeileneinzug
-// Voraussetzung fuer pos. oder neg. EZE ist, dass alle
-// Zeilen ausser der ersten Zeile den selben linken Rand haben.
-// Wir wollen nicht so knauserig sein und arbeiten mit einer Toleranz
-// von TOLERANCE Twips.
+// Get first line indent
+// The precondition for a positive or negative first line indent:
+// All lines (except for the first one) have the same left margin.
+// We do not want to be so picky and work with a tolerance of TOLERANCE twips.
#define TOLERANCE 20
@@ -302,7 +301,7 @@ SwTwips SwTxtFrmInfo::GetFirstIndent() const
}
}
- // Vorerst wird nur +1, -1 und 0 returnt.
+ // At first we only return +1, -1 and 0
if( nLeft == nFirst )
return 0;
else
@@ -325,14 +324,14 @@ KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
if( pNextFrm )
{
- // ich bin einzeilig
+ // I'm a single line
SwTxtSizeInfo aNxtInf( (SwTxtFrm*)pNextFrm );
SwTxtCursor aNxtLine( (SwTxtFrm*)pNextFrm, &aNxtInf );
nNextIndent = GetLineStart( aNxtLine );
}
else
{
- // ich bin mehrzeilig
+ // I'm multi-line
if( aLine.Next() )
{
nNextIndent = GetLineStart( aLine );
@@ -348,7 +347,7 @@ KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
if( 1 >= rFndPos )
return 0;
- // steht vor einem "nicht Space"
+ // Is on front of a non-space
const XubString& rTxt = aInf.GetTxt();
xub_Unicode aChar = rTxt.GetChar( rFndPos );
if( CH_TAB == aChar || CH_BREAK == aChar || ' ' == aChar ||
@@ -356,12 +355,12 @@ KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
aInf.HasHint( rFndPos ) ) )
return 0;
- // und hinter einem "Space"
+ // and after a space
aChar = rTxt.GetChar( rFndPos - 1 );
if( CH_TAB != aChar && CH_BREAK != aChar &&
( ( CH_TXTATR_BREAKWORD != aChar && CH_TXTATR_INWORD != aChar ) ||
!aInf.HasHint( rFndPos - 1 ) ) &&
- // mehr als 2 Blanks !!
+ // More than two Blanks!
( ' ' != aChar || ' ' != rTxt.GetChar( rFndPos - 2 ) ) )
return 0;
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 218e10e..b6e1504 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -51,19 +51,19 @@ protected:
SwLineLayout *pPrev;
SwTwips nFrameStart;
SwTwips nY;
- SwTwips nRegStart; // Anfangsposition (Y) des Registers
- xub_StrLen nStart; // Start im Textstring, Ende = pCurr->GetLen()
- KSHORT nRegDiff; // Zeilenabstand des Registers
- MSHORT nLineNr; // Zeilennummer
+ SwTwips nRegStart; // The register's start position (Y)
+ xub_StrLen nStart; // Start in the text string, end = pCurr->GetLen()
+ KSHORT nRegDiff; // Register's line distance
+ MSHORT nLineNr; // Line number
sal_Bool bPrev : 1;
- sal_Bool bRegisterOn : 1; // Registerhaltigkeit
- sal_Bool bOneBlock : 1; // Blocksatz: Einzelwoerter austreiben
- sal_Bool bLastBlock : 1; // Blocksatz: Auch die letzte Zeile
- sal_Bool bLastCenter : 1; // Blocksatz: Letzte Zeile zentrieren
+ sal_Bool bRegisterOn : 1; // Keep in register
+ sal_Bool bOneBlock : 1; // Justified text: Dispose single words
+ sal_Bool bLastBlock : 1; // Justified text: Also the last line
+ sal_Bool bLastCenter : 1; // Justified text: Center last line
SwLineLayout *_GetPrev();
- // Zuruecksetzen in die erste Zeile.
+ // Reset in the first line
void Init();
void CtorInitTxtIter( SwTxtFrm *pFrm, SwTxtInfo *pInf );
inline SwTxtIter(SwTxtNode* pTxtNode)
@@ -76,7 +76,7 @@ protected:
public:
inline SwTxtIter( SwTxtFrm *pTxtFrm, SwTxtInfo *pTxtInf ) : SwAttrIter(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
{ CtorInitTxtIter( pTxtFrm, pTxtInf ); }
- inline const SwLineLayout *GetCurr() const { return pCurr; } // niemals 0!
+ inline const SwLineLayout *GetCurr() const { return pCurr; } // NEVER 0!
inline const SwLineLayout *GetNext() const { return pCurr->GetNext(); }
const SwLineLayout *GetPrev();
inline xub_StrLen GetLength() const { return pCurr->GetLen(); }
@@ -97,7 +97,7 @@ public:
const SwLineLayout *Next();
const SwLineLayout *Prev();
- // Ueberspringt die Dummyzeilen der FlyFrms
+ // Skips the FlyFrms dummy line
const SwLineLayout *NextLine();
const SwLineLayout *PrevLine();
const SwLineLayout *GetNextLine() const;
@@ -106,18 +106,18 @@ public:
void CharToLine( const xub_StrLen );
const SwLineLayout *TwipsToLine(const SwTwips);
- // schneidet ab pCurr alle ab.
+ // Truncates all after pCurr
void TruncLines( sal_Bool bNoteFollow = sal_False );
inline KSHORT GetLineHeight() const { return pCurr->GetRealHeight(); }
void CalcAscentAndHeight( KSHORT &rAscent, KSHORT &rHeight ) const;
- // 5298, viel Aerger durch die Abfrage auf pCurr == pPara
+ // Lots of trouble for querying pCurr == pPara
inline sal_Bool IsFirstTxtLine() const
{ return nStart == GetInfo().GetTxtStart() &&
!( pCurr->IsDummy() && GetNextLine() ); }
- // Als Ersatz fuer das alte IsFirstLine()
+ // Replacement for the old IsFirstLine()
inline sal_Bool IsParaLine() const
{ return pCurr == pInf->GetParaPortion(); }
@@ -130,7 +130,7 @@ public:
inline SwTxtFrm *GetTxtFrm() { return pFrm; }
inline const SwTxtFrm *GetTxtFrm() const { return pFrm; }
- // zaehlt aufeinanderfolgende Trennungen, um MaxHyphens einzuhalten
+ // Counts consecutive hyphens in order to be within the boundary given by MaxHyphens
void CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const;
};
@@ -153,9 +153,9 @@ private:
SwTwips mnTabLeft;
protected:
- // fuer FormatQuoVadis
+ // For FormatQuoVadis
inline void Right( const SwTwips nNew ) { nRight = nNew; }
- // fuer CalcFlyAdjust
+ // For CalcFlyAdjust
inline void SetDropLeft( const KSHORT nNew ) { nDropLeft = nNew; }
void CtorInitTxtMargin( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
@@ -195,8 +195,8 @@ public:
inline void SetDropDescent( const KSHORT nNew ) { nDropDescent = nNew; }
void DropInit();
- // liefert TxtPos fuer Start und Ende der aktuellen Zeile ohne whitespaces
- // In frminf.cxx implementiert.
+ // Returns the TxtPos for start and end of the current line without whitespace
+ // Implemented in frminf.cxx
xub_StrLen GetTxtStart() const;
xub_StrLen GetTxtEnd() const;
@@ -214,22 +214,22 @@ public:
class SwTxtAdjuster : public SwTxtMargin
{
- // Gleicht die Portions aus, wenn Adjustment und FlyFrms vorliegen.
+ // Adjusts the portion, if we have adjustment and FlyFrms
void CalcFlyAdjust( SwLineLayout *pCurr );
- // ruft SplitGlues und CalcBlockAdjust
+ // Calls SplitGlues and CalcBlockAdjust
void FormatBlock( );
- // Erstellt bei kurzen Zeilen die Glue-Kette.
+ // Creates the glue chain for short lines
SwMarginPortion* CalcRightMargin( SwLineLayout *pCurr, SwTwips nReal = 0 );
- // Berechnung des Adjustments (FlyPortions)
+ // Calculate the adjustment (FlyPortions)
SwFlyPortion *CalcFlyPortion( const long nRealWidth,
const SwRect &rCurrRect );
protected:
inline SwTxtAdjuster(SwTxtNode* pTxtNode) : SwTxtMargin(pTxtNode) { }
- // spannt beim Blocksatz die Glues auf.
+ // Creates the Glues for adjusted paragraphs
void CalcNewBlock( SwLineLayout *pCurr, const SwLinePortion *pStopAt,
SwTwips nReal = 0, bool bSkipKashida = false );
SwTwips CalcKanaAdj( SwLineLayout *pCurr );
@@ -237,17 +237,17 @@ public:
inline SwTxtAdjuster( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtMargin(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
{ CtorInitTxtMargin( pTxtFrm, pTxtSizeInf ); }
- // wird von SwTxtFormatter wegen UpdatePos ueberladen
+ // Is overloaded by SwTxtFormatter due to UpdatePos
void CalcAdjLine( SwLineLayout *pCurr );
- // sorgt fuer das nachtraegliche adjustieren
+ // For adjusting afterwards
inline void GetAdjusted() const
{
if( pCurr->IsFormatAdj() )
((SwTxtAdjuster*)this)->CalcAdjLine( pCurr );
}
- // DropCaps-Extrawurst
+ // Special treatment for DropCaps
void CalcDropAdjust();
void CalcDropRepaint();
};
@@ -262,7 +262,7 @@ class SwTxtCursor : public SwTxtAdjuster
// and to restore them
friend class SwTxtCursorSave;
- // 1170: Mehrdeutigkeiten
+ // Ambiguities
static sal_Bool bRightMargin;
void _GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* );
protected:
@@ -277,7 +277,7 @@ public:
const long nMax = 0 );
xub_StrLen GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
const MSHORT nChgNode, SwCrsrMoveState* = 0 ) const;
- // 1170: beruecksichtigt Mehrdeutigkeiten; Implementierung s.u.
+ // Respects ambiguities: For the implementation see below
const SwLineLayout *CharCrsrToLine( const xub_StrLen nPos );
// calculates baseline for portion rPor
@@ -308,7 +308,7 @@ public:
};
/*************************************************************************
- * Inline-Implementierungen
+ * Inline implementation
*************************************************************************/
inline sal_Bool SwTxtIter::SeekAndChg( SwTxtSizeInfo &rInf )
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 673681e..32198e7 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -45,19 +45,19 @@ class SwFldPortion : public SwExpandPortion
{
friend class SwTxtFormatter;
protected:
- XubString aExpand; // das expandierte Feld
- SwFont *pFnt; // Fuer mehrzeilige Felder
- xub_StrLen nNextOffset; // Offset des Follows im Originalstring
+ XubString aExpand; // The expanded field
+ SwFont *pFnt; // For multi-line fields
+ xub_StrLen nNextOffset; // Offset of the follow in the original string
xub_StrLen nNextScriptChg;
- KSHORT nViewWidth; // Screenbreite fuer leere Felder
- sal_Bool bFollow : 1; // 2. oder weiterer Teil eines Feldes
- sal_Bool bLeft : 1; // wird von SwNumberPortion benutzt
- sal_Bool bHide : 1; // wird von SwNumberPortion benutzt
- sal_Bool bCenter : 1; // wird von SwNumberPortion benutzt
- sal_Bool bHasFollow : 1; // geht in der naechsten Zeile weiter
- sal_Bool bAnimated : 1; // wird von SwGrfNumPortion benutzt
- sal_Bool bNoPaint : 1; // wird von SwGrfNumPortion benutzt
- sal_Bool bReplace : 1; // wird von SwGrfNumPortion benutzt
+ KSHORT nViewWidth; // Screen width for empty fields
+ sal_Bool bFollow : 1; // 2nd or later part of a field
+ sal_Bool bLeft : 1; // Used by SwNumberPortion
+ sal_Bool bHide : 1; // Used by SwNumberPortion
+ sal_Bool bCenter : 1; // Used by SwNumberPortion
+ sal_Bool bHasFollow : 1; // Continues on the next line
+ sal_Bool bAnimated : 1; // Used by SwGrfNumPortion
+ sal_Bool bNoPaint : 1; // Used by SwGrfNumPortion
+ sal_Bool bReplace : 1; // Used by SwGrfNumPortion
const sal_Bool bPlaceHolder : 1;
sal_Bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR)
@@ -81,7 +81,7 @@ public:
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- // leere Felder sind auch erlaubt
+ // Empty fields are also allowed
virtual SwLinePortion *Compress();
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
@@ -107,10 +107,10 @@ public:
inline xub_StrLen GetNextScriptChg() const { return nNextScriptChg; }
inline void SetNextScriptChg( xub_StrLen nNew ) { nNextScriptChg = nNew; }
- // Felder-Cloner fuer SplitGlue
+ // Field cloner for SplitGlue
virtual SwFldPortion *Clone( const XubString &rExpand ) const;
- // Extra-GetTxtSize wegen pFnt
+ // Extra GetTxtSize because of pFnt
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
// Accessibility: pass information about this portion to the PortionHandler
@@ -122,7 +122,7 @@ public:
/*************************************************************************
* class SwHiddenPortion
*************************************************************************/
-// Unterscheidung nur fuer's Painten/verstecken.
+// Distinguish only for painting/hide
class SwHiddenPortion : public SwFldPortion
{
@@ -133,7 +133,7 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
- // Felder-Cloner fuer SplitGlue
+ // Field cloner for SplitGlue
virtual SwFldPortion *Clone( const XubString &rExpand ) const;
OUTPUT_OPERATOR
};
@@ -145,8 +145,8 @@ public:
class SwNumberPortion : public SwFldPortion
{
protected:
- KSHORT nFixWidth; // vgl. Glues
- KSHORT nMinDist; // minimaler Abstand zum Text
+ KSHORT nFixWidth; // See Glues
+ KSHORT nMinDist; // Minimal distance to the text
bool mbLabelAlignmentPosAndSpaceModeActive;
public:
@@ -160,7 +160,7 @@ public:
virtual xub_StrLen GetCrsrOfst( const MSHORT nOfst ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
- // Felder-Cloner fuer SplitGlue
+ // Field cloner for SplitGlue
virtual SwFldPortion *Clone( const XubString &rExpand ) const;
virtual void FormatEOL( SwTxtFormatInfo &rInf );
@@ -191,8 +191,8 @@ public:
class SwGrfNumPortion : public SwNumberPortion
{
SvxBrushItem* pBrush;
- long nId; //fuer StopAnimation
- SwTwips nYPos; //Enthaelt _immer_ die aktuelle RelPos.
+ long nId; // For StopAnimation
+ SwTwips nYPos; // _Always_ contains the current RelPos
SwTwips nGrfHeight;
sal_Int16 eOrient;
public:
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 98bfd1f..045519a 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -40,17 +40,16 @@ class SwTxtPaintInfo;
class SwTxtFormatInfo;
class SwPortionHandler;
-// Die Ausgabeoperatoren der Portions sind virtuelle Methoden der Portion.
-// Das CLASSIO-Makro implementiert die 'freischwebende' Funktion.
-// Auf diese Weise erhaelt man beide Vorteile: virtuelle Ausgabeoperatoren
-// und allgemeine Verwendbarkeit.
+// The portions output operators are virtual methods of the portion.
+// The CLASSIO macro implements the 'levitating' function.
+// In doing so we end up with both benefits: virtual output operators and general utility
#ifdef DBG_UTIL
#define OUTPUT_OPERATOR virtual SvStream &operator<<( SvStream & aOs ) const;
#else
#define OUTPUT_OPERATOR
#endif
-// Portiongruppen
+// Portion groups
#define PORGRP_TXT 0x8000
#define PORGRP_EXP 0x4000
#define PORGRP_FLD 0x2000
@@ -60,7 +59,7 @@ class SwPortionHandler;
#define PORGRP_FIX 0x0200
#define PORGRP_TAB 0x0100
#define PORGRP_NOTRECY 0x0080
-// kleine Spezialgruppen
+// Small special groups
#define PORGRP_FIXMARG 0x0040
//#define PORGRP_? 0x0020
#define PORGRP_TABNOTLFT 0x0010
@@ -73,11 +72,11 @@ class SwPortionHandler;
class SwLinePortion: public SwPosSize
{
protected:
- // Hier gibt es Bereiche mit unterschiedlichen Attributen.
+ // Here we have areas with different attributes
SwLinePortion *pPortion;
- // Anzahl der Zeichen und Spaces auf der Zeile
+ // Count of chars and spaces on the line
xub_StrLen nLineLength;
- KSHORT nAscent; // Maximaler Ascender
+ KSHORT nAscent; // Maximum ascender
SwLinePortion();
private:
@@ -89,7 +88,7 @@ public:
inline SwLinePortion(const SwLinePortion &rPortion);
virtual ~SwLinePortion();
- // Zugriffsmethoden
+ // Access methods
inline SwLinePortion *GetPortion() const { return( pPortion ); }
inline SwLinePortion &operator=(const SwLinePortion &rPortion);
inline sal_Bool operator==( const SwLinePortion &rPortion ) const;
@@ -106,19 +105,19 @@ public:
inline const SwPosSize &PrtSize() const { return *this; }
- // Einfuegeoperationen:
+ // Insert methods
virtual SwLinePortion *Insert( SwLinePortion *pPortion );
virtual SwLinePortion *Append( SwLinePortion *pPortion );
SwLinePortion *Cut( SwLinePortion *pVictim );
inline void Truncate();
- // liefert 0 zurueck, wenn keine Nutzdaten enthalten sind.
+ // Returns 0, if there's no payload
virtual SwLinePortion *Compress();
inline void SetWhichPor( const MSHORT nNew ) { nWhichPor = nNew; }
inline MSHORT GetWhichPor( ) const { return nWhichPor; }
-// Gruppenabfragen:
+// Group queries
inline sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; }
inline sal_Bool InGlueGrp( ) const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;}
inline sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; }
@@ -136,7 +135,7 @@ public:
{ return nWhichPor & PORGRP_FIXMARG ? sal_True : sal_False; }
inline sal_Bool InSpaceGrp( )const
{ return InTxtGrp() || IsMultiPortion(); }
-// Individuelle Abfragen:
+// Individual queries
inline sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; }
inline sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; }
inline sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; }
@@ -167,7 +166,7 @@ public:
inline sal_Bool IsNumberPortion( ) const{ return nWhichPor == POR_NUMBER; } // #i23726#
inline sal_Bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; }
- // Positionierung
+ // Positioning
SwLinePortion *FindPrevPortion( const SwLinePortion *pRoot );
SwLinePortion *FindLastPortion();
@@ -175,19 +174,19 @@ public:
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
void CalcTxtSize( const SwTxtSizeInfo &rInfo );
- // Ausgabe
+ // Output
virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
- // wird fuer die letzte Portion der Zeile extra gerufen
+ // Is called for the line's last portion
virtual void FormatEOL( SwTxtFormatInfo &rInf );
void Move( SwTxtPaintInfo &rInf );
- // Fuer SwTxtSlot
+ // For SwTxtSlot
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
- // fuer SwFldPortion, SwSoftHyphPortion
+ // For SwFldPortion, SwSoftHyphPortion
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
// for text- and multi-portions
More information about the Libreoffice-commits
mailing list