[Libreoffice-commits] .: 5 commits - filter/inc filter/source sw/source unusedcode.easy
Michael Stahl
mst at kemper.freedesktop.org
Fri Jan 20 12:49:34 PST 2012
filter/inc/filter/msfilter/mstoolbar.hxx | 1
filter/source/msfilter/mstoolbar.cxx | 5
sw/source/core/doc/docredln.cxx | 364 +++++++++++++++----------------
sw/source/core/doc/doctxm.cxx | 276 +++++++++++------------
sw/source/core/doc/extinput.cxx | 9
sw/source/core/doc/fmtcol.cxx | 59 ++---
sw/source/core/doc/ftnidx.cxx | 27 +-
sw/source/core/doc/tblcpy.cxx | 157 ++++++-------
unusedcode.easy | 1
9 files changed, 433 insertions(+), 466 deletions(-)
New commits:
commit 7ce98f34150d430b12804eb9796e4142b7c6517c
Author: Santiago Martinez <smvarela at gmail.com>
Date: Fri Jan 20 19:42:48 2012 +0100
Removed unused code as listed in unusedcode.easy
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index ccbefb2..35b05da 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -326,7 +326,6 @@ public:
WString& getName(){ return name; }
bool IsEnabled();
bool IsMenuToolbar(){ return ( ( ltbtr & 0x2000000 ) == 0x2000000 ); }
- bool NeedsPositioning();
};
class MSFILTER_DLLPUBLIC SRECT : public TBBase
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 044c691..fbac37f 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -781,11 +781,6 @@ bool TB::IsEnabled()
return ( bFlags & 0x01 ) != 0x01;
}
-bool TB::NeedsPositioning()
-{
- return ( bFlags & 0x10 ) == 0x10;
-}
-
void TB::Print( FILE* fp )
{
Indent a;
diff --git a/unusedcode.easy b/unusedcode.easy
index 18a54b3..f3f518b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -711,7 +711,6 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
SystemChildWindow::SystemChildWindow(Window*, ResId const&)
-TB::NeedsPositioning()
TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
TESortedPositions::Insert(unsigned long const&, unsigned short&)
TESortedPositions::Insert(unsigned long const*, unsigned short)
commit abc07e01b78d255e0ce9658e779275ffe7c4d1e2
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 20 21:43:05 2012 +0100
sw: tweak translations
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ba47d2c..243964c 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -172,7 +172,7 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode )
{
bool bSaveInXMLImportFlag = IsInXMLImport();
SetInXMLImport( false );
- // and then hide everything, display it
+ // and then hide/display everything
void (SwRedline::*pFnc)( sal_uInt16 ) = 0;
switch( nsRedlineMode_t::REDLINE_SHOW_MASK & eMode )
@@ -280,7 +280,7 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
/*
-Text means Text not "poluted" by Redlines.
+Text means Text not "polluted" by Redlines.
Behaviour of Insert-Redline:
@@ -1138,7 +1138,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
case POS_INSIDE:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
pRedl->CanCombine( *pNewRedl ))
- // an own can be ignored completely
+ // own one can be ignored completely
delete pNewRedl, pNewRedl = 0;
else if( *pREnd == *pEnd )
@@ -1796,7 +1796,7 @@ sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
case POS_OUTSIDE:
case POS_EQUAL:
{
- // delete the area again
+ // delete the range again
rArr.Remove( rPos-- );
bDelRedl = sal_True;
if( bCallDelete )
@@ -2025,7 +2025,7 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
void lcl_AdjustRedlineRange( SwPaM& rPam )
{
- // The Selection is only in the ContentArea. If there are Redlines
+ // The Selection is only in the ContentSection. If there are Redlines
// to Non-ContentNodes before or after that, then the Selections
// expand to them.
SwPosition* pStt = rPam.Start(),
@@ -2133,7 +2133,7 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
(nsRedlineMode_t::REDLINE_SHOW_MASK & eRedlineMode) )
SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | eRedlineMode));
- // The Selection is only in the ContentArea. If there are Redlines
+ // The Selection is only in the ContentSection. If there are Redlines
// to Non-ContentNodes before or after that, then the Selections
// expand to them.
SwPaM aPam( *rPam.GetMark(), *rPam.GetPoint() );
@@ -2243,7 +2243,7 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
(nsRedlineMode_t::REDLINE_SHOW_MASK & eRedlineMode) )
SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | eRedlineMode));
- // The Selection is only in the ContentArea. If there are Redlines
+ // The Selection is only in the ContentSection. If there are Redlines
// to Non-ContentNodes before or after that, then the Selections
// expand to them.
SwPaM aPam( *rPam.GetMark(), *rPam.GetPoint() );
@@ -2408,7 +2408,7 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const
sal_Bool bRestart;
// If the starting positon points to the last valid ContentNode,
- // we take the next Redline in any case.
+ // we take the previous Redline in any case.
sal_uInt16 n = 0;
const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, sal_False );
if( pFnd )
@@ -2608,7 +2608,7 @@ sal_Bool SwRedlineTbl::Insert( SwRedlinePtr& p, sal_Bool bIns )
bRet = InsertWithValidRanges( p );
else
{
- OSL_ENSURE( !this, "Redline: wrong Area" );
+ OSL_ENSURE( !this, "Redline: wrong range" );
}
return bRet;
}
@@ -2625,14 +2625,14 @@ sal_Bool SwRedlineTbl::Insert( SwRedlinePtr& p, sal_uInt16& rP, sal_Bool bIns )
bRet = InsertWithValidRanges( p, &rP );
else
{
- OSL_ENSURE( !this, "Redline: wrong Area" );
+ OSL_ENSURE( !this, "Redline: wrong range" );
}
return bRet;
}
sal_Bool SwRedlineTbl::InsertWithValidRanges( SwRedlinePtr& p, sal_uInt16* pInsPos )
{
- // Create valid "sub-areas" from the Selection
+ // Create valid "sub-ranges" from the Selection
sal_Bool bAnyIns = sal_False;
SwPosition* pStt = p->Start(),
* pEnd = pStt == p->GetPoint() ? p->GetMark() : p->GetPoint();
@@ -2888,7 +2888,7 @@ void SwRedlineExtraData_FmtColl::Reject( SwPaM& rPam ) const
if( pTNd->HasSwAttrSet() )
{
- // Only set those that are not there anymore. Others can
+ // Only set those that are not there anymore. Others
// could have changed, but we don't touch these.
SfxItemSet aTmp( *pSet );
aTmp.Differentiate( *pTNd->GetpSwAttrSet() );
@@ -3083,7 +3083,7 @@ SwRedline::~SwRedline()
{
if( pCntntSect )
{
- // delete the ContentArea
+ // delete the ContentSection
if( !GetDoc()->IsInDtor() )
GetDoc()->DeleteSection( &pCntntSect->GetNode() );
delete pCntntSect;
@@ -3414,7 +3414,7 @@ void SwRedline::CopyToSection()
SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
pDoc->CopyRange( *this, aPos, false );
- // Take over the Template from the EndNode if needed
+ // Take over the style from the EndNode if needed
// We don't want this in Doc::Copy
if( pCEndNd && pCEndNd != pCSttNd )
{
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index e738fe5..23f0387 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1181,7 +1181,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
SwTOXSortTabBase* pBase = 0;
if(TOX_INDEX == eTOXTyp)
{
- // Keyword section mark
+ // index entry mark
lang::Locale aLocale;
if ( pBreakIt->GetBreakIter().is() )
{
@@ -1208,7 +1208,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
else if( TOX_USER == eTOXTyp ||
pMark->GetLevel() <= GetLevel())
- { // Content section mark
+ { // table of content mark
// also used for user marks
pBase = new SwTOXContent( *pTOXSrc, pTxtMark, rIntl );
InsertSorted(pBase);
@@ -1680,7 +1680,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
if( aNdRect.IsEmpty() )
{
- // Nothing helped so far, so we go via the PageTemplate
+ // Nothing helped so far, so we go via the PageDesc
sal_uInt32 nPgDescNdIdx = pTOXNd->GetIndex() + 1;
sal_uInt32* pPgDescNdIdx = &nPgDescNdIdx;
pPageDesc = pTOXNd->FindPageDesc( sal_False, pPgDescNdIdx );
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 382abd3..3ccd856 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -93,8 +93,8 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
- // For normal foot notes we treat chapter and document-wise numbering
- // seperately. For Endnotes we only have chapter-wise numbering.
+ // For normal foot notes we treat per-chapter and per-document numbering
+ // seperately. For Endnotes we only have per-document numbering.
if( FTNNUM_CHAPTER == rFtnInfo.eNum )
{
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
@@ -153,7 +153,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
SwUpdFtnEndNtAtEnd aNumArr;
- // sal_Bool, so that also go through the Endnotes with chapter setting enabled
+ // unless we have per-document numbering, only look at endnotes here
const sal_Bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
sal_uInt16 nPos, nFtnNo = 1, nEndNo = 1;
@@ -199,7 +199,6 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
}
}
}
- // Pageweise wird vom MA erfuellt !!
}
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 070a42f..956a42c 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -586,8 +586,8 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
}
}
- // If DestBox is a Headline Box and has TableTemplate set, then
- // DO NOT automatically set the TableHeadline Template!
+ // If DestBox is a Headline Box and has Table style set, then
+ // DO NOT automatically set the TableHeadline style!
if( 1 < rDstTbl.GetTabLines().Count() &&
pLine == rDstTbl.GetTabLines()[0] )
{
@@ -628,7 +628,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
RES_POOLCOLL_TABLE == nPoolId
? RES_POOLCOLL_TABLE_HDLN
: RES_POOLCOLL_TABLE ) );
- if( pColl ) // Apply Template
+ if( pColl ) // Apply style
{
SwPaM aPam( aSavePos );
aPam.SetMark();
@@ -939,7 +939,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ nLn %
rCpyTbl.GetTabLines().Count() ];
- // Selected too less rows?
+ // Selected too few rows?
if( pInsFLine )
{
// We insert a new row into the FndBox
commit d83104bf83e7071070fb2964ea7e4c1028fcee9c
Author: Philipp Weissenbacher <Philipp Weissenbacher>
Date: Fri Jan 20 13:16:01 2012 +0100
Translate German comments
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 56904e0..382abd3 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -84,7 +84,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
if( !Count() )
return;
- // besorge erstmal das Nodes-Array ueber den StartIndex der ersten Fussnote
+ // Get the NodesArray using the first foot note's StartIndex
SwDoc* pDoc = rStt.GetNode().GetDoc();
if( pDoc->IsInReading() )
return ;
@@ -93,9 +93,8 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
- //Fuer normale Fussnoten werden Chapter- und Dokumentweise Nummerierung
- //getrennt behandelt. Fuer Endnoten gibt es nur die Dokumentweise
- //Nummerierung.
+ // For normal foot notes we treat chapter and document-wise numbering
+ // seperately. For Endnotes we only have chapter-wise numbering.
if( FTNNUM_CHAPTER == rFtnInfo.eNum )
{
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
@@ -103,21 +102,21 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
sal_uLong nCapEnd = pDoc->GetNodes().GetEndOfContent().GetIndex();
if( rOutlNds.Count() )
{
- // suche den Start des Kapitels, in den rStt steht.
+ // Find the Chapter's start, which contains rStt
sal_uInt16 n;
for( n = 0; n < rOutlNds.Count(); ++n )
if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
- break; // gefunden
+ break; // found it!
//else if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() ) //#outline level,zhaojianwei
else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 ) //<-end,zhaojianwei
- pCapStt = rOutlNds[ n ]; // Start eines neuen Kapitels
- // dann suche jetzt noch das Ende vom Bereich
+ pCapStt = rOutlNds[ n ]; // Beginning of a new Chapter
+ // now find the end of the range
for( ; n < rOutlNds.Count(); ++n )
//if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
{
- nCapEnd = rOutlNds[ n ]->GetIndex(); // Ende des gefundenen Kapitels
+ nCapEnd = rOutlNds[ n ]->GetIndex(); // End of the found Chapter
break;
}
}
@@ -125,14 +124,14 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
sal_uInt16 nPos, nFtnNo = 1;
if( SeekEntry( *pCapStt, &nPos ) && nPos )
{
- // gehe nach vorne bis der Index nicht mehr gleich ist
+ // Step forward until the Index is not the same anymore
const SwNode* pCmpNd = &rStt.GetNode();
while( nPos && pCmpNd == &((*this)[ --nPos ]->GetTxtNode()) )
;
++nPos;
}
- if( nPos == Count() ) // nichts gefunden
+ if( nPos == Count() ) // nothing found
return;
if( !rOutlNds.Count() )
@@ -154,8 +153,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
SwUpdFtnEndNtAtEnd aNumArr;
- // sal_Bool, damit hier auch bei Chapter-Einstellung die Endnoten
- // durchlaufen.
+ // sal_Bool, so that also go through the Endnotes with chapter setting enabled
const sal_Bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
sal_uInt16 nPos, nFtnNo = 1, nEndNo = 1;
@@ -179,7 +177,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
}
}
- // ab nPos bei allen FootNotes die Array-Nummer setzen
+ // Set the array number for all footnotes starting from nPos
for( ; nPos < Count(); ++nPos )
{
pTxtFtn = (*this)[ nPos ];
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index a2e9b87..070a42f 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -513,27 +513,25 @@ namespace
// ---------------------------------------------------------------
-// kopiere die Tabelle in diese.
-// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
-// wird dabei geloescht.
-// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
-// Box einer "GrundLine".
-// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
-// einer "GrundLine"
-
-
+// Copy Table into this Box.
+// Copy all Boxes of a Line into the corresponding Boxes. The old
+// content is deleted by doing this.
+// If no Box is left the remaining content goes to the Box of
+// a "BaseLine".
+// If there's no Line anymore, put it also into the last Box
+// of a "BaseLine".
void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
sal_Bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
{
OSL_ENSURE( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
- "Keine inhaltstragende Box" );
+ "No content in this Box" );
SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
SwDoc* pDoc = rDstTbl.GetFrmFmt()->GetDoc();
- // kopiere erst den neuen und loeschen dann den alten Inhalt
- // (keine leeren Section erzeugen; werden sonst geloescht!)
+ // First copy the new content and then delete the old one.
+ // Do not create empty Sections, otherwise they will be deleted!
std::auto_ptr< SwNodeRange > pRg( pCpyBox ?
new SwNodeRange ( *pCpyBox->GetSttNd(), 1,
*pCpyBox->GetSttNd()->EndOfSectionNode() ) : 0 );
@@ -562,10 +560,10 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
sal_Bool bReplaceColl = sal_True;
if( bDelCntnt && !bUndoRedline )
{
- // zuerst die Fly loeschen, dann die entsprechenden Nodes
+ // Delete the Fly first, then the corresponding Nodes
SwNodeIndex aEndNdIdx( *aInsIdx.GetNode().EndOfSectionNode() );
- // Bookmarks usw. verschieben
+ // Move Bookmarks
{
SwPosition aMvPos( aInsIdx );
SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode );
@@ -573,7 +571,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, /*sal_True*/sal_False );
}
- // stehen noch FlyFrames rum, loesche auch diese
+ // If we still have FlyFrames hanging around, delete them too
for( sal_uInt16 n = 0; n < pDoc->GetSpzFrmFmts()->Count(); ++n )
{
SwFrmFmt *const pFly = (*pDoc->GetSpzFrmFmts())[n];
@@ -588,8 +586,8 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
}
}
- // ist DestBox eine Headline-Box und hat Tabellen-Vorlage gesetzt,
- // dann NICHT die TabellenHeadline-Vorlage automatisch setzen
+ // If DestBox is a Headline Box and has TableTemplate set, then
+ // DO NOT automatically set the TableHeadline Template!
if( 1 < rDstTbl.GetTabLines().Count() &&
pLine == rDstTbl.GetTabLines()[0] )
{
@@ -621,7 +619,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
if( bReplaceColl &&
(( 1 < rDstTbl.GetTabLines().Count() &&
pLine == rDstTbl.GetTabLines()[0] )
- // gilt noch die Tabellen-Inhalt ??
+ // Is the Table's content sill valid?
? RES_POOLCOLL_TABLE == nPoolId
: RES_POOLCOLL_TABLE_HDLN == nPoolId ) )
{
@@ -630,7 +628,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
RES_POOLCOLL_TABLE == nPoolId
? RES_POOLCOLL_TABLE_HDLN
: RES_POOLCOLL_TABLE ) );
- if( pColl ) // Vorlage umsetzen
+ if( pColl ) // Apply Template
{
SwPaM aPam( aSavePos );
aPam.SetMark();
@@ -639,7 +637,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
}
}
- // loesche die akt. Formel/Format/Value Werte
+ // Delete the current Formula/Format/Value values
if( SFX_ITEM_SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT ) ||
SFX_ITEM_SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA ) ||
SFX_ITEM_SET == pDstBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE ) )
@@ -648,7 +646,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
RES_BOXATR_VALUE );
}
- // kopiere die TabellenBoxAttribute - Formel/Format/Value
+ // Copy the TableBoxAttributes - Formula/Format/Value
if( pCpyBox )
{
SfxItemSet aBoxAttrSet( pCpyDoc->GetAttrPool(), RES_BOXATR_FORMAT,
@@ -680,10 +678,10 @@ sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBox
SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
- // analyse source structure
+ // Analyze source structure
TableStructure aCopyStruct( rCpyTbl );
- // analyse target structure (from start box) and selected substructure
+ // Analyze target structure (from start box) and selected substructure
_FndBox aFndBox( 0, 0 );
{ // get all boxes/lines
_FndPara aPara( rSelBoxes, &aFndBox );
@@ -705,7 +703,7 @@ sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBox
bClear = true;
}
- // find mapping, if needed extend target table and/or selection
+ // Find mapping, if needed extend target table and/or selection
aTarget.assignBoxes( aCopyStruct );
{
@@ -732,36 +730,36 @@ sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBox
return sal_True;
}
-// kopiere die Tabelle in diese.
-// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
-// wird dabei geloescht.
-// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
-// Box einer "GrundLine".
-// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
-// einer "GrundLine"
+// Copy Table into this Box.
+// Copy all Boxes of a Line into the corresponding Boxes. The old
+// content is deleted by doing this.
+// If no Box is left the remaining content goes to the Box of
+// a "BaseLine".
+// If there's no Line anymore, put it also into the last Box
+// of a "BaseLine".
sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
SwUndoTblCpyTbl* pUndo )
{
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // Delete HTML Layout
SwDoc* pDoc = GetFrmFmt()->GetDoc();
SwTableNode* pTblNd = pDoc->IsIdxInTbl( rSttBox );
- // suche erstmal die Box, in die kopiert werden soll:
+ // Find the Box, to which should be copied:
SwTableBox* pMyBox = (SwTableBox*)GetTblBox(
rSttBox.GetNode().FindTableBoxStartNode()->GetIndex() );
- OSL_ENSURE( pMyBox, "Index steht nicht in dieser Tabelle in einer Box" );
+ OSL_ENSURE( pMyBox, "Index is not in a Box in this Table" );
- // loesche erstmal die Frames der Tabelle
+ // First delete the Table's Frames
_FndBox aFndBox( 0, 0 );
aFndBox.DelFrms( pTblNd->GetTable() );
SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
{
- // Tabellen-Formeln in die relative Darstellung umwandeln
+ // Convert Table formulas to their relative representation
SwTableFmlUpdate aMsgHnt( &rCpyTbl );
aMsgHnt.eFlags = TBL_RELBOXNAME;
pCpyDoc->UpdateTblFlds( &aMsgHnt );
@@ -774,39 +772,39 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
for( sal_uInt16 nLines = 0; nLines < rCpyTbl.GetTabLines().Count(); ++nLines )
{
- // hole die erste Box von der Copy-Line
+ // Get the first from the CopyLine
const SwTableBox* pCpyBox = rCpyTbl.GetTabLines()[nLines]
->GetTabBoxes()[0];
while( pCpyBox->GetTabLines().Count() )
pCpyBox = pCpyBox->GetTabLines()[0]->GetTabBoxes()[0];
do {
- // kopiere erst den neuen und loeschen dann den alten Inhalt
- // (keine leeren Section erzeugen, werden sonst geloescht!)
+ // First copy the new content and then delete the old one.
+ // Do not create empty Sections, otherwise they will be deleted!
lcl_CpyBox( rCpyTbl, pCpyBox, *this, pMyBox, bDelCntnt, pUndo );
if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTbl, pCpyBox, sal_False )))
- break; // es folgt keine weitere Box mehr
+ break; // no more Boxes
pCpyBox = pTmp;
if( 0 == ( pTmp = pMyBox->FindNextBox( *this, pMyBox, sal_False )))
- bDelCntnt = sal_False; // kein Platz mehr ??
+ bDelCntnt = sal_False; // No space left?
else
pMyBox = (SwTableBox*)pTmp;
} while( sal_True );
- // suche die oberste Line
+ // Find the topmost Line
SwTableLine* pNxtLine = pMyBox->GetUpper();
while( pNxtLine->GetUpper() )
pNxtLine = pNxtLine->GetUpper()->GetUpper();
sal_uInt16 nPos = GetTabLines().C40_GETPOS( SwTableLine, pNxtLine );
- // gibt es eine naechste ??
+ // Is there a next?
if( nPos + 1 >= GetTabLines().Count() )
- bDelCntnt = sal_False; // es gibt keine, alles in die letzte Box
+ bDelCntnt = sal_False; // there is none, all goes into the last Box
else
{
- // suche die naechste "Inhaltstragende Box"
+ // Find the next Box with content
pNxtLine = GetTabLines()[ nPos+1 ];
pMyBox = pNxtLine->GetTabBoxes()[0];
while( pMyBox->GetTabLines().Count() )
@@ -815,7 +813,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
}
}
- aFndBox.MakeFrms( pTblNd->GetTable() ); // erzeuge die Frames neu
+ aFndBox.MakeFrms( pTblNd->GetTable() ); // Create the Frames anew
return sal_True;
}
@@ -824,7 +822,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
{
OSL_ENSURE( !rSelBoxes.empty(), "Missing selection" );
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // Delete HTML Layout
if( IsNewModel() || rCpyTbl.IsNewModel() )
return InsNewTable( rCpyTbl, rSelBoxes, pUndo );
@@ -841,14 +839,14 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
sal_uInt16 nLn, nBx;
_FndLine *pFLine, *pInsFLine = 0;
_FndBox aFndBox( 0, 0 );
- // suche alle Boxen / Lines
+ // Find all Boxes/Lines
{
_FndPara aPara( rSelBoxes, &aFndBox );
((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara );
}
- // JP 06.09.96: Sonderfall - eine Box in der Tabelle -> in alle
- // selektierten Boxen kopieren!
+ // Special case: If a Box is located in a Table, copy it to all selected
+ // Boxes!
if( 1 != rCpyTbl.GetTabSortBoxes().Count() )
{
SwTableLine* pSttLine = pSttBox->GetUpper();
@@ -860,28 +858,28 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
if( !nFndCnt )
return sal_False;
- // teste ob genug Platz fuer die einzelnen Lines und Boxen ist:
+ // Check if we have enough space for all Lines and Boxes
sal_uInt16 nTstLns = 0;
pFLine = aFndBox.GetLines()[ 0 ];
pSttLine = pFLine->GetLine();
nSttLine = GetTabLines().C40_GETPOS( SwTableLine, pSttLine );
- // sind ueberhaupt soviele Zeilen vorhanden
+ // Do we have as many rows, actually?
if( 1 == nFndCnt )
{
- // in der Tabelle noch genug Platz ??
+ // Is there still enough space in the Table?
if( (GetTabLines().Count() - nSttLine ) <
rCpyTbl.GetTabLines().Count() )
{
- // sollte nicht mehr soviele Lines vorhanden sein, dann
- // teste, ob man durch einfuegen neuer zum Ziel kommt. Aber
- // nur wenn die SSelection eine Box umfasst !!
+ // If we don't have enough Lines, then see if we can insert
+ // new ones to reach our goal. But only if the SSelection
+ // contains a Box!
if( 1 < rSelBoxes.size() )
return sal_False;
sal_uInt16 nNewLns = rCpyTbl.GetTabLines().Count() -
(GetTabLines().Count() - nSttLine );
- // Dann teste mal ob die Anzahl der Boxen fuer die Lines reicht
+ // See if the Box count is high enough for the Lines
SwTableLine* pLastLn = GetTabLines()[ GetTabLines().Count()-1 ];
pSttBox = pFLine->GetBoxes()[0]->GetBox();
@@ -896,17 +894,17 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
pCpyLn->GetTabBoxes().Count() )
return sal_False;
- // Test auf Verschachtelungen
+ // Test for nesting
for( nBx = 0; nBx < pCpyLn->GetTabBoxes().Count(); ++nBx )
if( !( pTmpBox = pLastLn->GetTabBoxes()[ nSttBox + nBx ])
->GetSttNd() )
return sal_False;
}
- // es ist also Platz fuer das zu kopierende vorhanden, also
- // fuege entsprechend neue Zeilen ein.
+ // We have enough space for the to-be-copied, so insert new
+ // rows accordingly.
SwTableBox* pInsBox = pLastLn->GetTabBoxes()[ nSttBox ];
OSL_ENSURE( pInsBox && pInsBox->GetSttNd(),
- "kein CntntBox oder steht nicht in dieser Tabelle" );
+ "no CntntBox or it's not in this Table" );
SwSelBoxes aBoxes;
if( pUndo
@@ -917,24 +915,23 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
return sal_False;
}
- nTstLns = rCpyTbl.GetTabLines().Count(); // soviele Kopieren
+ nTstLns = rCpyTbl.GetTabLines().Count(); // copy this many
}
else if( 0 == (nFndCnt % rCpyTbl.GetTabLines().Count()) )
nTstLns = nFndCnt;
else
- return sal_False; // kein Platz fuer die Zeilen
+ return sal_False; // not enough space for the rows
for( nLn = 0; nLn < nTstLns; ++nLn )
{
- // Zeilen sind genug vorhanden, dann ueberpruefe die Boxen
- // je Zeile
+ // We have enough rows, so check the Boxes per row
pFLine = aFndBox.GetLines()[ nLn % nFndCnt ];
SwTableLine* pLine = pFLine->GetLine();
pSttBox = pFLine->GetBoxes()[0]->GetBox();
nSttBox = pLine->GetTabBoxes().C40_GETPOS( SwTableBox, pSttBox );
if( nLn >= nFndCnt )
{
- // es sind im ClipBoard mehr Zeilen als selectiert wurden
+ // We have more rows in the ClipBoard than we have selected
pInsFLine = new _FndLine( GetTabLines()[ nSttLine + nLn ],
&aFndBox );
pLine = pInsFLine->GetLine();
@@ -942,22 +939,22 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
SwTableLine* pCpyLn = rCpyTbl.GetTabLines()[ nLn %
rCpyTbl.GetTabLines().Count() ];
- // zu wenig Zeilen selektiert ?
+ // Selected too less rows?
if( pInsFLine )
{
- // eine neue Zeile wird in die FndBox eingefuegt,
+ // We insert a new row into the FndBox
if( pLine->GetTabBoxes().Count() < nSttBox ||
( pLine->GetTabBoxes().Count() - nSttBox ) <
pFLine->GetBoxes().Count() )
return sal_False;
- // Test auf Verschachtelungen
+ // Test for nesting
for( nBx = 0; nBx < pFLine->GetBoxes().Count(); ++nBx )
{
if( !( pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ])
->GetSttNd() )
return sal_False;
- // wenn Ok, fuege die Box in die FndLine zu
+ // if Ok, insert the Box into the FndLine
pFndBox = new _FndBox( pTmpBox, pInsFLine );
pInsFLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, nBx );
}
@@ -970,13 +967,13 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
pCpyLn->GetTabBoxes().Count() )
return sal_False;
- // Test auf Verschachtelungen
+ // Test for nesting
for( nBx = 0; nBx < pCpyLn->GetTabBoxes().Count(); ++nBx )
{
if( !( pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ])
->GetSttNd() )
return sal_False;
- // wenn Ok, fuege die Box in die FndLine zu
+ // if Ok, insert the Box into the FndLine
if( nBx == pFLine->GetBoxes().Count() )
{
pFndBox = new _FndBox( pTmpBox, pFLine );
@@ -986,13 +983,13 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
}
else
{
- // ueberpruefe die selektierten Boxen mit denen im Clipboard
- // (n-Fach)
+ // Match the selected Boxes with the ones in the Clipboard
+ // (n times)
if( 0 != ( pFLine->GetBoxes().Count() %
pCpyLn->GetTabBoxes().Count() ))
return sal_False;
- // Test auf Verschachtelungen
+ // Test for nesting
for( nBx = 0; nBx < pFLine->GetBoxes().Count(); ++nBx )
if( !pFLine->GetBoxes()[ nBx ]->GetBox()->GetSttNd() )
return sal_False;
@@ -1004,13 +1001,13 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
}
{
- // Tabellen-Formeln in die relative Darstellung umwandeln
+ // Convert Table formulas to their relative representation
SwTableFmlUpdate aMsgHnt( &rCpyTbl );
aMsgHnt.eFlags = TBL_RELBOXNAME;
pCpyDoc->UpdateTblFlds( &aMsgHnt );
}
- // loesche die Frames
+ // Delete the Frames
aFndBox.SetTableLines( *this );
aFndBox.DelFrms( *this );
@@ -1029,7 +1026,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
nLn % rCpyTbl.GetTabLines().Count() ];
for( nBx = 0; nBx < pFLine->GetBoxes().Count(); ++nBx )
{
- // Kopiere in pMyBox die pCpyBox
+ // Copy the pCpyBox into pMyBox
lcl_CpyBox( rCpyTbl, pCpyLn->GetTabBoxes()[
nBx % pCpyLn->GetTabBoxes().Count() ],
*this, pFLine->GetBoxes()[ nBx ]->GetBox(), sal_True, pUndo );
@@ -1056,7 +1053,7 @@ sal_Bool _FndCntntLine( const SwTableLine*& rpLine, void* pPara )
return sal_True;
}
-// suche alle Inhaltstragenden-Boxen dieser Box
+// Find all Boxes with content in this Box
SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
SwSelBoxes& rBoxes, sal_Bool bToTop ) const
{
@@ -1065,7 +1062,7 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
while( pLine->GetUpper() )
pLine = pLine->GetUpper()->GetUpper();
- // alle alten loeschen
+ // Delete all old ones
rBoxes.clear();
pLine->GetTabBoxes().ForEach( &_FndCntntBox, &rBoxes );
return rBoxes;
commit f325a615348b38f740fee058ed83c69ba32309e2
Author: Philipp Weissenbacher <Philipp Weissenbacher>
Date: Thu Jan 12 16:38:32 2012 +0100
Translate German comments to English
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 010e3a8..e738fe5 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -82,7 +82,7 @@ const sal_Char sPageDeli[] = ", ";
SV_IMPL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr)
-TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection ); // fuers RTTI
+TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection ); // for RTTI
struct LinkStruct
{
@@ -103,7 +103,7 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) con
{
rArr.clear();
- // dann mal ueber den Pool und alle Primary oder Secondary heraussuchen
+ // Look up all Primary and Secondary via the Pool
const SwTxtTOXMark* pMark;
const SfxPoolItem* pItem;
const SwTOXType* pTOXType;
@@ -130,7 +130,7 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) con
}
/*--------------------------------------------------------------------
- Beschreibung: aktuelle Verzeichnismarkierungen ermitteln
+ Description: Get current table of contents Mark.
--------------------------------------------------------------------*/
sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
SwTOXMarks& rArr ) const
@@ -153,14 +153,14 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
continue;
if( ( nSttIdx = *pHt->GetStart() ) < nAktPos )
{
- // pruefe Ende mit ab
+ // also check the end
if( 0 == ( pEndIdx = pHt->GetEnd() ) ||
*pEndIdx <= nAktPos )
- continue; // weiter suchen
+ continue; // keep searching
}
else if( nSttIdx > nAktPos )
- // ist Start vom Hint groesser als rPos, dann abbrechen. Denn
- // die Attribute sind nach Start sortiert !
+ // If Hint's Start is greater than rPos, break, because
+ // the attributes are sorted by Start!
break;
const SwTOXMark* pTMark = &pHt->GetTOXMark();
@@ -170,16 +170,16 @@ sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
}
/*--------------------------------------------------------------------
- Beschreibung: Marke loeschen
+ Description: Delete table of contents Mark
--------------------------------------------------------------------*/
void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
{
// hole den TextNode und
const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark();
- OSL_ENSURE( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" );
+ OSL_ENSURE( pTxtTOXMark, "No TxtTOXMark, cannot be deleted" );
SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode());
- OSL_ENSURE( rTxtNd.GetpSwpHints(), "kann nicht geloescht werden" );
+ OSL_ENSURE( rTxtNd.GetpSwpHints(), "cannot be deleted" );
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -204,7 +204,7 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
}
/*--------------------------------------------------------------------
- Beschreibung: Traveln zwischen TOXMarks
+ Description: Travel between table of content Marks
--------------------------------------------------------------------*/
class CompareNodeCntnt
{
@@ -236,7 +236,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
SwTOXSearch eDir, sal_Bool bInReadOnly )
{
const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark();
- OSL_ENSURE(pMark, "pMark==0 Ungueltige TxtTOXMark");
+ OSL_ENSURE(pMark, "pMark==0 invalid TxtTOXMark");
const SwTxtNode *pTOXSrc = pMark->GetpTxtNd();
@@ -269,15 +269,13 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
CompareNodeCntnt aAbsNew( pTOXSrc->GetIndex(), *pMark->GetStart() );
switch( eDir )
{
- //Die untenstehenden etwas komplizierter ausgefallen Ausdruecke
- //dienen dazu auch ueber Eintraege auf der selben (!) Position
- //traveln zu koennen. Wenn einer Zeit hat mag er sie mal
- //optimieren.
-
+ // The following (a bit more complicated) statements make it
+ // possible to also travel across Entries on the same (!)
+ // position. If someone has time, please feel free to optimize.
case TOX_SAME_PRV:
if( pTOXMark->GetText() != rCurTOXMark.GetText() )
break;
- /* no break here */
+ /* no break here */
case TOX_PRV:
if ( (aAbsNew < aAbsIdx && aAbsNew > aPrevPos &&
aPrevPos != aAbsIdx && aAbsNew != aAbsIdx ) ||
@@ -302,7 +300,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
case TOX_SAME_NXT:
if( pTOXMark->GetText() != rCurTOXMark.GetText() )
break;
- /* no break here */
+ /* no break here */
case TOX_NXT:
if ( (aAbsNew > aAbsIdx && aAbsNew < aNextPos &&
aNextPos != aAbsIdx && aAbsNew != aAbsIdx ) ||
@@ -328,8 +326,8 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
}
- // kein Nachfolger wurde gefunden
- // Min oder Max benutzen
+ // We couldn't find a successor
+ // Use minimum or maximum
if(!pNew)
{
switch(eDir)
@@ -384,8 +382,8 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
String sNm( pNewSection->GetTOXName() );
-// ??Resource
-sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
+ // ??Resource
+ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
SwSectionData headerData( TOX_HEADER_SECTION, sNm );
@@ -426,7 +424,7 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
if(pSet)
pFmt->SetFmtAttr(*pSet);
-// --aEnd; // im InsertSection ist Ende inclusive
+ // --aEnd; // End is inclusive in InsertSection
SwSectionNode *const pNewSectionNode =
GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, &rTOX, &aEnd);
@@ -443,7 +441,7 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
}
/*--------------------------------------------------------------------
- Beschreibung: Aktuelles Verzeichnis ermitteln
+ Description: Get current table of contents
--------------------------------------------------------------------*/
const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
{
@@ -455,7 +453,7 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
if( TOX_CONTENT_SECTION == eT )
{
OSL_ENSURE( pSectNd->GetSection().ISA( SwTOXBaseSection ),
- "keine TOXBaseSection!" );
+ "no TOXBaseSection!" );
SwTOXBaseSection& rTOXSect = (SwTOXBaseSection&)
pSectNd->GetSection();
return &rTOXSect;
@@ -515,13 +513,13 @@ void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnis loeschen
+ Description: Delete table of contents
--------------------------------------------------------------------*/
sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
{
- // its only delete the TOX, not the nodes
+ // We only delete the TOX, not the Nodes
sal_Bool bRet = sal_False;
- OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
+ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
SwSectionFmt* pFmt = rTOXSect.GetFmt();
@@ -534,7 +532,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
/* Save start node of section's surrounding. */
SwNode * pStartNd = pMyNode->StartOfSectionNode();
- /* Look for point where to move the cursors in the area to
+ /* Look for the point where to move the cursors in the area to
delete to. This is done by first searching forward from the
end of the TOX' section. If no content node is found behind
the TOX one is searched before it. If this is not
@@ -543,7 +541,6 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
moved to the content node found or the new text node. */
/* Set PaM to end of TOX' section and search following content node.
-
aSearchPam will contain the point where to move the cursors
to. */
SwPaM aSearchPam(*pMyNode->EndOfSectionNode());
@@ -580,7 +577,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
/* PaM containing the TOX. */
SwPaM aPam(*pMyNode->EndOfSectionNode(), *pMyNode);
- /* Move cursors contained in TOX to point determined above. */
+ /* Move cursors contained in TOX to the above calculated point. */
PaMCorrAbs(aPam, *aSearchPam.GetPoint());
if( !bDelNodes )
@@ -607,7 +604,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes )
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnistypen verwalten
+ Description: Manage table of content types
--------------------------------------------------------------------*/
sal_uInt16 SwDoc::GetTOXTypeCount(TOXTypes eTyp) const
{
@@ -661,7 +658,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
const String& rNm = pSect->GetSectionName();
if( rNm.Match( aName ) == nNmLen )
{
- // Nummer bestimmen und das Flag setzen
+ // Calculate number and set the Flag
nNum = (sal_uInt16)rNm.Copy( nNmLen ).ToInt32();
if( nNum-- && nNum < pSectionFmtTbl->Count() )
pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 ));
@@ -672,12 +669,12 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
if( !pChkStr )
{
- // alle Nummern entsprechend geflag, also bestimme die richtige Nummer
+ // All Numbers have been flagged accordingly, so get the right Number
nNum = pSectionFmtTbl->Count();
for( n = 0; n < nFlagSize; ++n )
if( 0xff != ( nTmp = pSetFlags[ n ] ))
{
- // also die Nummer bestimmen
+ // so get the Number
nNum = n * 8;
while( nTmp & 1 )
++nNum, nTmp >>= 1;
@@ -693,7 +690,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
sal_Bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
{
OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
- "keine TOXBaseSection!" );
+ "no TOXBaseSection!" );
SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOXBase;
String sTmp = GetUniqueTOXBaseName(*rTOXBase.GetTOXType(), &rName);
@@ -721,14 +718,14 @@ const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = 0 )
{
SwPosition aPos( *pNd );
pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm );
- OSL_ENSURE( pNd, "wo steht der Absatz" );
+ OSL_ENSURE( pNd, "Where's the paragraph?" );
}
}
return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0;
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnis-Klasse
+ Description: Table of contents class
--------------------------------------------------------------------*/
SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
: SwTOXBase( rBase )
@@ -768,7 +765,7 @@ sal_Bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnisinhalt zusammensammeln
+ Description: Collect table of contents content
--------------------------------------------------------------------*/
void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
const bool _bNewTOX )//swmodtest 080307
@@ -897,7 +894,6 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
}
- //
// insert title of TOX
if( GetTitle().Len() )
{
@@ -909,8 +905,8 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
pHeadNd->InsertText( GetTitle(), SwIndex( pHeadNd ) );
String sNm( GetTOXName() );
-// ??Resource
-sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
+ // ??Resource
+ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
SwSectionData headerData( TOX_HEADER_SECTION, sNm );
@@ -920,7 +916,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
aStt, *pSectFmt, headerData, 0, &aIdx, true, false);
}
- // jetzt waere ein prima Zeitpunkt, um die Numerierung zu updaten
+ // This would be a good time to update the Numbering
pDoc->UpdateNumRule();
if( GetCreateType() & nsSwTOXElement::TOX_MARK )
@@ -955,13 +951,12 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
if(TOX_AUTHORITIES == SwTOXBase::GetType())
UpdateAuthorities( aIntl );
- // Bei Bedarf Alphadelimitter einfuegen (nur bei Stichwoertern)
- //
+ // Insert AlphaDelimitters if needed (just for keywords)
if( TOX_INDEX == SwTOXBase::GetType() &&
( GetOptions() & nsSwTOIOptions::TOI_ALPHA_DELIMITTER ) )
InsertAlphaDelimitter( aIntl );
- // sortierte Liste aller Verzeichnismarken und Verzeichnisbereiche
+ // Sort the List of all TOC Marks and TOC Sections
void* p = 0;
sal_uInt16 nCnt = 0, nFormMax = GetTOXForm().GetFormMax();
SvPtrarr aCollArr( (sal_uInt8)nFormMax );
@@ -975,7 +970,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
{
::SetProgressState( 0, pDoc->GetDocShell() );
- // setze den Text in das Verzeichniss
+ // Put the Text into the TOC
sal_uInt16 nLvl = aSortArr[ nCnt ]->GetLevel();
SwTxtFmtColl* pColl = (SwTxtFmtColl*)aCollArr[ nLvl ];
if( !pColl )
@@ -986,13 +981,12 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
aCollArr.Insert( p , nLvl );
}
- // Generierung: dynamische TabStops setzen
+ // Generate: Set dynamic TabStops
SwTxtNode* pTOXNd = pDoc->GetNodes().MakeTxtNode( aInsPos , pColl );
aSortArr[ nCnt ]->pTOXNd = pTOXNd;
- // Generierung: Form auswerten und Platzhalter
- // fuer die Seitennummer eintragen
- //if it is a TOX_INDEX and the SwForm IsCommaSeparated()
+ // Generate: Evaluate Form and insert the place holder for the
+ // page number. If it is a TOX_INDEX and the SwForm IsCommaSeparated()
// then a range of entries must be generated into one paragraph
sal_uInt16 nRange = 1;
if(TOX_INDEX == SwTOXBase::GetType() &&
@@ -1016,7 +1010,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
nCnt += nRange - 1;
}
- // delete the first dummy node and remove all Cursor into the prev node
+ // delete the first dummy node and remove all Cursor into the previous node
aInsPos = *pFirstEmptyNd;
{
SwPaM aCorPam( *pFirstEmptyNd );
@@ -1056,7 +1050,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
}
/*--------------------------------------------------------------------
- Beschreibung: AlphaDelimitter einfuegen
+ Description: Insert AlphaDelimitter
--------------------------------------------------------------------*/
void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
{
@@ -1069,7 +1063,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
sal_uInt16 nLevel = aSortArr[i]->GetLevel();
- // Alpha-Delimitter ueberlesen
+ // Skip AlphaDelimitter
if( nLevel == FORM_ALPHA_DELIMITTER )
continue;
@@ -1079,10 +1073,10 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
sDeli = rIntl.GetIndexKey( sMyString, sMyStringReading,
aSortArr[i]->GetLocale() );
- // Delimitter schon vorhanden ??
+ // Do we already have a Delimitter?
if( sDeli.Len() && sLastDeli != sDeli )
{
- // alle kleiner Blank wollen wir nicht haben -> sind Sonderzeichen
+ // We skip all that are less than a small Blank (these are special characters)
if( ' ' <= sDeli.GetChar( 0 ) )
{
SwTOXCustom* pCst = new SwTOXCustom( sDeli, aEmptyStr, FORM_ALPHA_DELIMITTER,
@@ -1092,7 +1086,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
sLastDeli = sDeli;
}
- // Skippen bis gleibhes oder kleineres Level erreicht ist
+ // Skip until we get to the same or a lower Level
do {
i++;
} while (i < aSortArr.Count() && aSortArr[i]->GetLevel() > nLevel);
@@ -1100,7 +1094,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
}
/*--------------------------------------------------------------------
- Beschreibung: Template auswerten
+ Description: Evaluate Template
--------------------------------------------------------------------*/
SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
{
@@ -1126,7 +1120,7 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
case TOX_AUTHORITIES: nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
case TOX_CONTENT:
- // im Content Bereich gibt es einen Sprung!
+ // There's a jump in the ContentArea!
if( nLevel < 6 )
nPoolFmt = RES_POOLCOLL_TOX_CNTNTH;
else
@@ -1138,8 +1132,8 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
nPoolFmt = nPoolFmt + 1;
else if(eMyType == TOX_INDEX && nLevel)
{
- //pool: Level 1,2,3, Delimiter
- //SwForm: Delimiter, Level 1,2,3
+ // pool: Level 1,2,3, Delimiter
+ // SwForm: Delimiter, Level 1,2,3
nPoolFmt += 1 == nLevel ? nLevel + 3 : nLevel - 1;
}
else
@@ -1150,7 +1144,7 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16 nLevel )
}
/*--------------------------------------------------------------------
- Beschreibung: Aus Markierungen erzeugen
+ Description: Create from Marks
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
const SwTxtNode* pOwnChapterNode )
@@ -1173,10 +1167,10 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
0 != ( pTxtMark = pMark->GetTxtTOXMark() ) )
{
const SwTxtNode* pTOXSrc = pTxtMark->GetpTxtNd();
- // nur TOXMarks einfuegen die im Doc stehen
- // nicht die, die im UNDO stehen
+ // Only insert TOXMarks from the Doc, not from the
+ // UNDO.
//
- // if selected use marks from the same chapter only
+ // If selected use marks from the same chapter only
if( pTOXSrc->GetNodes().IsDocNodes() &&
pTOXSrc->GetTxt().Len() && pTOXSrc->GetDepends() &&
pTOXSrc->getLayoutFrm( pDoc->GetCurrentLayout() ) &&
@@ -1187,7 +1181,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
SwTOXSortTabBase* pBase = 0;
if(TOX_INDEX == eTOXTyp)
{
- // Stichwortverzeichnismarkierung
+ // Keyword section mark
lang::Locale aLocale;
if ( pBreakIt->GetBreakIter().is() )
{
@@ -1214,7 +1208,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
else if( TOX_USER == eTOXTyp ||
pMark->GetLevel() <= GetLevel())
- { // Inhaltsberzeichnismarkierung
+ { // Content section mark
// also used for user marks
pBase = new SwTOXContent( *pTOXSrc, pTxtMark, rIntl );
InsertSorted(pBase);
@@ -1225,7 +1219,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnisinhalt aus Gliederungsebene generieren
+ Description: Generate table of contents from outline
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
{
@@ -1252,7 +1246,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnisinhalt aus Vorlagenbereichen generieren
+ Description: Generate table of contents from template areas
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
{
@@ -1292,7 +1286,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
}
/* --------------------------------------------------
- Description: generate content from sequence fields
+ Description: Generate content from sequence fields
--------------------------------------------------*/
void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
{
@@ -1316,7 +1310,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
::lcl_FindChapterNode( rTxtNode, 0 ) == pOwnChapterNode ) )
{
SwTOXPara * pNew = new SwTOXPara( rTxtNode, nsSwTOXElement::TOX_SEQUENCE, 1 );
- //set indexes if the number or the reference text are to be displayed
+ // set indexes if the number or the reference text are to be displayed
if( GetCaptionDisplay() == CAPTION_TEXT )
{
pNew->SetStartIndex(
@@ -1342,7 +1336,7 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- //undo
+ // undo
if(!pTxtFld)
continue;
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
@@ -1420,7 +1414,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
SwNodes& rNds = pDoc->GetNodes();
- // auf den 1. Node der 1. Section
+ // on the 1st Node of the 1st Section
sal_uLong nIdx = rNds.GetEndOfAutotext().StartOfSectionIndex() + 2,
nEndIdx = rNds.GetEndOfAutotext().GetIndex();
@@ -1457,7 +1451,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
long nMyOLEOptions = GetOLEOptions();
SwOLEObj& rOLEObj = pOLENode->GetOLEObj();
- if( rOLEObj.IsOleRef() ) //Noch nicht geladen
+ if( rOLEObj.IsOleRef() ) // Not yet loaded
{
SvGlobalName aTmpName = SvGlobalName( rOLEObj.GetOleRef()->getClassID() );
long nObj = ::lcl_IsSOObject( aTmpName );
@@ -1466,7 +1460,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
}
else
{
- OSL_FAIL("OLE-object nicht geladen?");
+ OSL_FAIL("OLE Object no loaded?");
bInclude = sal_False;
}
}
@@ -1480,7 +1474,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
if( pCNd )
{
- //find node in body text
+ // find node in body text
int nSetLevel = USHRT_MAX;
//#111105# tables of tables|illustrations|objects don't support hierarchies
@@ -1509,12 +1503,12 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
}
}
- nIdx = pNd->StartOfSectionNode()->EndOfSectionIndex() + 2; // 2 == End-/StartNode
+ nIdx = pNd->StartOfSectionNode()->EndOfSectionIndex() + 2; // 2 == End/Start Node
}
}
/*--------------------------------------------------------------------
- Beschreibung: Tabelleneintraege zusammensuchen
+ Description: Collect table entries
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
{
@@ -1564,15 +1558,15 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
}
/*--------------------------------------------------------------------
- Beschreibung: String generieren anhand der Form
- SonderZeichen 0-31 und 255 entfernen
+ Description: Generate String according to the Form and remove the
+ special characters 0-31 and 255
--------------------------------------------------------------------*/
String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, sal_uInt8 nLevel )
{
String sRet;
if( !rBase.pTxtMark && rBase.aTOXSources.Count() > 0 )
- { // nur wenn es keine Marke ist
+ { // only if it's not a Mark
const SwTxtNode* pNd = rBase.aTOXSources[0].pNd->GetTxtNode();
if( pNd )
{
@@ -1585,7 +1579,7 @@ String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, sal
return sRet;
}
-// add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control,
+// Add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control,
// which page description is used, no appropriate one is found.
void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
sal_uInt16 nCount,
@@ -1596,7 +1590,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
::SetProgressState( 0, pDoc->GetDocShell() );
- //pTOXNd is only set at the first mark
+ // pTOXNd is only set at the first mark
SwTxtNode* pTOXNd = (SwTxtNode*)aSortArr[nArrayIdx]->pTOXNd;
String& rTxt = (String&)pTOXNd->GetTxt();
rTxt.Erase();
@@ -1604,14 +1598,14 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
{
if(nIndex > nArrayIdx)
rTxt.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " )); // comma separation
- // String mit dem Pattern aus der Form initialisieren
+ // Initialize String with the Pattern from the form
const SwTOXSortTabBase& rBase = *aSortArr[nIndex];
sal_uInt16 nLvl = rBase.GetLevel();
- OSL_ENSURE( nLvl < GetTOXForm().GetFormMax(), "ungueltiges FORM_LEVEL");
+ OSL_ENSURE( nLvl < GetTOXForm().GetFormMax(), "invalid FORM_LEVEL");
SvxTabStopItem aTStops( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
xub_StrLen nLinkStartPosition = STRING_NOTFOUND;
- String sLinkCharacterStyle; //default to "Default" character style - which is none
+ String sLinkCharacterStyle; // default to "Default" character style - which is none
String sURL;
// create an enumerator
// #i21237#
@@ -1625,7 +1619,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
switch( aToken.eTokenType )
{
case TOKEN_ENTRY_NO:
- // fuer Inhaltsverzeichnis Numerierung
+ // for TOC numbering
rTxt.Insert( lcl_GetNumString( rBase, aToken.nChapterFormat == CF_NUMBER, static_cast<sal_uInt8>(aToken.nOutlineLevel - 1)) );
break;
@@ -1638,7 +1632,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
case TOKEN_ENTRY:
{
- // fuer Inhaltsverzeichnis Numerierung
+ // for TOC numbering
rTxt.Insert( lcl_GetNumString( rBase, sal_True, MAXLEVEL ));
SwIndex aIdx( pTOXNd, rTxt.Len() );
@@ -1649,7 +1643,6 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
case TOKEN_TAB_STOP:
if (aToken.bWithTab) // #i21237#
rTxt.Append('\t');
- //
if(SVX_TAB_ADJUST_END > aToken.eTabAlign)
{
@@ -1677,7 +1670,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
const SwFrm* pFrm = pTOXNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, sal_True );
if( !pFrm || 0 == ( pFrm = pFrm->FindPageFrm() ) ||
pPageDesc != ((SwPageFrm*)pFrm)->GetPageDesc() )
- // dann muss man ueber den PageDesc gehen
+ // we have to go via the PageDesc here
bCallFindRect = sal_False;
}
@@ -1687,16 +1680,15 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
if( aNdRect.IsEmpty() )
{
- // dann hilft alles nichts, wir muessen ueber die Seiten-
- // vorlage gehen.
+ // Nothing helped so far, so we go via the PageTemplate
sal_uInt32 nPgDescNdIdx = pTOXNd->GetIndex() + 1;
sal_uInt32* pPgDescNdIdx = &nPgDescNdIdx;
pPageDesc = pTOXNd->FindPageDesc( sal_False, pPgDescNdIdx );
if ( !pPageDesc ||
*pPgDescNdIdx < _nTOXSectNdIdx )
{
- // use default page description, if none is found
- // or the found one is given by a node before the
+ // Use default page description, if none is found
+ // or the found one is given by a Node before the
// table-of-content section.
pPageDesc = _pDefaultPageDesc;
}
@@ -1711,7 +1703,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
//#i24363# tab stops relative to indent
if( pDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) )
{
- //left margin of paragraph style
+ // left margin of paragraph style
const SvxLRSpaceItem& rLRSpace = pTOXNd->GetTxtColl()->GetLRSpace();
nRightMargin -= rLRSpace.GetLeft();
nRightMargin -= rLRSpace.GetTxtFirstLineOfst();
@@ -1728,11 +1720,9 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
break;
case TOKEN_PAGE_NUMS:
- // Platzhalter fuer Seitennummer(n) es wird nur der erste beachtet
- //
+ // Place holder for the PageNumber; we only respect the first one
{
- // Die Anzahl der gleichen Eintrage bestimmt die Seitennummern-Pattern
- //
+ // The count of similiar entries gives the PagerNumber pattern
sal_uInt16 nSize = rBase.aTOXSources.Count();
if( nSize > 0 )
{
@@ -1750,7 +1740,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
case TOKEN_CHAPTER_INFO:
{
- // ein bischen trickreich: suche irgend einen Frame
+ // A bit tricky: Find a random Frame
const SwTOXSource* pTOXSource = 0;
if(rBase.aTOXSources.Count())
pTOXSource = &rBase.aTOXSources[0];
@@ -1776,7 +1766,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
// would handle them.
if ( CF_NUM_NOPREPST_TITLE == aToken.nChapterFormat ||
CF_NUMBER == aToken.nChapterFormat )
- rTxt.Insert(aFld.GetNumber()); //get the string number without pre/postfix
+ rTxt.Insert(aFld.GetNumber()); // get the string number without pre/postfix
else if ( CF_NUMBER_NOPREPST == aToken.nChapterFormat ||
CF_NUM_TITLE == aToken.nChapterFormat )
{
@@ -1801,7 +1791,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
if( STRING_NOTFOUND != nLinkStartPosition)
{
SwIndex aIdx( pTOXNd, nLinkStartPosition );
- //pTOXNd->Erase( aIdx, SwForm::nFormLinkSttLen );
+ // pTOXNd->Erase( aIdx, SwForm::nFormLinkSttLen );
xub_StrLen nEnd = rTxt.Len();
if( !sURL.Len() )
@@ -1874,15 +1864,14 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
}
/*--------------------------------------------------------------------
- Beschreibung: Seitennummer errechnen und nach dem Formatieren
- eintragen
+ Description: Calculate PageNumber and insert after formatting
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdatePageNum()
{
if( !aSortArr.Count() )
return ;
- // die aktuellen Seitennummern ins Verzeichnis eintragen
+ // Insert the current PageNumber into the TOC
SwPageFrm* pAktPage = 0;
sal_uInt16 nPage = 0;
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1894,9 +1883,9 @@ void SwTOXBaseSection::UpdatePageNum()
for( sal_uInt16 nCnt = 0; nCnt < aSortArr.Count(); ++nCnt )
{
- // Schleife ueber alle SourceNodes
- std::vector<sal_uInt16> aNums; //Die Seitennummern
- SvPtrarr aDescs; //Die PageDescriptoren passend zu den Seitennummern.
+ // Loop over all SourceNodes
+ std::vector<sal_uInt16> aNums; // the PageNumber
+ SvPtrarr aDescs; // The PageDescriptors matching the PageNumbers
std::vector<sal_uInt16> *pMainNums = 0; // contains page numbers of main entries
// process run in lines
@@ -1936,7 +1925,7 @@ void SwTOXBaseSection::UpdatePageNum()
continue;
if( pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->HasFollow() )
{
- // dann suche den richtigen heraus
+ // find the right one
SwTxtFrm* pNext = (SwTxtFrm*)pFrm;
while( 0 != ( pNext = (SwTxtFrm*)pFrm->GetFollow() )
&& rTOXSource.nPos >= pNext->GetOfst() )
@@ -1950,7 +1939,7 @@ void SwTOXBaseSection::UpdatePageNum()
pAktPage = pTmpPage;
}
- // sortiert einfuegen
+ // Insert as sorted
for( i = 0; i < aNums.size() && aNums[i] < nPage; ++i )
;
@@ -1969,12 +1958,12 @@ void SwTOXBaseSection::UpdatePageNum()
}
}
}
- // einfuegen der Seitennummer in den Verzeichnis-Text-Node
+ // Insert the PageNumber into the TOC TextNode
const SwTOXSortTabBase* pBase = aSortArr[ nCnt ];
if(pBase->pTOXNd)
{
const SwTxtNode* pTxtNd = pBase->pTOXNd->GetTxtNode();
- OSL_ENSURE( pTxtNd, "kein TextNode, falsches Verzeichnis" );
+ OSL_ENSURE( pTxtNd, "no TextNode, wrong TOC" );
_UpdatePageNum( (SwTxtNode*)pTxtNd, aNums, aDescs, pMainNums,
aIntl );
@@ -1983,13 +1972,12 @@ void SwTOXBaseSection::UpdatePageNum()
aNums.clear();
}
}
- // nach dem Setzen der richtigen Seitennummer, das Mapping-Array
- // wieder loeschen !!
+ // Delete the mapping array after setting the right PageNumber
aSortArr.DeleteAndDestroy( 0, aSortArr.Count() );
}
/*--------------------------------------------------------------------
- Beschreibung: Austausch der Seitennummer-Platzhalter
+ Description: Replace the PageNumber place holders
--------------------------------------------------------------------*/
// search for the page no in the array of main entry page numbers
sal_Bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal_uInt16 nToFind )
@@ -2006,7 +1994,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
const std::vector<sal_uInt16>* pMainEntryNums,
const SwTOXInternational& rIntl )
{
- //collect starts end ends of main entry character style
+ // collect starts end ends of main entry character style
std::vector<sal_uInt16>* pCharStyleIdx = pMainEntryNums ? new std::vector<sal_uInt16> : 0;
String sSrchStr( cNumRepl );
@@ -2033,7 +2021,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
pCharStyleIdx->push_back( nTemp );
}
- // Platzhalter loeschen
+ // Delete place holder
SwIndex aPos(pNd, nStartPos);
SwCharFmt* pPageNoCharFmt = 0;
SwpHints* pHints = pNd->GetpSwpHints();
@@ -2056,8 +2044,8 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
{
SvxNumberType aType( ((SwPageDesc*)rDescs[i])->GetNumType() );
if( TOX_INDEX == SwTOXBase::GetType() )
- { // Zusammenfassen f. ff.
- // Alle folgenden aufaddieren
+ { // Summarize for the following
+ // Add up all following
// break up if main entry starts or ends and
// insert a char style index
sal_Bool bMainEntryChanges = lcl_HasMainEntry(pMainEntryNums, nOld)
@@ -2068,7 +2056,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
nCount++;
else
{
- // ff. f. alten Wert flushen
+ // Flush for the following old values
if(GetOptions() & nsSwTOIOptions::TOI_FF)
{
if ( nCount >= 1 )
@@ -2080,12 +2068,12 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
aNumStr += '-';
else if(nCount == 1 )
aNumStr.AppendAscii( sPageDeli );
-//#58127# Wenn nCount == 0, dann steht die einzige Seitenzahl schon im aNumStr!
+ //#58127# If nCount == 0, then the only PageNumber is already in aNumStr!
if(nCount)
aNumStr += aType.GetNumStr( nBeg + nCount );
}
- // neuen String anlegen
+ // Create new String
nBeg = rNums[i];
aNumStr.AppendAscii( sPageDeli );
//the change of the character style must apply after sPageDeli is appended
@@ -2099,13 +2087,13 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
nOld = rNums[i];
}
else
- { // Alle Nummern eintragen
+ { // Insert all Numbers
aNumStr += aType.GetNumStr( sal_uInt16(rNums[i]) );
if(i != (rNums.size()-1))
aNumStr.AppendAscii( sPageDeli );
}
}
- // Bei Ende und ff. alten Wert flushen
+ // Flush when ending and the following old values
if( TOX_INDEX == SwTOXBase::GetType() )
{
if(GetOptions() & nsSwTOIOptions::TOI_FF)
@@ -2119,7 +2107,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
aNumStr +='-';
else if(nCount == 1)
aNumStr.AppendAscii( sPageDeli );
-//#58127# Wenn nCount == 0, dann steht die einzige Seitenzahl schon im aNumStr!
+ //#58127# If nCount == 0, then the only PageNumber is already in aNumStr!
if(nCount)
aNumStr += SvxNumberType( ((SwPageDesc*)rDescs[i-1])->
GetNumType() ).GetNumStr( nBeg+nCount );
@@ -2135,14 +2123,14 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
pNd->InsertItem(aCharFmt, nStartPos, nStartPos + aNumStr.Len(), nsSetAttrMode::SETATTR_DONTEXPAND);
}
- //now the main entries should get there character style
+ // The main entries should get their character style
if(pCharStyleIdx && !pCharStyleIdx->empty() && GetMainEntryCharStyle().Len())
{
// eventually the last index must me appended
if(pCharStyleIdx->size()&0x01)
pCharStyleIdx->push_back(aNumStr.Len());
- //search by name
+ // search by name
SwDoc* pDoc = pNd->GetDoc();
sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( GetMainEntryCharStyle(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
SwCharFmt* pCharFmt = 0;
@@ -2153,7 +2141,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
if(!pCharFmt)
pCharFmt = pDoc->MakeCharFmt(GetMainEntryCharStyle(), 0);
- //find the page numbers in aNumStr and set the character style
+ // find the page numbers in aNumStr and set the character style
xub_StrLen nOffset = pNd->GetTxt().Len() - aNumStr.Len();
SwFmtCharFmt aCharFmt(pCharFmt);
for(sal_uInt16 j = 0; j < pCharStyleIdx->size(); j += 2)
@@ -2168,7 +2156,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
}
/*--------------------------------------------------------------------
- Beschreibung: Sortiert einfuegen in das SortArr
+ Description: Insert sorted into aSortArr
--------------------------------------------------------------------*/
void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
{
@@ -2176,8 +2164,8 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTxtMark )
{
const SwTOXMark& rMark = pNew->pTxtMark->GetTOXMark();
- // Schluessel auswerten
- // Den Bereich ermitteln, in dem einzufuegen ist
+ // Evaluate Key
+ // Calculate the range where to insert
if( 0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY) &&
rMark.GetPrimaryKey().Len() )
{
@@ -2191,7 +2179,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
*pNew, FORM_SECONDARY_KEY, aRange );
}
}
- //search for identical entries and remove the trailing one
+ // Search for identical entries and remove the trailing one
if(TOX_AUTHORITIES == SwTOXBase::GetType())
{
for(short i = (short)aRange.Min(); i < (short)aRange.Max(); ++i)
@@ -2216,29 +2204,26 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
}
// find position and insert
- //
short i;
for( i = (short)aRange.Min(); i < (short)aRange.Max(); ++i)
- { // nur auf gleicher Ebene pruefen
- //
+ { // Only check for same level
SwTOXSortTabBase* pOld = aSortArr[i];
if(*pOld == *pNew)
{
if(TOX_AUTHORITIES != SwTOXBase::GetType())
{
- // Eigener Eintrag fuer Doppelte oder Keywords
- //
+ // Own entry for for double entries or keywords
if( pOld->GetType() == TOX_SORT_CUSTOM &&
pNew->GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)
continue;
if(!(pNew->GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
- { // Eigener Eintrag
+ { // Own entry
aSortArr.Insert(pNew, i );
return;
}
- // Eintrag schon vorhanden in Referenzliste aufnehmen
+ // If the own entry is already present, add it to the references list
pOld->aTOXSources.Insert( pNew->aTOXSources[0],
pOld->aTOXSources.Count() );
@@ -2253,17 +2238,17 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
if(*pNew < *pOld)
break;
}
- // SubLevel Skippen
+ // Skip SubLevel
while( TOX_INDEX == SwTOXBase::GetType() && i < aRange.Max() &&
aSortArr[i]->GetLevel() > pNew->GetLevel() )
i++;
- // An Position i wird eingefuegt
+ // Insert at position i
aSortArr.Insert(pNew, i );
}
/*--------------------------------------------------------------------
- Beschreibung: Schluessel-Bereich suchen und evtl einfuegen
+ Description: Find Key Range and insert if possible
--------------------------------------------------------------------*/
Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReading,
const SwTOXSortTabBase& rNew,
@@ -2299,8 +2284,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
break;
}
if(i == nMax)
- { // Falls nicht vorhanden erzeugen und einfuegen
- //
+ { // If not already present, create and insert
SwTOXCustom* pKey = new SwTOXCustom( sToCompare, sToCompareReading, nLevel, rIntl,
rNew.GetLocale() );
for(i = nMin; i < nMax; ++i)
@@ -2313,7 +2297,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
sal_uInt16 nStart = i+1;
sal_uInt16 nEnd = aSortArr.Count();
- // Ende des Bereiches suchen
+ // Find end of range
for(i = nStart; i < aSortArr.Count(); ++i)
{
if(aSortArr[i]->GetLevel() <= nLevel)
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index a4103cb..afaef8f 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -73,8 +73,8 @@ SwExtTextInput::~SwExtTextInput()
xub_StrLen n = nEndCnt; nEndCnt = nSttCnt; nSttCnt = n;
}
- // damit Undo / Redlining usw. richtig funktioniert,
- // muss ueber die Doc-Schnittstellen gegangen werden !!!
+ // In order to get Undo/Redlining etc. working correctly,
+ // we need to go through the Doc interface
if(eInputLanguage != LANGUAGE_DONTKNOW)
{
// #i41974# Only set language attribute
@@ -162,8 +162,7 @@ void SwExtTextInput::SetInputData( const CommandExtTextInputData& rData )
xub_StrLen nReplace = nEndCnt - nSttCnt;
if( rNewStr.Len() < nReplace )
{
- // then we must insert from the saved original text
- // some characters
+ // We have to insert some characters from the saved original text
nReplace = nReplace - rNewStr.Len();
aIdx += rNewStr.Len();
pTNd->ReplaceText( aIdx, nReplace,
@@ -235,7 +234,7 @@ void SwExtTextInput::SetOverwriteCursor( sal_Bool bFlag )
}
}
-// die Doc Schnittstellen:
+// The Doc interfaces
SwExtTextInput* SwDoc::CreateExtTextInput( const SwPaM& rPam )
{
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 6fd5ba6..be95c81 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -32,7 +32,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <doc.hxx> // fuer GetAttrPool
+#include <doc.hxx> // for GetAttrPool
#include <fmtcol.hxx>
#include <fmtcolfunc.hxx>
#include <hints.hxx>
@@ -148,7 +148,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 )
{
case RES_ATTRSET_CHG:
- // nur neu berechnen, wenn nicht wir der "Versender" sind !!!
+ // Only recalculate if we're not the sender!
pNewChgSet = (SwAttrSetChg*)pNew;
pOldChgSet = (SwAttrSetChg*)pOld;
pNewChgSet->GetChgSet()->GetItemState(
@@ -222,32 +222,32 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
int bWeiter = sal_True;
- // dann pruefe doch mal gegen die eigenen Attribute
+ // Check against the own attributes
if( pNewLRSpace && SFX_ITEM_SET == GetItemState( RES_LR_SPACE, sal_False,
(const SfxPoolItem**)&pOldLRSpace ))
{
int bChg = sal_False;
- if( pOldLRSpace != pNewLRSpace ) // verhinder Rekursion (SetAttr!!)
+ if( pOldLRSpace != pNewLRSpace ) // Avoid recursion (SetAttr!)
{
SvxLRSpaceItem aNew( *pOldLRSpace );
- // wir hatten eine relative Angabe -> neu berechnen
+ // We had a relative value -> recalculate
if( 100 != aNew.GetPropLeft() )
{
- long nTmp = aNew.GetLeft(); // alten zum Vergleichen
+ long nTmp = aNew.GetLeft(); // keep so that we can compare
aNew.SetLeft( pNewLRSpace->GetLeft(), aNew.GetPropLeft() );
bChg |= nTmp != aNew.GetLeft();
}
- // wir hatten eine relative Angabe -> neu berechnen
+ // We had a relative value -> recalculate
if( 100 != aNew.GetPropRight() )
{
- long nTmp = aNew.GetRight(); // alten zum Vergleichen
+ long nTmp = aNew.GetRight(); // keep so that we can compare
aNew.SetRight( pNewLRSpace->GetRight(), aNew.GetPropRight() );
bChg |= nTmp != aNew.GetRight();
}
- // wir hatten eine relative Angabe -> neu berechnen
+ // We had a relative value -> recalculate
if( 100 != aNew.GetPropTxtFirstLineOfst() )
{
- short nTmp = aNew.GetTxtFirstLineOfst(); // alten zum Vergleichen
+ short nTmp = aNew.GetTxtFirstLineOfst(); // keep so that we can compare
aNew.SetTxtFirstLineOfst( pNewLRSpace->GetTxtFirstLineOfst(),
aNew.GetPropTxtFirstLineOfst() );
bChg |= nTmp != aNew.GetTxtFirstLineOfst();
@@ -257,8 +257,8 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SetFmtAttr( aNew );
bWeiter = 0 != pOldChgSet || bNewParent;
}
- // bei uns absolut gesetzt -> nicht weiter propagieren, es sei
- // denn es wird bei uns gesetzt!
+ // We set it to absolute -> do not propagate it further, unless
+ // we set it!
else if( pNewChgSet )
bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
@@ -266,21 +266,21 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( pNewULSpace && SFX_ITEM_SET == GetItemState(
RES_UL_SPACE, sal_False, (const SfxPoolItem**)&pOldULSpace ) &&
- pOldULSpace != pNewULSpace ) // verhinder Rekursion (SetAttr!!)
+ pOldULSpace != pNewULSpace ) // Avoid recursion (SetAttr!)
{
SvxULSpaceItem aNew( *pOldULSpace );
int bChg = sal_False;
- // wir hatten eine relative Angabe -> neu berechnen
+ // We had a relative value -> recalculate
if( 100 != aNew.GetPropUpper() )
{
- sal_uInt16 nTmp = aNew.GetUpper(); // alten zum Vergleichen
+ sal_uInt16 nTmp = aNew.GetUpper(); // keep so that we can compare
aNew.SetUpper( pNewULSpace->GetUpper(), aNew.GetPropUpper() );
bChg |= nTmp != aNew.GetUpper();
}
- // wir hatten eine relative Angabe -> neu berechnen
+ // We had a relative value -> recalculate
if( 100 != aNew.GetPropLower() )
{
- sal_uInt16 nTmp = aNew.GetLower(); // alten zum Vergleichen
+ sal_uInt16 nTmp = aNew.GetLower(); // keep so that we can compare
aNew.SetLower( pNewULSpace->GetLower(), aNew.GetPropLower() );
bChg |= nTmp != aNew.GetLower();
}
@@ -289,8 +289,8 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SetFmtAttr( aNew );
bWeiter = 0 != pOldChgSet || bNewParent;
}
- // bei uns absolut gesetzt -> nicht weiter propagieren, es sei
- // denn es wird bei uns gesetzt!
+ // We set it to absolute -> do not propagate it further, unless
+ // we set it!
else if( pNewChgSet )
bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
@@ -302,21 +302,21 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SvxFontHeightItem *pFSize = aFontSizeArr[ nC ], *pOldFSize;
if( pFSize && SFX_ITEM_SET == GetItemState(
pFSize->Which(), sal_False, (const SfxPoolItem**)&pOldFSize ) &&
- // verhinder Rekursion (SetAttr!!)
+ // Avoid recursion (SetAttr!)
pFSize != pOldFSize )
{
if( 100 == pOldFSize->GetProp() &&
SFX_MAPUNIT_RELATIVE == pOldFSize->GetPropUnit() )
{
- // bei uns absolut gesetzt -> nicht weiter propagieren, es sei
- // denn es wird bei uns gesetzt!
+ // We set it to absolute -> do not propagate it further, unless
+ // we set it!
if( pNewChgSet )
bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
else
{
- // wir hatten eine relative Angabe -> neu berechnen
- sal_uInt32 nTmp = pOldFSize->GetHeight(); // alten zum Vergleichen
+ // We had a relative value -> recalculate
+ sal_uInt32 nTmp = pOldFSize->GetHeight(); // keep so that we can compare
SvxFontHeightItem aNew(240 , 100, pFSize->Which());
aNew.SetHeight( pFSize->GetHeight(), pOldFSize->GetProp(),
pOldFSize->GetPropUnit() );
@@ -325,8 +325,8 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SetFmtAttr( aNew );
bWeiter = 0 != pOldChgSet || bNewParent;
}
- // bei uns absolut gesetzt -> nicht weiter propagieren, es sei
- // denn es wird bei uns gesetzt!
+ // We set it to absolute -> do not propagate it further, unless
+ // we set it!
else if( pNewChgSet )
bWeiter = pNewChgSet->GetTheChgdSet() == &GetAttrSet();
}
@@ -532,7 +532,7 @@ int SwCollCondition::operator==( const SwCollCondition& rCmp ) const
{
if( USRFLD_EXPRESSION & nCondition )
{
- // in der SubCondition steht die Expression fuer das UserFeld
+ // The SubCondition contains the expression for the UserField
const String* pTmp = aSubCondition.pFldExpression;
if( !pTmp )
pTmp = rCmp.aSubCondition.pFldExpression;
@@ -593,7 +593,7 @@ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
break;
}
- // nicht gefunden -> als einfuegen
+ // Not found -> so insert it
SwCollCondition* pNew = new SwCollCondition( rCond );
aCondColls.Insert( pNew, aCondColls.Count() );
}
@@ -614,8 +614,7 @@ sal_Bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
{
- // Kopiere noch die Bedingungen
- // aber erst die alten loeschen!
+ // Copy the Conditions, but first delete the old ones
if( aCondColls.Count() )
aCondColls.DeleteAndDestroy( 0, aCondColls.Count() );
SwDoc& rDoc = *GetDoc();
commit c87cf0920d800b3cb73cd60b36f6a7f66f0bb317
Author: Philipp Weissenbacher <Philipp Weissenbacher>
Date: Mon Jan 9 17:43:22 2012 +0100
Translate German comments
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index ba4cfe2..ba47d2c 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -172,7 +172,7 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode )
{
bool bSaveInXMLImportFlag = IsInXMLImport();
SetInXMLImport( false );
- // und dann alles verstecken, anzeigen
+ // and then hide everything, display it
void (SwRedline::*pFnc)( sal_uInt16 ) = 0;
switch( nsRedlineMode_t::REDLINE_SHOW_MASK & eMode )
@@ -280,29 +280,29 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
/*
-Text heisst, nicht von Redline "verseuchter" Text.
-
-Verhalten von Insert-Redline:
- - im Text - Redline Object einfuegen
- - im InsertRedline (eigenes) - ignorieren, bestehendes wird
- aufgespannt
- - im InsertRedline (andere) - Insert Redline aufsplitten
- Redline Object einfuegen
- - in DeleteRedline - Delete Redline aufsplitten oder
- am Ende/Anfang verschieben
-
-Verhalten von Delete-Redline:
- - im Text - Redline Object einfuegen
- - im DeleteRedline (eigenes/andere) - ignorieren
- - im InsertRedline (eigenes) - ignorieren, Zeichen aber loeschen
- - im InsertRedline (andere) - Insert Redline aufsplitten
- Redline Object einfuegen
- - Ueberlappung von Text und - Text in eigenen Insert loeschen,
- eigenem Insert im andereren Text aufspannen (bis
- zum Insert!
- - Ueberlappung von Text und - Redline Object einfuegen, der
- anderem Insert andere Insert wird vom Delete
- ueberlappt
+Text means Text not "poluted" by Redlines.
+
+Behaviour of Insert-Redline:
+
+ - in the Text - insert Redline Object
+ - in InsertRedline (own) - ignore, existing is extended
+ - in InsertRedline (others) - split up InsertRedline and
+ insert Redline Object
+ - in DeleteRedline - split up DeleteRedline or
+ move at the end/beginning
+
+Behaviour of Delete-Redline:
+ - in the Text - insert Redline Object
+ - in DeleteRedline (own/others) - ignore
+ - in InsertRedline (own) - ignore, but delete character
+ - in InsertRedline (others) - split up InsertRedline and
+ insert Redline Object
+ - Text and own Insert overlap - delete Text in the own Insert,
+ extend in the other Text
+ (up to the Insert!)
+ - Text and other Insert overlap - insert Redline Object, the
+ other Insert is overlapped by
+ the Delete
*/
bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
@@ -372,7 +372,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
sal_Bool bCompress = sal_False;
sal_uInt16 n = 0;
- // zur StartPos das erste Redline suchen
+ // look up the first Redline for the starting position
if( !GetRedline( *pStt, &n ) && n )
--n;
bool bDec = false;
@@ -406,7 +406,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
bool bDelete = false;
- // ggfs. verschmelzen?
+ // Merge if applicable?
if( (( POS_BEHIND == eCmpPos &&
IsPrevPos( *pREnd, *pStt ) ) ||
( POS_COLLIDE_START == eCmpPos ) ||
@@ -419,7 +419,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pRedl->SetEnd( *pEnd, pREnd );
if( !pRedl->HasValidRange() )
{
- // neu einsortieren
+ // re-insert
pRedlineTbl->Remove( n );
pRedlineTbl->Insert( pRedl );
}
@@ -436,7 +436,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
*(*pRedlineTbl)[ n-1 ]->End() != *pRStt ))
{
pRedl->SetStart( *pStt, pRStt );
- // neu einsortieren
+ // re-insert
pRedlineTbl->Remove( n );
pRedlineTbl->Insert( pRedl );
@@ -475,7 +475,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if( POS_INSIDE == eCmpPos )
{
- // aufsplitten
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list