From 3c4927230f81983c53cd87eadf62ec27830d52de Mon Sep 17 00:00:00 2001 From: David Vogt Date: Mon, 6 Feb 2012 10:45:17 +0100 Subject: [PATCH 1/5] Translated german code comments to english --- sw/source/core/layout/newfrm.cxx | 56 ++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 1e9b0e8..6b1b652 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -356,8 +356,8 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft; // #i65250# sal_uInt32 SwFrm::mnLastFrmId=0; -TYPEINIT1(SwFrm,SwClient); //rtti fuer SwFrm -TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm +TYPEINIT1(SwFrm,SwClient); //rtti for SwFrm +TYPEINIT1(SwCntntFrm,SwFrm); //rtti for SwCntntFrm void _FrmInit() @@ -376,12 +376,12 @@ void _FrmInit() void _FrmFinit() { #if OSL_DEBUG_LEVEL > 0 - // im Chache duerfen nur noch 0-Pointer stehen + // The cache may only contain null pointers at this time. for( sal_uInt16 n = SwFrm::GetCachePtr()->Count(); n; ) if( (*SwFrm::GetCachePtr())[ --n ] ) { SwCacheObj* pObj = (*SwFrm::GetCachePtr())[ n ]; - OSL_ENSURE( !pObj, "Wer hat sich nicht ausgetragen?"); + OSL_ENSURE( !pObj, "Wer hat sich nicht ausgetragen?"); // TOOD: translate? } #endif delete SwRootFrm::pVout; @@ -390,7 +390,7 @@ void _FrmFinit() /************************************************************************* |* -|* RootFrm::Alles was so zur CurrShell gehoert +|* RootFrm::Everything that belongs to CurrShell |* |*************************************************************************/ @@ -400,7 +400,7 @@ SV_IMPL_PTRARR_SORT(SwCurrShells,CurrShellPtr) CurrShell::CurrShell( ViewShell *pNew ) { - OSL_ENSURE( pNew, "0-Shell einsetzen?" ); + OSL_ENSURE( pNew, "insert 0-Shell?" ); pRoot = pNew->GetLayout(); if ( pRoot ) { @@ -438,15 +438,15 @@ void SetShell( ViewShell *pSh ) void SwRootFrm::DeRegisterShell( ViewShell *pSh ) { - //Wenn moeglich irgendeine Shell aktivieren + // Activate some shell if possible if ( pCurrShell == pSh ) pCurrShell = pSh->GetNext() != pSh ? (ViewShell*)pSh->GetNext() : 0; - //Das hat sich eruebrigt + // Doesn't matter anymore if ( pWaitingCurrShell == pSh ) pWaitingCurrShell = 0; - //Referenzen entfernen. + // Remove references for ( sal_uInt16 i = 0; i < pCurrShells->Count(); ++i ) { CurrShell *pC = (*pCurrShells)[i]; @@ -465,10 +465,10 @@ void InitCurrShells( SwRootFrm *pRoot ) |* |* SwRootFrm::SwRootFrm() |* -|* Beschreibung: -|* Der RootFrm laesst sich grundsaetzlich vom Dokument ein eigenes -|* FrmFmt geben. Dieses loescht er dann selbst im DTor. -|* Das eigene FrmFmt wird vom uebergebenen Format abgeleitet. +|* Description: +|* The RootFrm requests an own FrmFmt from the document, which it is +|* going to delete again in the dtor. The own FrmFmt is derived from +|* the passed-in FrmFmt. |* |*************************************************************************/ @@ -483,7 +483,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : mbBookMode( false ), mbSidebarChanged( false ), mbNeedGrammarCheck( false ), - nBrowseWidth( MM50*4 ), //2cm Minimum + nBrowseWidth( MM50*4 ), //2cm minimum pTurbo( 0 ), pLastPage( 0 ), pCurrShell( pSh ), @@ -508,8 +508,8 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess(); const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess(); pTimerAccess->StopIdling(); - pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); //Fuer das Erzeugen der Flys durch MakeFrms() //swmod 071108//swmod 071225 - bCallbackActionEnabled = sal_False; //vor Verlassen auf sal_True setzen! + pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); // Helps creating the Flys by MakeFrms() //swmod 071108//swmod 071225 + bCallbackActionEnabled = sal_False; // needs to be set to sal_True before leaving! SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel(); if ( pMd ) @@ -522,10 +522,9 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) pDrawPage->SetSize( Frm().SSize() ); } - //Initialisierung des Layouts: Seiten erzeugen. Inhalt mit cntnt verbinden - //usw. - //Zuerst einiges initialiseren und den ersten Node besorgen (der wird - //fuer den PageDesc benoetigt). + // Initialize the layout: create pages, link content with Cntnt etc. + // First, initialize some stuff, then get hold of the first + // node (which will be needed for the PageDesc). SwDoc* pDoc = pFmt->GetDoc(); SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() ); @@ -533,8 +532,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) // #123067# pNode = 0 can really happen SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0; - //PageDesc besorgen (entweder vom FrmFmt des ersten Node oder den - //initialen.) + // Get hold of PageDesc (either via FrmFmt of the first node or the initial one). SwPageDesc *pDesc = 0; sal_uInt16 nPgNum = 1; @@ -542,14 +540,14 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) { const SwFmtPageDesc &rDesc = pTblNd->GetTable().GetFrmFmt()->GetPageDesc(); pDesc = (SwPageDesc*)rDesc.GetPageDesc(); - //#19104# Seitennummeroffset beruecksictigen!! + //#19104# respect the page number offset!! bIsVirtPageNum = 0 != ( nPgNum = rDesc.GetNumOffset() ); } else if ( pNode ) { const SwFmtPageDesc &rDesc = pNode->GetSwAttrSet().GetPageDesc(); pDesc = (SwPageDesc*)rDesc.GetPageDesc(); - //#19104# Seitennummeroffset beruecksictigen!! + //#19104# respect the page number offset!! bIsVirtPageNum = 0 != ( nPgNum = rDesc.GetNumOffset() ); } else @@ -559,17 +557,17 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) &const_cast(pDoc)->GetPageDesc( 0 ); const sal_Bool bOdd = !nPgNum || 0 != ( nPgNum % 2 ); - //Eine Seite erzeugen und in das Layout stellen + // Create a page and put it in the layout SwPageFrm *pPage = ::InsertNewPage( *pDesc, this, bOdd, sal_False, sal_False, 0 ); - //Erstes Blatt im Bodytext-Bereich suchen. + // Find the first page in the Bodytext section. SwLayoutFrm *pLay = pPage->FindBodyCont(); while( pLay->Lower() ) pLay = (SwLayoutFrm*)pLay->Lower(); SwNodeIndex aTmp( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode(), 1 ); ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), sal_True ); - //Noch nicht ersetzte Master aus der Liste entfernen. + //Remove masters that haven't been replaced yet from the list. RemoveMasterObjs( pDrawPage ); if( pSettingAccess->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) pFieldsAccess->UpdateRefFlds( NULL ); @@ -624,7 +622,7 @@ SwRootFrm::~SwRootFrm() delete pDestroy; pDestroy = 0; - //Referenzen entfernen. + // Remove references for ( sal_uInt16 i = 0; i < pCurrShells->Count(); ++i ) (*pCurrShells)[i]->pRoot = 0; @@ -642,7 +640,7 @@ SwRootFrm::~SwRootFrm() void SwRootFrm::RemoveMasterObjs( SdrPage *pPg ) { - //Alle Masterobjekte aus der Page entfernen. Nicht loeschen!! + // Remove all master objects from the Page. But don't delete! for( sal_uLong i = pPg ? pPg->GetObjCount() : 0; i; ) { SdrObject* pObj = pPg->GetObj( --i ); -- 1.7.7.6