[Libreoffice-commits] core.git: sw/source
Alexander Wilms
f.alexander.wilms at gmail.com
Mon Feb 10 08:53:12 PST 2014
sw/source/core/docnode/nodes.cxx | 6 +-
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/edit/edglss.cxx | 2
sw/source/core/fields/dbfld.cxx | 2
sw/source/core/fields/expfld.cxx | 2
sw/source/core/fields/reffld.cxx | 13 ++---
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/flyfrms.hxx | 2
sw/source/core/inc/layact.hxx | 40 ++++++++--------
sw/source/core/inc/swfont.hxx | 94 +++++++++++++++++++-------------------
sw/source/core/inc/tabfrm.hxx | 17 +++---
11 files changed, 90 insertions(+), 92 deletions(-)
New commits:
commit 8314374293749dea65bf91da40a742ddeb404275
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Sat Feb 8 12:26:43 2014 +0100
Translated some German comments
Change-Id: Id8a4db32d0fe95ecf543fcfc82fd6b236d544616
Reviewed-on: https://gerrit.libreoffice.org/7948
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index de7685c..30c83fe 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1345,7 +1345,7 @@ sal_Bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& r
if( TstIdx( nStt, nEnd, pEndOfRedlines->StartOfSectionIndex(),
pEndOfRedlines->GetIndex() )) return sal_True;
- return sal_False; // liegt irgendwo dazwischen, FEHLER
+ return sal_False; // is somewhere in the middle, ERROR
}
/** Delete a number of nodes
@@ -2092,9 +2092,9 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
// search forward or backward for a content node
else if( 0 != ( pFrmNd = GoPrevSection( &aIdx, true, false )) &&
::CheckNodesRange( aIdx, rFrmIdx, true ) &&
- // nach vorne nie aus der Tabelle hinaus!
+ // Never out of the table at the start
pFrmNd->FindTableNode() == pTableNd &&
- // Bug 37652: nach hinten nie aus der Tabellenzelle hinaus!
+ // Bug 37652: Never out of the table at the end
(!pFrmNd->FindTableNode() || pFrmNd->FindTableBoxStartNode()
== pSttNd->FindTableBoxStartNode() ) &&
(!pSectNd || pSttNd->IsSectionNode() ||
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 92bcfc0..1e69917 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1238,7 +1238,7 @@ void SwAutoFormat::DelPrevPara()
SwTxtNode* pTNd = m_aDelPam.GetNode()->GetTxtNode();
if( pTNd )
{
- // erstmal den vorherigen Textnode benutzen.
+ // use the previous text node first
m_aDelPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
DeleteSel( m_aDelPam );
}
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 5bb7440..ac634cf 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -135,7 +135,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
SwPaM aCpyPam( *pNd );
aCpyPam.SetMark();
- // dann bis zum Ende vom Nodes Array
+ // then until the end of the nodes array
aCpyPam.GetPoint()->nNode = pMyDoc->GetNodes().GetEndOfContent().GetIndex()-1;
pCntntNd = aCpyPam.GetCntntNode();
aCpyPam.GetPoint()->nContent.Assign( pCntntNd, pCntntNd->Len() );
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 0a16277..a59cdf1 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -665,7 +665,7 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
if( bCondValid && pMgr && pMgr->IsInMerge() &&
pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
- { // Bedingug OK -> aktuellen Set einstellen
+ { // condition OK -> adjust current Set
pMgr->ToRecordId(std::max((sal_uInt16)aPar2.toInt32(), sal_uInt16(1))-1);
}
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index d7e49ad..c7d2507 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -608,7 +608,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
{
const SwNodeNum & aNum = *(pTxtNd->GetNum());
- // nur die Nummer besorgen, ohne Pre-/Post-fixstrings
+ // only get the number, without pre-/post-fixstrings
OUString sNumber( pRule->MakeNumString(aNum, sal_False ));
if( !sNumber.isEmpty() )
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 496669d..e9ca3e9 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -387,11 +387,11 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
break;
}
- if( nStart != nEnd ) // ein Bereich?
+ if( nStart != nEnd ) // a section?
{
sTxt = pTxtNd->GetExpandTxt( nStart, nEnd - nStart );
- // alle Sonderzeichen entfernen (durch Blanks ersetzen):
+ // remove all special characters (replace them with blanks)
if( !sTxt.isEmpty() )
{
sTxt = comphelper::string::remove(sTxt, 0xad);
@@ -438,7 +438,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
case REF_CHAPTER:
{
- // ein bischen trickreich: suche irgend einen Frame
+ // a bit tricky: search any frame
const SwFrm* pFrm = pTxtNd->getLayoutFrm( pDoc->GetCurrentLayout() );
if( pFrm )
{
@@ -461,8 +461,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
LanguageTag aLanguageTag( GetLanguage());
LocaleDataWrapper aLocaleData( aLanguageTag );
- // erstmal ein "Kurz" - Test - falls beide im selben
- // Node stehen!
+ // first a "short" test - in case both are in the same node
if( pFldTxtAttr->GetpTxtNode() == pTxtNd )
{
sTxt = nNumStart < *pFldTxtAttr->GetStart()
@@ -1073,11 +1072,11 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
sal_uInt16 n = GetFirstUnusedId( aIds );
- // die neue SeqNo eintragen, damit die "belegt" ist
+ // register the new SeqNo, so that it's "in use"
AddId( n, nSeqNo );
rFld.SetSeqNo( n );
- // und noch die Fuss-/EndNote auf die neue Id umsetzen
+ // and move the footnotes/endnotes to the new ID
if( !bField )
{
SwTxtFtn* pFtnIdx;
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 56d72c6..7ce1169 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -45,7 +45,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
const IDocumentContentOperations::InsertFlags m_nInsertFlags;
- friend class SwDoc; // eigentlich nur SwDoc::Insert( String )
+ friend class SwDoc; // actually only SwDoc::Insert( String )
sal_Bool CanGrouping( sal_Unicode cIns );
sal_Bool CanGrouping( const SwPosition& rPos );
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index fb21146..b5964fe 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -172,7 +172,7 @@ public:
// Flys that are bound to a character in Cntnt
class SwFlyInCntFrm : public SwFlyFrm
{
- Point aRef; //Relativ zu diesem Point wird die AbsPos berechnet.
+ Point aRef; // relative to this point AbsPos is being calculated
sal_Bool bInvalidLayout :1;
sal_Bool bInvalidCntnt :1;
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index d0bebc2..83f118e 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -33,12 +33,12 @@ class SwWait;
// #i28701#
class SfxProgress;
-//Die Verwendung der LayAction laeuft immer gleich ab:
+// The usage of LayAction is always the same:
//
-// 1. Erzeugen des LayAction-Objektes.
-// 2. Einstellen des gewuenschten Verhaltens mittels der Set-Methoden
-// 3. Aufruf von Action()
-// 4. Baldiges Zerstoeren des Objektes.
+// 1. Generation of the LayAction object.
+// 2. Specifying the wanted bahaviour via the Set-methods
+// 3. Calling Action()
+// 4. Soon after that the destruction of the object
//
// Das Objekt meldet sich im CTor beim SwViewImp an und erst im DTor
// wieder ab! Es handelt sich mithin um ein typisches Stackobjekt.
@@ -47,13 +47,13 @@ class SfxProgress;
class SwLayAction
{
SwRootFrm *pRoot;
- SwViewImp *pImp; //Hier Meldet sich die Action an und ab.
+ SwViewImp *pImp; // here the action logs in and off
- //Zur Optimierung, damit die Tabellen etwas besser am Crsr kleben beim
- //Return/Backspace davor.
- //Wenn der erste TabFrm, der sich Paintet (pro Seite) traegt sich im
- //Pointer ein. Die CntntFrms unterhalb der Seite brauchen sich
- //dann nicht mehr bei der Shell zum Painten anmelden.
+ // for the sake of optimization, so that the tables stick a bit better to the Crsr
+ // when hitting return/backspace in front of one
+ // Wenn der erste TabFrm, der sich Paintet (pro Seite) traegt sich im
+ // Pointer ein. Die CntntFrms unterhalb der Seite brauchen sich
+ // dann nicht mehr bei der Shell zum Painten anmelden.
const SwTabFrm *pOptTab;
SwWait *pWait;
@@ -70,13 +70,13 @@ class SwLayAction
sal_uInt16 nInputType; //Bei welchem Input soll die Verarbeitung abgebrochen
//werden?
- sal_uInt16 nEndPage; //StatBar Steuerung.
- sal_uInt16 nCheckPageNum; //CheckPageDesc() wurde verzoegert wenn != USHRT_MAX
- //ab dieser Seite Checken.
+ sal_uInt16 nEndPage; //StatBar control
+ sal_uInt16 nCheckPageNum; //CheckPageDesc() was delayed if != USHRT_MAX
+ // check from this page on
- sal_Bool bPaint; //Painten oder nur Formatieren?
+ sal_Bool bPaint; // painting or only formatting?
sal_Bool bComplete; //Alles bis zum sichtbaren Bereich Formatieren oder
- //oder nur den sichtbaren Bereich?
+ // or only the visible area?
sal_Bool bCalcLayout; //Vollstaendige Reformatierung?
sal_Bool bAgain; //Zur automatisch wiederholten Action wenn Seiten
//geloscht werden.
@@ -150,7 +150,7 @@ public:
sal_uInt16 GetInputType() const { return nInputType; }
#endif
- //Einstellen der Action auf das gewuenschte Verhalten.
+ // adjusting Action to the wanted behaviour
void SetPaint ( sal_Bool bNew ) { bPaint = bNew; }
void SetComplete ( sal_Bool bNew ) { bComplete = bNew; }
void SetStatBar ( sal_Bool bNew );
@@ -167,8 +167,8 @@ public:
inline void SetCheckPageNum( sal_uInt16 nNew );
inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { nCheckPageNum = nNew; }
- void Action(); //Jetzt gehts loos...
- void Reset(); //Zurueck auf CTor-Defaults.
+ void Action(); // here it begins
+ void Reset(); // back to CTor-defaults
sal_Bool IsAgain() const { return bAgain; }
sal_Bool IsComplete() const { return bComplete; }
@@ -180,7 +180,7 @@ public:
sal_uInt16 GetCheckPageNum() const { return nCheckPageNum; }
- //Auch andere sollen den Wartecrsr einschalten koennen.
+ // others should be able to activate the WaitCrsr, too
void CheckWaitCrsr();
// #i28701# - method is now public;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 21bdfcf..7a3d814 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -37,20 +37,20 @@ class SwScriptInfo; // _GetTxtSize
class SwViewShell;
class IDocumentSettingAccess;
-const sal_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
+const sal_Unicode CH_BLANK = ' '; // ' ' blank spaces
const sal_Unicode CH_BREAK = 0x0A; //
const sal_Unicode CH_TAB = '\t'; // \t
-const sal_Unicode CH_PAR = 0xB6; // Paragraph
-const sal_Unicode CH_BULLET = 0xB7; // mittiger Punkt
+const sal_Unicode CH_PAR = 0xB6; // paragraph
+const sal_Unicode CH_BULLET = 0xB7; // centered dot
class SwSubFont : public SvxFont
{
friend class SwFont;
- const void *pMagic; // "MagicNumber" innerhalb des Fontcaches
- Size aSize; // Fremde kriegen nur diese Size zu sehen
- sal_uInt16 nFntIndex; // Index im Fontcache
- sal_uInt16 nOrgHeight; // Hoehe inkl. Escapement/Proportion
- sal_uInt16 nOrgAscent; // Ascent inkl. Escapement/Proportion
+ const void *pMagic; // "MagicNumber" within the font cache
+ Size aSize; // foreigners only see this size
+ sal_uInt16 nFntIndex; // index in the font cache
+ sal_uInt16 nOrgHeight; // height including escapement/proportion
+ sal_uInt16 nOrgAscent; // ascent including escapement/proportion
sal_uInt16 nPropWidth; // proportional width
bool smallCapsPercentage66;
inline SwSubFont() : aSize(0,0)
@@ -99,7 +99,7 @@ class SwSubFont : public SvxFont
inline void SetEmphasisMark( const FontEmphasisMark eValue );
inline void SetRelief( const FontRelief eNew );
- // Methoden fuer die Hoch-/Tiefstellung
+ // methods for sub-/superscript
inline void SetEscapement( const short nNewEsc );
inline void SetProportion( const sal_uInt8 nNewPropr );
@@ -149,22 +149,22 @@ class SwFont
sal_uInt16 m_nShadowWidth;
SvxShadowLocation m_aShadowLocation;
- sal_uInt8 nToxCnt; // Zaehlt die Schachtelungstiefe der Tox
- sal_uInt8 nRefCnt; // Zaehlt die Schachtelungstiefe der Refs
+ sal_uInt8 nToxCnt; // counts the nesting depth of the Tox
+ sal_uInt8 nRefCnt; // counts the nesting depth of the Refs
sal_uInt8 m_nMetaCount; // count META/METAFIELD
sal_uInt8 m_nInputFieldCount; // count INPUTFIELD
sal_uInt8 nActual; // actual font (Latin, CJK or CTL)
- // Schalter fuer die Font-Extensions
- sal_Bool bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle
- sal_Bool bBlink :1; // blinkender Font
- sal_Bool bPaintBlank :1; // Blanks nicht mit DrawRect
+ // switch for the font-extensions
+ sal_Bool bNoHyph :1; // SwTxtNoHyphenHere: no separator
+ sal_Bool bBlink :1; // blinking font
+ sal_Bool bPaintBlank :1; // blanks not with DrawRect
sal_Bool bFntChg :1;
- sal_Bool bOrgChg :1; // nOrgHeight/Ascent sind invalid
+ sal_Bool bOrgChg :1; // nOrgHeight/Ascent are invalid
sal_Bool bURL :1;
- sal_Bool bPaintWrong :1; // Flag fuer Rechtschreibfehler
- sal_Bool bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
+ sal_Bool bPaintWrong :1; // flag for spelling mistakes
+ sal_Bool bGreyWave :1; // for the extended TextInput: gray waveline
sal_Bool bNoColReplace :1; // Replacement without colormanipulation
public:
@@ -182,7 +182,7 @@ public:
inline void SetActual( sal_uInt8 nNew );
inline const SvxFont& GetActualFont() const { return aSub[nActual]; }
- // holt sich eine MagicNumber ueber SwFntAccess
+ // gets a MagicNumber via SwFntAccess
void GoMagic( SwViewShell *pSh, sal_uInt8 nWhich );
// set background color
void SetBackColor( Color* pNewColor );
@@ -192,7 +192,7 @@ public:
inline void ChkMagic( SwViewShell *pSh, sal_uInt8 nWhich )
{ if( !aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); }
- // uebernimmt die MagicNumber eines (hoffentlich ident.) Kollegen
+ // assumes the MagicNumber of a (hopefully not identical) colleague
inline void CopyMagic( const SwFont* pFnt, sal_uInt8 nWhich )
{ aSub[nWhich].CopyMagic( pFnt->aSub[nWhich] ); }
inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, sal_uInt8 nWhich )
@@ -208,7 +208,7 @@ public:
inline sal_Bool IsFntChg() const { return bFntChg; }
inline void SetFntChg( const sal_Bool bNew ) { bFntChg = bNew; }
- // die gekapselten SV-Font-Methoden (setzen bFntChg auf sal_True)
+ // the encapsulated SV-Font-methods (set bFntChg to sal_True)
inline void SetColor( const Color& rColor );
inline void SetFillColor( const Color& rColor );
inline void SetAlign( const FontAlign eAlign );
@@ -227,7 +227,7 @@ public:
inline void SetCaseMap( const SvxCaseMap eNew );
inline void SetEmphasisMark( const FontEmphasisMark eValue );
- // Methoden fuer die Hoch-/Tiefstellung
+ // methods for sub-/superscript
inline void SetEscapement( const short nNewEsc );
inline void SetProportion( const sal_uInt8 nNewPropr );
@@ -244,7 +244,7 @@ public:
inline void SetPitch( const FontPitch ePitch, const sal_uInt8 nWhich );
inline void SetRelief( const FontRelief eNew );
- // Get/Set-Methoden fuer die aktuelle Einstellung
+ // Get/Set-methods for the current setting
inline void SetNoHyph( const sal_Bool bNew );
inline sal_Bool IsNoHyph() const { return bNoHyph; }
inline void SetBlink( const sal_Bool bBlink );
@@ -273,7 +273,7 @@ public:
inline void SetPaintWrong( const sal_Bool bNew );
inline sal_Bool IsPaintWrong() const { return bPaintWrong; }
- // Setzen der Basisklasse Font fuer SwTxtCharFmt
+ // setting of the base class font for SwTxtCharFmt
void SetDiffFnt( const SfxItemSet* pSet,
const IDocumentSettingAccess* pIDocumentSettingAccess );
@@ -332,7 +332,7 @@ public:
inline FontEmphasisMark GetEmphasisMark( const sal_uInt8 nWhich ) const
{ return aSub[nWhich].GetEmphasisMark(); }
- // Macht den logischen Font im OutputDevice wirksam.
+ // makes the logical font be effective in the OutputDevice
void ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut );
Size GetCapitalSize( SwDrawTextInfo& rInf )
@@ -457,7 +457,7 @@ inline void SwFont::SetColor( const Color& rColor )
aSub[2].SetColor( rColor );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetColor( const Color& rColor )
{
pMagic = 0;
@@ -465,7 +465,7 @@ inline void SwSubFont::SetColor( const Color& rColor )
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetFillColor( const Color& rColor )
{
pMagic = 0;
@@ -480,7 +480,7 @@ inline void SwFont::SetFillColor( const Color& rColor )
aSub[2].SetFillColor( rColor );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetFamily( const FontFamily eFamily )
{
pMagic = 0;
@@ -493,7 +493,7 @@ inline void SwFont::SetFamily( const FontFamily eFamily, const sal_uInt8 nWhich
aSub[nWhich].SetFamily( eFamily );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetName( const OUString& rName )
{
pMagic = 0;
@@ -506,7 +506,7 @@ inline void SwFont::SetName( const OUString& rName, const sal_uInt8 nWhich )
aSub[nWhich].SetName( rName );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetStyleName( const OUString& rStyleName )
{
pMagic = 0;
@@ -519,7 +519,7 @@ inline void SwFont::SetStyleName( const OUString& rStyle, const sal_uInt8 nWhich
aSub[nWhich].SetStyleName( rStyle );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetCharSet( const rtl_TextEncoding eCharSet )
{
pMagic = 0;
@@ -532,21 +532,21 @@ inline void SwFont::SetCharSet( const rtl_TextEncoding eCharSet, const sal_uInt8
aSub[nWhich].SetCharSet( eCharSet );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetPitch( const FontPitch ePitch )
{
pMagic = 0;
Font::SetPitch( ePitch );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwFont::SetPitch( const FontPitch ePitch, const sal_uInt8 nWhich )
{
bFntChg = sal_True;
aSub[nWhich].SetPitch( ePitch );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetAlign( const FontAlign eAlign )
{
pMagic = 0;
@@ -561,7 +561,7 @@ inline void SwFont::SetAlign( const FontAlign eAlign )
aSub[2].SetAlign( eAlign );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetWeight( const FontWeight eWeight )
{
pMagic = 0;
@@ -574,7 +574,7 @@ inline void SwFont::SetWeight( const FontWeight eWeight, const sal_uInt8 nWhich
aSub[nWhich].SetWeight( eWeight );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetUnderline( const FontUnderline eUnderline )
{
pMagic = 0;
@@ -589,7 +589,7 @@ inline void SwFont::SetUnderline( const FontUnderline eUnderline )
aSub[2].SetUnderline( eUnderline );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetOverline( const FontUnderline eOverline )
{
pMagic = 0;
@@ -604,7 +604,7 @@ inline void SwFont::SetOverline( const FontUnderline eOverline )
aSub[2].SetOverline( eOverline );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetStrikeout( const FontStrikeout eStrikeout )
{
pMagic = 0;
@@ -619,7 +619,7 @@ inline void SwFont::SetStrikeout( const FontStrikeout eStrikeout )
aSub[2].SetStrikeout( eStrikeout );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetItalic( const FontItalic eItalic )
{
pMagic = 0;
@@ -632,7 +632,7 @@ inline void SwFont::SetItalic( const FontItalic eItalic, const sal_uInt8 nWhich
aSub[nWhich].SetItalic( eItalic );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetOutline( const sal_Bool bOutline )
{
pMagic = 0;
@@ -647,7 +647,7 @@ inline void SwFont::SetOutline( const sal_Bool bOutline )
aSub[2].SetOutline( bOutline );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetShadow( const sal_Bool bShadow )
{
pMagic = 0;
@@ -662,7 +662,7 @@ inline void SwFont::SetShadow( const sal_Bool bShadow )
aSub[2].SetShadow( bShadow );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetAutoKern( const sal_uInt8 nAutoKern )
{
pMagic = 0;
@@ -700,7 +700,7 @@ inline void SwFont::SetCaseMap( const SvxCaseMap eNew )
aSub[SW_CTL].SetCaseMap( eNew );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetWordLineMode( const sal_Bool bWordLineMode )
{
pMagic = 0;
@@ -714,7 +714,7 @@ inline void SwFont::SetWordLineMode( const sal_Bool bWordLineMode )
aSub[1].SetWordLineMode( bWordLineMode );
aSub[2].SetWordLineMode( bWordLineMode );
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetEmphasisMark( const FontEmphasisMark eValue )
{
pMagic = 0;
@@ -740,7 +740,7 @@ inline void SwFont::SetPropWidth( const sal_uInt16 nNew )
}
}
-// gekapselte SV-Font-Methode
+// encapsulated SV-Font-method
inline void SwSubFont::SetRelief( const FontRelief eNew )
{
pMagic = 0;
@@ -758,7 +758,7 @@ inline void SwFont::SetRelief( const FontRelief eNew )
}
}
-// ueberladene Font-Methode
+// overloaded font-method
inline void SwSubFont::SetSize( const Size& rSize )
{
aSize = rSize;
@@ -1077,7 +1077,7 @@ public:
}
};
-// globale Variable, implementiert in swfont.cxx
+// global variable, implemented in swfont.cxx
extern SvStatistics g_SvStat;
#define SV_STAT(nWhich) ++(g_SvStat.nWhich);
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index d5cd2d6..8c600c1 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -31,7 +31,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
{
friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
- //Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch.
+ // does the special treatment for _Get[Next|Prev]Leaf()
using SwFrm::GetLeaf;
SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
@@ -103,18 +103,17 @@ protected:
virtual void MakeAll();
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
- //Aendert nur die Framesize, nicht die PrtArea-SSize
+ // only changes the Framesize, not the PrtArea size
virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
public:
- SwTabFrm( SwTable &, SwFrm* ); //Immer nach dem erzeugen _und_ pasten das
- //Regist Flys rufen!
- SwTabFrm( SwTabFrm & ); //_Nur_ zum erzeugen von Follows
+ SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting!
+ SwTabFrm( SwTabFrm & ); // _only_ for the creation of follows
~SwTabFrm();
- void JoinAndDelFollows(); //Fuer DelFrms des TableNodes!
+ void JoinAndDelFollows(); // for DelFrms of the TableNodes!
- //Ruft das RegistFlys der Zeilen.
+ // calls thr RegistFlys of the rows
void RegistFlys();
inline const SwTabFrm *GetFollow() const;
@@ -145,8 +144,8 @@ public:
sal_Bool IsLowersFormatted() const { return bLowersFormatted; }
void SetLowersFormatted( sal_Bool b ) { bLowersFormatted = b; }
- void SetCalcLowers() { bCalcLowers = sal_True; } //Sparsam einsetzen!
- void SetResizeHTMLTable() { bResizeHTMLTable = sal_True; } //dito
+ void SetCalcLowers() { bCalcLowers = sal_True; } // use rarely
+ void SetResizeHTMLTable() { bResizeHTMLTable = sal_True; } // same
void SetONECalcLowers() { bONECalcLowers = sal_True; }
//
More information about the Libreoffice-commits
mailing list