tdf#39468 Translate German comments in sw
Translate German comments and terms in sw/inc/ and sw/source
Change-Id: I1330a358db2c6cdc0512009befeafa0582ac4877
Reviewed-on: https://gerrit.libreoffice.org/36288
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 306a2bb..db850ac5 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -113,7 +113,7 @@ public:
void SetVoidValue(bool bSet) {bVoid = bSet;}
};
// Calculate HashTables for VarTable und Operations
// Calculate HashTables for VarTable and Operations
struct SwHash
{
SwHash( const OUString& rStr );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 881ac0e..7b3b50a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -60,7 +60,7 @@ namespace svx
class ISdrObjectFilter;
}
// return values for GetFrameType() und GetSelFrameType().
// return values for GetFrameType() and GetSelFrameType().
//! values can be combined via logical or
enum class FrameTypeFlags {
NONE = 0,
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 66960db..74b1e43 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -27,7 +27,7 @@
class ImageMap;
class IntlWrapper;
// URL, ServerMap und ClientMap
// URL, ServerMap and ClientMap
class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
{
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 405ee06..ad7fdac 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -113,8 +113,7 @@ public:
/// For querying the attribute array.
const SwAttrSet& GetAttrSet() const { return m_aSet; }
/** Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
im Zugriff. */
/** The document is set in SwAttrPool now, therefore you always can access it. */
const SwDoc *GetDoc() const { return m_aSet.GetDoc(); }
SwDoc *GetDoc() { return m_aSet.GetDoc(); }
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index e57dde9..5dfb2eb 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -197,7 +197,7 @@ class SwHTMLTableLayout
sal_uInt16 m_nRelTabWidth; ///< Relative width of table.
sal_uInt16 m_nWidthOption; ///< Width of table (in Twips oder %).
sal_uInt16 m_nWidthOption; ///< Width of table (in Twips or %).
sal_uInt16 m_nCellPadding; ///< Space to contents (in Twips).
sal_uInt16 m_nCellSpacing; ///< Cell spacing (in Twips).
sal_uInt16 m_nBorder; /** Line strength of outer border, or rather the
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 893990b..92b47eb 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -430,7 +430,7 @@ public:
// Build a bookmark table, which is sort by the node position. The
// OtherPos of the bookmarks also inserted.
void CreateBookmarkTable();
// Search alle Bookmarks in the range and return it in the Array.
// Search all Bookmarks in the range and return it in the Array.
bool GetBookmarks( const SwContentNode& rNd,
sal_Int32 nStt, sal_Int32 nEnd,
std::vector< const ::sw::mark::IMark* >& rArr );
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 318cc9d..e0d8e70 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -133,7 +133,7 @@ public:
SwShellCursor( SwShellCursor& );
virtual ~SwShellCursor() override;
virtual void FillRects() override; // For Table- und normal cursors.
virtual void FillRects() override; // For Table- and normal cursors.
/// @see SwSelPaintRects::FillStartEnd(), override for text selections.
virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const override;
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 964eb96..f754682 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -210,7 +210,7 @@ void SwCache::ToTop( SwCacheObj *pObj )
}
else
{
OSL_ENSURE( m_pFirst, "ToTop, First ist not RealFirst an Empty." );
OSL_ENSURE( m_pFirst, "ToTop, First is not RealFirst an Empty." );
if ( m_pFirst->GetPrev() )
{
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8c30200..b4bd0c7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1485,7 +1485,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
SwContentFrame *pTableFrame = pPos->nNode.GetNode().GetContentNode()->
getLayoutFrame( GetLayout(), &aTmpPt, pPos, false );
OSL_ENSURE( pTableFrame, "Tabelle Cursor nicht im Content ??" );
OSL_ENSURE( pTableFrame, "Table Cursor not in Content ??" );
// --> Make code robust. The table cursor may point
// to a table in a currently inactive header.
@@ -1501,12 +1501,12 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
{
SwContentFrame* pMarkTableFrame = pITmpCursor->GetContentNode( false )->
getLayoutFrame( GetLayout(), &aTmpMk, pITmpCursor->GetMark(), false );
OSL_ENSURE( pMarkTableFrame, "Tabelle Cursor nicht im Content ??" );
OSL_ENSURE( pMarkTableFrame, "Table Cursor not in Content ??" );
if ( pMarkTableFrame )
{
SwTabFrame* pMarkTab = pMarkTableFrame->FindTabFrame();
OSL_ENSURE( pMarkTab, "Tabelle Cursor nicht im Content ??" );
OSL_ENSURE( pMarkTab, "Table Cursor not in Content ??" );
// Make code robust:
if ( pMarkTab )
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index b4c1d62..b298063 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -429,7 +429,7 @@ const SwStartNode *SwHTMLTableLayout::GetAnyBoxStartNode() const
SwFrameFormat *SwHTMLTableLayout::FindFlyFrameFormat() const
{
const SwTableNode *pTableNd = GetAnyBoxStartNode()->FindTableNode();
OSL_ENSURE( pTableNd, "Kein Table-Node?" );
OSL_ENSURE( pTableNd, "No Table-Node?" );
return pTableNd->GetFlyFormat();
}
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 87d2454..28ac7d8 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -565,7 +565,7 @@ void SwVirtFlyDrawObj::NbcSetLogicRect(const tools::Rectangle& )
return aRetval;
}
// SwVirtFlyDrawObj::Move() und Resize()
// SwVirtFlyDrawObj::Move() and Resize()
void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
{
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 65c431a..a8a4454 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1838,14 +1838,14 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
while (nPos < pText->getLength() && IsSpace(cChar = (*pText)[nPos]))
++nPos;
if (nPos == pText->getLength())
break; // das wars
break; // that's it
if( ( ( bReplaceQuote && '\"' == cChar ) ||
( bReplaceSglQuote && '\'' == cChar ) ) &&
(!nPos || ' ' == (*pText)[nPos-1]))
{
// beachte: Sonderfall Symbolfonts !!!
// note: special case symbol fonts !!!
if( !aFInfo.GetFrame() )
aFInfo.SetFrame( GetFrame( *m_pCurTextNd ) );
if( !aFInfo.IsBullet( nPos ))
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 524457c..1ca9914 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -631,7 +631,7 @@ void SwEditShell::SpellStart(
// do not spell if interactive spelling is active elsewhere
if (!pConvArgs && !g_pSpellIter)
{
OSL_ENSURE( !g_pSpellIter, "wer ist da schon am spellen?" );
OSL_ENSURE( !g_pSpellIter, "spell already active?" );
g_pSpellIter = new SwSpellIter;
pLinguIter = g_pSpellIter;
}
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 42d1b1e..e547f40 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -232,7 +232,7 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTableOpts,
SwTableNode* pTableNode = const_cast<SwTableNode*>(pTable->GetTabSortBoxes()[ 0 ]->
GetSttNd()->FindTableNode());
SwDDETable* pDDETable = new SwDDETable( *pTable, pDDEType );
pTableNode->SetNewTable( pDDETable ); // setze die DDE-Tabelle
pTableNode->SetNewTable( pDDETable ); // set the DDE table
if( bEndUndo )
EndUndo( SwUndoId::END );
@@ -245,7 +245,6 @@ void SwEditShell::UpdateTable()
{
const SwTableNode* pTableNd = IsCursorInTable();
// Keine Arme keine Kekse
if( pTableNd )
{
StartAllAction();
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 0b7579b..5067407 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -930,7 +930,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
util::DateTime uDT( xDocProps->getCreationDate() );
DateTime aDate(uDT);
if( nSub == DI_CREATE )
; // das wars schon!!
; // that's it !!
else if( nSub == DI_CHANGE )
{
aName = xDocProps->getModifiedBy();
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index aafa9f5..6899b5c 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -854,7 +854,7 @@ void SwSetExpField::SetSubType(sal_uInt16 nSub)
static_cast<SwSetExpFieldType*>(GetTyp())->SetType(nSub & 0xff);
nSubType = nSub & 0xff00;
OSL_ENSURE( (nSub & 0xff) != 3, "SubType ist illegal!" );
OSL_ENSURE( (nSub & 0xff) != 3, "SubType is illegal!" );
}
sal_uInt16 SwSetExpField::GetSubType() const
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 3668aa5..f5eab5d 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -117,7 +117,7 @@ OUString SwTableField::Expand() const
if(nSubType & nsSwGetSetExpType::GSE_STRING)
{
// es ist ein String
// it is a string
return sExpand.copy(1, sExpand.getLength()-2);
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 0453b72..2cf915e 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -84,7 +84,7 @@ using namespace ::com::sun::star;
// Copy for the internal clipboard. Copies all selections to the clipboard.
bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
{
OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" );
OSL_ENSURE( pClpDoc, "No Clipboard document" );
pClpDoc->GetIDocumentUndoRedo().DoUndo(false); // always false!
@@ -124,7 +124,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText )
if( pNewClpText )
{
pTextNd->InsertText( *pNewClpText, SwIndex( pTextNd ) );
return true; // das wars.
return true; // that's it
}
pClpDoc->getIDocumentFieldsAccess().LockExpFields();
@@ -697,8 +697,8 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
SwFieldType* pTableFieldTyp = GetDoc()->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Table );
SwTableNode *const pSrcNd = aCpyPam.GetNode().GetTableNode();
if( !pSrcNd ) // TabellenNode ?
{ // nicht ueberspringen!!
if( !pSrcNd ) // table node ?
{ // don't skip !!
SwContentNode* pCNd = aCpyPam.GetNode().GetContentNode();
if( pCNd )
aCpyPam.GetPoint()->nContent.Assign( pCNd, 0 );
@@ -859,7 +859,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
// make relative table copy
SwTableBox* pBox = pDestNd->GetTable().GetTableBox(
pSttNd->GetIndex() );
OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
OSL_ENSURE( pBox, "Box is not in this table" );
aBoxes.insert( pBox );
}
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index 67ca83d..8aad55a 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -69,7 +69,7 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
if( rPgDesc.GetPageDesc() )
{
// wir haben ihn den Schlingel
// we found the culprit
oPageNumOffset = rPgDesc.GetNumOffset();
break;
}
@@ -84,7 +84,7 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
{
pPage = static_cast<SwPageFrame*>(pPage->GetNext());
pFlow = pPage->FindFirstBodyContent();
OSL_ENSURE( pFlow, "Dokuemnt ohne Inhalt?!?" );
OSL_ENSURE( pFlow, "Document without content?!?" );
}
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index bd2b296..62de57d 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -307,7 +307,7 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
if( bRet || !bHadSelection )
CallChgLnk();
// update der Statuszeile
// update status line
::FrameNotify( this, bRet ? FLY_DRAG_START : FLY_DRAG_END );
EndAction();
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 0cb6f86..f96d1f1 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2150,7 +2150,7 @@ static bool lcl_GoTableRow( SwCursorShell* pShell, bool bUp )
return bUp ? pShell->Up() : pShell->Down();
}
// aender eine Zellenbreite/-Hoehe/Spaltenbreite/Zeilenhoehe
// change a cell width/cell height/column width/row height
bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
{
SwFrame *pFrame = GetCurrFrame();
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 36fe7d8..2e04df5 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -305,7 +305,7 @@ void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd,
break;
}
OSL_ENSURE( pCell->IsCellFrame(), "Frame ohne Celle" );
OSL_ENSURE( pCell->IsCellFrame(), "Frame without Cell" );
if( ::IsFrameInTableSel( pUnion->GetUnion(), pCell ) )
{
SwTableBox* pBox = const_cast<SwTableBox*>(
@@ -510,7 +510,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
break;
}
OSL_ENSURE( pCell->IsCellFrame(), "Frame ohne Celle" );
OSL_ENSURE( pCell->IsCellFrame(), "Frame without Cell" );
const SwRect& rUnion = pUnion->GetUnion(),
& rFrameRect = pCell->Frame();
@@ -2117,13 +2117,13 @@ void FndBox_::SetTableLines( const SwTable &rTable )
SwTableLine* pTmpLine = GetLines().front()->GetLine();
sal_uInt16 nPos = rTable.GetTabLines().GetPos( pTmpLine );
OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
OSL_ENSURE( USHRT_MAX != nPos, "Line is not in table" );
if( nPos )
m_pLineBefore = rTable.GetTabLines()[ nPos - 1 ];
pTmpLine = GetLines().back()->GetLine();
nPos = rTable.GetTabLines().GetPos( pTmpLine );
OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
OSL_ENSURE( USHRT_MAX != nPos, "Line is not in the table" );
if( ++nPos < rTable.GetTabLines().size() )
m_pLineBehind = rTable.GetTabLines()[nPos];
}
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index bd472f8..098d094 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -28,7 +28,7 @@ struct SwPosition;
class SwPaM;
class SwTextAttr;
// Funktions-Deklarationen fuer die Move/Find-Methoden vom SwPaM
// function prototypes for the move/find methods of SwPaM
void GoStartDoc( SwPosition*);
void GoEndDoc( SwPosition*);
@@ -42,7 +42,7 @@ bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
SW_DLLPUBLIC SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool );
SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
// Typedefiniton fuer Funktionen
// type definitions of functions
typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
typedef SwContentNode* (*GoNds)( SwNodeIndex*, bool );
typedef void (*GoDoc)( SwPosition* );
@@ -65,7 +65,7 @@ struct SwMoveFnCollection
MvSection fnSection;
};
// Funktionsdefinitionen fuers Suchen
// function prototype for searching
SwContentNode* GetNode( SwPaM&, bool&, SwMoveFnCollection const &, bool bInReadOnly = false );
#endif
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index dda98df..949f554 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -25,7 +25,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class Any;
} } } }
//Abbildung der Properties auf den Descriptor
// mapping of the properties on the descriptor
#define FIELD_PROP_PAR1 10
#define FIELD_PROP_PAR2 11
#define FIELD_PROP_PAR3 12
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 501b16f..e2162e1 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -662,7 +662,7 @@ SwTextFrame* SwContentFrame::FindMaster() const
return const_cast<SwTextFrame*>(static_cast< const SwTextFrame* >(pPrec));
}
OSL_FAIL( "Follow ist lost in Space." );
OSL_FAIL( "Follow is lost in Space." );
return nullptr;
}
@@ -682,7 +682,7 @@ SwSectionFrame* SwSectionFrame::FindMaster() const
pSect = aIter.Next();
}
OSL_FAIL( "Follow ist lost in Space." );
OSL_FAIL( "Follow is lost in Space." );
return nullptr;
}
@@ -720,7 +720,7 @@ SwTabFrame* SwTabFrame::FindMaster( bool bFirstMaster ) const
pTab = aIter.Next();
}
OSL_FAIL( "Follow ist lost in Space." );
OSL_FAIL( "Follow is lost in Space." );
return nullptr;
}
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 5dcead6..6cdf0a9 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -161,7 +161,7 @@ void SwFlyAtContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN
{
SwContentNode *pNode = aNewIdx.GetNode().GetContentNode();
pContent = pNode->getLayoutFrame( getRootFrame(), &pOldAnchor->Frame().Pos(), nullptr, false );
OSL_ENSURE( pContent, "Neuen Anker nicht gefunden" );
OSL_ENSURE( pContent, "New anchor not found" );
}
//Flys are never attached to a follow, but always on the master which
//we are going to search now.
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 4c608c6..b81dca7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1407,9 +1407,9 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
}
else if ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode() )
{
OSL_ENSURE( pActualSection, "Sectionende ohne Anfang?" );
OSL_ENSURE( pActualSection, "Section end without section?" );
OSL_ENSURE( pActualSection->GetSectionNode() == pNd->StartOfSectionNode(),
"Sectionende mit falschen Start Node?" );
"Section end with wrong Start Node?" );
//Close the section, where appropriate activate the surrounding
//section again.
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 4d0e4c2..a21d2d2 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -837,7 +837,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
SwRowFrame* pHeadline = nullptr;
while( nRowIdx < nRepeat )
{
OSL_ENSURE( pTab->GetTable()->GetTabLines()[ nRowIdx ], "Table ohne Zeilen?" );
OSL_ENSURE( pTab->GetTable()->GetTabLines()[ nRowIdx ], "Table without rows?" );
pHeadline =
new SwRowFrame( *pTab->GetTable()->GetTabLines()[ nRowIdx ], pTab );
pHeadline->SetRepeatedHeadline( true );
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index b4dfc72..2481592 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -737,7 +737,7 @@ SwPageDesc *SwPageFrame::FindPageDesc()
pRet = const_cast<SwPageDesc*>(pFlow->GetAttrSet()->GetPageDesc().GetPageDesc());
}
//3. und 3.1
//3. and 3.1
if ( !pRet && IsEmptyPage() )
// FME 2008-03-03 #i81544# lijian/fme: an empty page should have
// the same page description as its prev, just like after construction
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index ba310aa..074978d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -216,7 +216,7 @@ void SwSectionFrame::Cut()
void SwSectionFrame::Cut_( bool bRemove )
{
OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
OSL_ENSURE( GetUpper(), "Cut without Upper()." );
PROTOCOL( this, PROT::Cut, DbgAction::NONE, GetUpper() )
@@ -756,7 +756,7 @@ void SwSectionFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
bool SwSectionFrame::ShouldBwdMoved( SwLayoutFrame *, bool , bool & )
{
OSL_FAIL( "Hups, wo ist meine Tarnkappe?" );
OSL_FAIL( "Oops, where is my tinfoil hat?" );
return false;
}
@@ -2554,7 +2554,7 @@ void SwRootFrame::InsertEmptySct( SwSectionFrame* pDel )
void SwRootFrame::DeleteEmptySct_()
{
assert(mpDestroy && "Keine Liste, keine Kekse");
assert(mpDestroy);
while( !mpDestroy->empty() )
{
SwSectionFrame* pSect = *mpDestroy->begin();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0a0e995..8246b51 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -417,7 +417,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, SwRowFrame& rDestLine )
SwRowFrame* pTmpSourceRow = static_cast<SwRowFrame*>(pCurrSourceCell->Lower());
while ( pTmpSourceRow )
{
// #125926# Achtung! It is possible,
// #125926# Attention! It is possible,
// that pTmpSourceRow->IsFollowFlowRow() but pTmpDestRow
// cannot be found. In this case, we have to move the complete
// row.
@@ -2700,7 +2700,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
/// The fixed size is not adjusted here.
void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "TabFrame::Format, pAttrs ist 0." );
OSL_ENSURE( pAttrs, "TabFrame::Format, pAttrs is 0." );
SwRectFnSet aRectFnSet(this);
if ( !mbValidSize )
@@ -2876,7 +2876,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
break;
case text::HoriOrientation::LEFT_AND_WIDTH:
{
//Linker Rand und die Breite zaehlen (Word-Spezialitaet)
// count left border and width (Word specialty)
// OD 10.03.2003 #i9040# - no width alignment in online mode.
//bCheckBrowseWidth = true;
nLeftSpacing = pAttrs->CalcLeft( this );
@@ -3386,7 +3386,7 @@ bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool &rReformat
void SwTabFrame::Cut()
{
OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
OSL_ENSURE( GetUpper(), "Cut without Upper()." );
SwPageFrame *pPage = FindPageFrame();
InvalidatePage( pPage );
@@ -4753,7 +4753,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrame *pLay, long lYStart, bool bInva )
void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "CellFrame::Format, pAttrs ist 0." );
OSL_ENSURE( pAttrs, "CellFrame::Format, pAttrs is 0." );
const SwTabFrame* pTab = FindTabFrame();
SwRectFnSet aRectFnSet(pTab);
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 7635d98..f4cc42c 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1853,7 +1853,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor )
{
//Find Union-Rects and tables (Follows) of the selection.
OSL_ENSURE( rTableCursor.GetContentNode() && rTableCursor.GetContentNode( false ),
"Tabselection nicht auf Cnt." );
"Tabselection not on Cnt." );
bool bRet = false;
@@ -2027,7 +2027,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
SwContentFrame const* pEndFrame = pEndPos->nNode.GetNode().
GetContentNode()->getLayoutFrame( this, &rCursor.GetEndPos(), pEndPos );
OSL_ENSURE( (pStartFrame && pEndFrame), "Keine ContentFrames gefunden." );
OSL_ENSURE( (pStartFrame && pEndFrame), "No ContentFrames found." );
//Do not subtract the FlyFrames in which selected Frames lie.
SwSortedObjs aSortObjs;
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 8a5efa1..2d1480d 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1634,7 +1634,7 @@ void SwTextFrame::Format_( vcl::RenderContext* pRenderContext, SwParaPortion *pP
if( pBlink && pPara->IsBlinking() )
pBlink->Delete( pPara );
// delete pSpaceAdd und pKanaComp
// delete pSpaceAdd and pKanaComp
pPara->FinishSpaceAdd();
pPara->FinishKanaComp();
pPara->ResetFlags();
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 1183dd5..c522486 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -247,7 +247,7 @@ void SwFormatField::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
return;
SwTextNode* pTextNd = &mpTextField->GetTextNode();
OSL_ENSURE( pTextNd, "wo ist denn mein Node?" );
OSL_ENSURE( pTextNd, "Where is my Node?" );
if( pNew )
{
switch( pNew->Which() )
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4c8a4f7..367020c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -319,7 +319,7 @@ static void lcl_ChangeFootnoteRef( SwTextNode &rNode )
return;
}
SwTextFootnote *pAttr = static_cast<SwTextFootnote*>(pHt);
OSL_ENSURE( pAttr->GetStartNode(), "FootnoteAtr ohne StartNode." );
OSL_ENSURE( pAttr->GetStartNode(), "FootnoteAtr without StartNode." );
SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
SwContentNode *pNd = aIdx.GetNode().GetContentNode();
if ( !pNd )
@@ -718,7 +718,7 @@ SwContentNode *SwTextNode::JoinNext()
InvalidateNumRule();
}
else {
OSL_FAIL( "kein TextNode." );
OSL_FAIL( "No TextNode." );
}
return this;
@@ -812,14 +812,14 @@ void SwTextNode::JoinPrev()
InvalidateNumRule();
}
else {
OSL_FAIL( "kein TextNode." );
OSL_FAIL( "No TextNode." );
}
}
// create an AttrSet with ranges for Frame-/Para/Char-attributes
void SwTextNode::NewAttrSet( SwAttrPool& rPool )
{
OSL_ENSURE( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
OSL_ENSURE( !mpAttrSet.get(), "AttrSet is set after all" );
SwAttrSet aNewAttrSet( rPool, aTextNodeSetRange );
// put names of parent style and conditional style:
@@ -1236,7 +1236,7 @@ void SwTextNode::ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl,
const SwTextFormatColl *pNewColl)
{
SwDoc* pDoc = GetDoc();
OSL_ENSURE( pDoc, "Kein Doc?" );
OSL_ENSURE( pDoc, "No Doc?" );
// query the OutlineLevel and if it changed, notify the Nodes-Array!
const int nOldLevel = pOldColl && pOldColl->IsAssignedToListLevelOfOutlineStyle() ?
pOldColl->GetAssignedOutlineStyleLevel() : MAXLEVEL;
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 0cd78a6..5831deb 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -463,7 +463,7 @@ void SwFont::SetVertical( sal_uInt16 nDir, const bool bVertFormat )
Bx = A1 + Esc;
*/
// nEsc ist the percentage
// nEsc is the percentage
sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
{
if( DFLT_ESC_AUTO_SUPER != GetEscapement() &&
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index ad2e39a..0157d90 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2039,7 +2039,7 @@ static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTextNode& rTextNode,
}
}
// erfrage die Attribute vom TextNode ueber den Bereich
// request the attributes of the TextNode at the range
bool SwTextNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
const bool bOnlyTextAttr, const bool bGetFromChrFormat,
const bool bMergeIndentValuesOfNumRule ) const
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 41f4829..566a268a 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -145,7 +145,7 @@ SwUndoDelete::SwUndoDelete(
// Step 1. deletion/record of content indices
if( m_bDelFullPara )
{
OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
OSL_ENSURE( rPam.HasMark(), "PaM without Mark" );
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint(),
DelContentType(DelContentType::AllMask | DelContentType::CheckNoCntnt) );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 87a8fc5..81a6dbf 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -941,7 +941,7 @@ SwRedlineSaveData::SwRedlineSaveData(
}
break;
case POS_EQUAL: // Pos1 ist exactly as big as Pos2
case POS_EQUAL: // Pos1 is exactly as big as Pos2
break;
default:
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index f788d79..94d05c0 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -156,7 +156,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
{
// if there is content than save it
const SwFormatContent& rContent = pFrameFormat->GetContent();
OSL_ENSURE( rContent.GetContentIdx(), "Fly ohne Inhalt" );
OSL_ENSURE( rContent.GetContentIdx(), "Fly without content" );
SaveSection( *rContent.GetContentIdx() );
const_cast<SwFormatContent&>(rContent).SetNewContentIdx( nullptr );
@@ -174,7 +174,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
nNdPgPos = pPos->nNode.GetIndex();
nCntPos = pPos->nContent.GetIndex();
SwTextNode *const pTextNd = pPos->nNode.GetNode().GetTextNode();
OSL_ENSURE( pTextNd, "Kein Textnode gefunden" );
OSL_ENSURE( pTextNd, "No Textnode found" );
SwTextFlyCnt* const pAttr = static_cast<SwTextFlyCnt*>(
pTextNd->GetTextAttrForCharAt( nCntPos, RES_TXTATR_FLYCNT ) );
// attribute is still in TextNode, delete
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 270e676..dad13d0 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -120,7 +120,7 @@ void SwUndoInsSection::UndoImpl(::sw::UndoRedoContext & rContext)
SwSectionNode *const pNd =
rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode();
OSL_ENSURE( pNd, "wo ist mein SectionNode?" );
OSL_ENSURE( pNd, "where is my SectionNode?" );
if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ))
rDoc.getIDocumentRedlineAccess().DeleteRedline( *pNd, true, USHRT_MAX );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 95dde86..34af5d3 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1042,7 +1042,7 @@ void SwViewShell::SizeChgNotify()
void SwViewShell::VisPortChgd( const SwRect &rRect)
{
OSL_ENSURE( GetWin(), "VisPortChgd ohne Window." );
OSL_ENSURE( GetWin(), "VisPortChgd without Window." );
if ( rRect == VisArea() )
return;
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 0dc77c9..a487e0b 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -328,7 +328,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
/*
* !!! The Status of the Stream has to be reset directly. !!!
* When Seeking, the current Status-, EOF- und bad-Bit is set;
* When Seeking, the current Status-, EOF- and bad-Bit is set;
* nobody knows why
*/
if( pStrm )
@@ -379,7 +379,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
mxDoc->SetOle2Link( aOLELink );
if( pCursor ) // das Doc ist jetzt modifiziert
if( pCursor ) // the document is now modified
mxDoc->getIDocumentState().SetModified();
// #i38810# - If links have been updated, the document
// have to be modified. During update of links the OLE link at the document
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 0e95a29..33c585e 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -111,7 +111,7 @@ ImageMap *SwHTMLParser::FindImageMap( const OUString& rName ) const
void SwHTMLParser::ConnectImageMaps()
{
SwNodes& rNds = m_xDoc->GetNodes();
// auf den Start-Node der 1. Section
// on the first node of section #1
sal_uLong nIdx = rNds.GetEndOfAutotext().StartOfSectionIndex() + 1;
sal_uLong nEndIdx = rNds.GetEndOfAutotext().GetIndex();
@@ -126,20 +126,19 @@ void SwHTMLParser::ConnectImageMaps()
const ImageMap *pIMap = aURL.GetMap();
if( pIMap && pIMap->GetIMapObjectCount()==0 )
{
// Die (leere) Image-Map des Nodes wird entweder
// durch die jetzt gefundene Image-Map ersetzt
// oder geloescht.
// The (empty) image map of the node will be either
// replaced with found image map or deleted.
ImageMap *pNewIMap =
FindImageMap( pIMap->GetName() );
aURL.SetMap( pNewIMap );
pFormat->SetFormatAttr( aURL );
if( !pGrfNd->IsScaleImageMap() )
{
// die Grafikgroesse ist mitlerweile da oder dir
// Grafik muss nicht skaliert werden
// meanwhile the graphic size is known or the
// graphic don't need scaling
pGrfNd->ScaleImageMap();
}
m_nMissingImgMaps--; // eine Map weniger suchen
m_nMissingImgMaps--; // search a map less
}
}
nIdx = rNds[nIdx]->EndOfSectionIndex() + 1;
@@ -161,20 +160,17 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
if( pCntnrItemSet )
{
// Wenn wir und in einem Container befinden wird die Verankerung
// des Containers uebernommen.
// If we are in a container then the anchoring of the container is used.
rFrameItemSet.Put( *pCntnrItemSet );
}
else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) )
{
// Wenn die Ausrichtung anhand der CSS1-Optionen gesetzt werden kann
// werden die benutzt.
// If the alignment can be set via CSS1 options we use them.
SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrameItemSet );
}
else
{
// Sonst wird die Ausrichtung entsprechend der normalen HTML-Optionen
// gesetzt.
// Otherwise the alignment is set correspondingly the normal HTML options.
SetAnchorAndAdjustment( eVertOri, eHoriOri, rFrameItemSet );
}
}
@@ -190,12 +186,12 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
if( text::HoriOrientation::NONE != eHoriOri )
{
// den Absatz-Einzug bestimmen
// determine paragraph indent
sal_uInt16 nLeftSpace = 0, nRightSpace = 0;
short nIndent = 0;
GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent );
// Horizonale Ausrichtung und Umlauf bestimmen.
// determine horizontal alignment and wrapping
sal_Int16 eHoriRel;
css::text::WrapTextMode eSurround;
switch( eHoriOri )
@@ -208,7 +204,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
eHoriRel = nRightSpace ? text::RelOrientation::PRINT_AREA : text::RelOrientation::FRAME;
eSurround = css::text::WrapTextMode_LEFT;
break;
case text::HoriOrientation::CENTER: // fuer Tabellen
case text::HoriOrientation::CENTER: // for tables
eHoriRel = text::RelOrientation::FRAME;
eSurround = css::text::WrapTextMode_NONE;
break;
@@ -240,7 +236,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
}
}
// Vertikale Ausrichtung und Verankerung bestimmen.
// determine vertical alignment and anchoring
const sal_Int32 nContent = m_pPam->GetPoint()->nContent.GetIndex();
if( nContent )
{
@@ -275,8 +271,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
void SwHTMLParser::RegisterFlyFrame( SwFrameFormat *pFlyFormat )
{
// automatisch verankerte Rahmen muessen noch um eine Position
// nach vorne verschoben werden.
// automatically anchored frames must be moved forward by one position
if( RES_DRAWFRMFMT != pFlyFormat->Which() &&
(RndStdIds::FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
css::text::WrapTextMode_THROUGHT == pFlyFormat->GetSurround().GetSurround() )
@@ -302,7 +297,7 @@ void SwHTMLParser::GetDefaultScriptType( ScriptType& rType,
void SwHTMLParser::InsertImage()
{
// und jetzt auswerten
// and now analyze
OUString sAltNm, aId, aClass, aStyle, aMap, sHTMLGrfName;
OUString sGrfNm;
sal_Int16 eVertOri = text::VertOrientation::TOP;
@@ -351,7 +346,7 @@ void SwHTMLParser::InsertImage()
rOption.GetEnum( aHTMLImgHAlignTable );
break;
case HTML_O_WIDTH:
// erstmal nur als Pixelwerte merken!
// for now only store as pixel value!
nWidth = rOption.GetNumber();
bPrcWidth = (rOption.GetString().indexOf('%') != -1);
if( bPrcWidth && nWidth>100 )
@@ -359,7 +354,7 @@ void SwHTMLParser::InsertImage()
bWidthProvided = true;
break;
case HTML_O_HEIGHT:
// erstmal nur als Pixelwerte merken!
// for now only store as pixel value!
nHeight = rOption.GetNumber();
bPrcHeight = (rOption.GetString().indexOf('%') != -1);
if( bPrcHeight && nHeight>100 )
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index a4f98fe..587e366d 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -149,7 +149,7 @@ void SwHTMLParser::NewDivision( int nToken )
pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
if( !pHdFtFormat )
{
// noch keine Header, dann erzeuge einen.
// still no header, then create one
rPageFormat.SetFormatAttr( SwFormatHeader( true ));
pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat());
bNew = true;
@@ -161,7 +161,7 @@ void SwHTMLParser::NewDivision( int nToken )
pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
if( !pHdFtFormat )
{
// noch keine Footer, dann erzeuge einen.
// still no footer, then create one
rPageFormat.SetFormatAttr( SwFormatFooter( true ));
pHdFtFormat = const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
bNew = true;
@@ -180,12 +180,12 @@ void SwHTMLParser::NewDivision( int nToken )
}
else
{
// Einen neuen Node zu Beginn der Section anlegen
// Create a new node at the beginning of the section
SwNodeIndex aSttIdx( rContentStIdx, 1 );
pCNd = m_xDoc->GetNodes().MakeTextNode( aSttIdx,
m_pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
// Den bisherigen Inhalt der Section loeschen
// delete the current content of the section
SwPaM aDelPam( aSttIdx );
aDelPam.SetMark();
@@ -195,7 +195,7 @@ void SwHTMLParser::NewDivision( int nToken )
m_xDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
// Die Seitenvorlage aktualisieren
// update page style
for( size_t i=0; i < m_xDoc->GetPageDescCnt(); i++ )
{
if( RES_POOLPAGE_HTML == m_xDoc->GetPageDesc(i).GetPoolFormatId() )
@@ -234,16 +234,15 @@ void SwHTMLParser::NewDivision( int nToken )
}
}
// Bereiche fuegen wir in Rahmen nur dann ein, wenn der Bereich gelinkt ist.
// We only insert sections into frames if the section is linked.
if( (!aId.isEmpty() && !bPositioned) || !aHRef.isEmpty() )
{
// Bereich einfuegen (muss vor dem Setzten von Attributen erfolgen,
// weil die Section vor der PaM-Position eingefuegt.
// Insert section (has to be done before setting of attribures,
// because the section is inserted before the PaM position.
// wenn wir im ersten Node einer Section stehen, wir die neue
// Section nicht in der aktuellen, sondern vor der aktuellen
// Section eingefuegt. Deshalb muessen wir dann einen Node
// einfuegen. UND IN LOESCHEN!!!
// If we are in the first node of a section, we insert the section
// before the current section and not in the current section.
// Therefore we have to add a node and delete it again!
if( !bAppended )
{
SwNodeIndex aPrvNdIdx( m_pPam->GetPoint()->nNode, -1 );
@@ -256,7 +255,7 @@ void SwHTMLParser::NewDivision( int nToken )
HTMLAttrs *pPostIts = bAppended ? nullptr : new HTMLAttrs;
SetAttr( true, true, pPostIts );
// Namen der Section eindeutig machen
// make name of section unique
const OUString aName( m_xDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : nullptr ) );
if( !aHRef.isEmpty() )
@@ -328,7 +327,7 @@ void SwHTMLParser::NewDivision( int nToken )
m_xDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrameItemSet, false );
// ggfs. einen Bereich anspringen
// maybe jump to section
if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark )
{
m_bChkJumpMark = true;
@@ -340,16 +339,15 @@ void SwHTMLParser::NewDivision( int nToken )
m_pPam->Move( fnMoveBackward );
// PageDesc- und SwFormatBreak Attribute vom aktuellen Node in den
// (ersten) Node des Bereich verschieben.
// move PageDesc and SwFormatBreak attribute from current node into
// (first) node of the section
if( pOldTextNd )
MovePageDescAttrs( pOldTextNd, m_pPam->GetPoint()->nNode.GetIndex(),
true );
if( pPostIts )
{
// noch vorhandene PostIts in den ersten Absatz
// der Tabelle setzen
// move still existing PostIts in the first paragraph of the table
InsertAttrs( *pPostIts );
delete pPostIts;
pPostIts = nullptr;
@@ -357,7 +355,7 @@ void SwHTMLParser::NewDivision( int nToken )
pCntxt->SetSpansSection( true );
// keine text::Bookmarks mit dem gleichen Namen wie Bereiche einfuegen
// don't insert Bookmarks with same name as sections
if( !aPropInfo.m_aId.isEmpty() && aPropInfo.m_aId==aName )
aPropInfo.m_aId.clear();
}
@@ -371,7 +369,7 @@ void SwHTMLParser::NewDivision( int nToken )
InsertAttr( &m_aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), pCntxt );
}
// Style parsen
// parse style
if( bStyleParsed )
InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
@@ -380,8 +378,8 @@ void SwHTMLParser::NewDivision( int nToken )
void SwHTMLParser::EndDivision( int /*nToken*/ )
{
// Stack-Eintrag zu dem Token suchen (weil wir noch den Div-Stack
// haben unterscheiden wir erst einmal nicht zwischen DIV und CENTER
// search for the stack entry of the token (because we still have the div stack
// we don't make a difference between DIV and CENTER)
HTMLAttrContext *pCntxt = nullptr;
auto nPos = m_aContexts.size();
while( !pCntxt && nPos>m_nContextStMin )
@@ -398,9 +396,9 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
if( pCntxt )
{
// Attribute beenden
// close attribute
EndContext( pCntxt );
SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
SetAttr(); // set paragraph attributes really fast because of JavaScript
delete pCntxt;
}
@@ -415,7 +413,7 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
SwFrameFormat *pHdFtFormat =
bHeader ? const_cast<SwFrameFormat*>(rPageFormat.GetHeader().GetHeaderFormat())
: const_cast<SwFrameFormat*>(rPageFormat.GetFooter().GetFooterFormat());
OSL_ENSURE( pHdFtFormat, "Doch keine Kopf- oder Fusszeile" );
OSL_ENSURE( pHdFtFormat, "No header or footer" );
const SwFormatContent& rFlyContent = pHdFtFormat->GetContent();
const SwNodeIndex& rContentStIdx = *rFlyContent.GetContentIdx();
@@ -438,12 +436,11 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
static_cast<const SvxULSpaceItem&>(pTextNode
->SwContentNode::GetAttr( RES_UL_SPACE ));
// Der untere Absatz-Abstand wird zum Abstand zur
// Kopf- oder Fusszeile
// The bottom paragraph padding becomes the padding
// to header or footer
nSpace = rULSpace.GetLower();
// und anschliessend auf einen vernuenftigen Wert
// gesetzt
// and afterwards set to a valid value
const SvxULSpaceItem& rCollULSpace =
pTextNode->GetAnyFormatColl().GetULSpace();
if( rCollULSpace.GetUpper() == rULSpace.GetUpper() )
@@ -471,13 +468,13 @@ void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
static_cast<const SvxULSpaceItem&>(pTextNode
->SwContentNode::GetAttr( RES_UL_SPACE ));
// Der obere Absatz-Abstand wird zum Abstand zur
// Kopf- oder Fusszeile, wenn er groesser ist als
// der untere vom Absatz davor
// The top paragraph padding becomes the padding
// to headline or footer if it is greater then the
// bottom padding of the paragraph beforehand
if( rULSpace.GetUpper() > nSpace )
nSpace = rULSpace.GetUpper();
// und anschliessend auf einen vernuenftigen Wert gesetzt
// and afterwards set to a valid value
const SvxULSpaceItem& rCollULSpace =
pTextNode->GetAnyFormatColl().GetULSpace();
if( rCollULSpace.GetLower() == rULSpace.GetLower() )
@@ -503,7 +500,7 @@ bool SwHTMLParser::EndSection( bool bLFStripped )
->GetEndNode();
if( pEndNd && pEndNd->StartOfSectionNode()->IsSectionNode() )
{
// den Bereich beenden
// close the section
if( !bLFStripped )
StripTrailingPara();
m_pPam->Move( fnMoveForward );
@@ -763,10 +760,9 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
RndStdIds eAnchorId =
static_cast<const SwFormatAnchor&>(rItemSet.Get( RES_ANCHOR )).GetAnchorId();
// Den Rahmen anlegen
// create frame
SwFlyFrameFormat* pFlyFormat = m_xDoc->MakeFlySection( eAnchorId, m_pPam->GetPoint(),
&rItemSet );
// Ggf. den Namen setzen
if( !rName.isEmpty() )
pFlyFormat->SetName( rName );
@@ -789,7 +785,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
SwContentNode* pDestContentNd =
m_xDoc->GetNodes()[nDestIdx]->GetContentNode();
OSL_ENSURE( pDestContentNd, "Wieso ist das Ziel kein Content-Node?" );
OSL_ENSURE( pDestContentNd, "Why is the target not a Content-Node?" );
if( pSrcNd->IsContentNode() )
{
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index a8e50da..ace2408 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -658,7 +658,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
else
nCPos = pLines->GetWidth();
// Und ihren Index
// and their index
const size_t nOldCol = nCol;
SwXMLTableColumn_Impl aCol( nCPos );
SwXMLTableColumns_Impl::const_iterator it = pLines->GetColumns().find( &aCol );
@@ -930,7 +930,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
else
nCPos = rLines.GetWidth();
// Und ihren Index
// and their index
const size_t nOldCol = nCol;
SwXMLTableColumn_Impl aCol( nCPos );
SwXMLTableColumns_Impl::const_iterator it = rLines.GetColumns().find( &aCol );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 24e0916..6ca6d37 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2227,20 +2227,20 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
#if OSL_DEBUG_LEVEL > 0
if( nCol == nRightCol-1UL )
{
OSL_ENSURE( bSplit, "Split-Flag falsch" );
OSL_ENSURE( bSplit, "Split-Flag wrong" );
if ( m_bHasSubTables )
{
OSL_ENSURE( !bHoriSplitMayContinue,
"HoriSplitMayContinue-Flag falsch" );
"HoriSplitMayContinue-Flag wrong" );
SwXMLTableCell_Impl *pTmpCell = GetCell( nTopRow, nStartCol );
OSL_ENSURE( pTmpCell->GetRowSpan() != (nBottomRow-nTopRow) ||
!bHoriSplitPossible, "HoriSplitPossible-Flag falsch" );
!bHoriSplitPossible, "HoriSplitPossible-Flag wrong" );
}
}
#endif
OSL_ENSURE( !m_bHasSubTables || !bHoriSplitMayContinue || bHoriSplitPossible,
"bHoriSplitMayContinue, aber nicht bHoriSplitPossible" );
"bHoriSplitMayContinue, but not bHoriSplitPossible" );
if( bSplit )
{
