diff options
author | Michael Stahl <mstahl@redhat.com> | 2011-12-07 13:45:57 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-09 15:18:01 +0100 |
commit | c549ae0b57c3fec2c4bec1c442c3c700297bb60f (patch) | |
tree | 23d0e65c0b5c6842b30c28738fe52dd8d2f18074 /sw | |
parent | 50471a85d43a3bcdb3f3d33b85cd14bbc56efaf6 (diff) |
sw: tweak translations
cb8b7a86 and 869a0f36
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/doc.cxx | 20 | ||||
-rw-r--r-- | sw/source/core/doc/docbm.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/doc/doccomp.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfld.cxx | 23 |
4 files changed, 29 insertions, 25 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index d07ef90165f2..a461fb93b6df 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -90,7 +90,7 @@ #include <ndole.hxx> #include <ndgrf.hxx> #include <rolbck.hxx> // Undo attr -#include <doctxm.hxx> // for the directories +#include <doctxm.hxx> // for the index stuff #include <grfatr.hxx> #include <poolfmt.hxx> // pool template ids #include <mvsave.hxx> // for server functionality @@ -141,7 +141,7 @@ using ::rtl::OUString; // Page descriptors SV_IMPL_PTRARR(SwPageDescs,SwPageDescPtr); -// Directories +// Table Of ... SV_IMPL_PTRARR( SwTOXTypes, SwTOXTypePtr ) // Field types SV_IMPL_PTRARR( SwFldTypes, SwFldTypePtr) @@ -723,7 +723,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart ) if (GetIDocumentUndoRedo().DoesUndo()) { GetIDocumentUndoRedo().ClearRedo(); - // insert from the Undo object (currently only for TextNode) + // insert the Undo object (currently only for TextNode) if( pNode->IsTxtNode() ) { pUndo = new SwUndoSplitNode( this, rPos, bChkTableStart ); @@ -756,7 +756,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart ) pNd = 0; else { - // Only if the table has line breaks! + // Only if the table has page breaks! const SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt(); if( SFX_ITEM_SET != pFrmFmt->GetItemState(RES_PAGEDESC, sal_False) && SFX_ITEM_SET != pFrmFmt->GetItemState( RES_BREAK, sal_False ) ) @@ -774,7 +774,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart ) ((SwPosition&)rPos).nNode = pTblNd->GetIndex()-1; ((SwPosition&)rPos).nContent.Assign( pTxtNd, 0 ); - // only add page breaks/templates to the body area + // only add page breaks/styles to the body area if( nPrevPos > GetNodes().GetEndOfExtras().GetIndex() ) { SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt(); @@ -1108,9 +1108,11 @@ sal_uInt16 _PostItFld::GetPageNo( const std::set< sal_Int32 > &rPossiblePages, /* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo ) { - //Problem: If a PostItFld is contained in more than one Node that is represented by more than one layout instance, + //Problem: If a PostItFld is contained in a Node that is represented + //by more than one layout instance, //we have to decide whether it should be printed once or n-times. - //Probably only once. For the page number we don't select a random one, but the PostIt's first occurence in the selected area. + //Probably only once. For the page number we don't select a random one, + //but the PostIt's first occurence in the selected area. rVirtPgNo = 0; sal_uInt16 nPos = GetCntnt(); SwIterator<SwTxtFrm,SwTxtNode> aIter( GetFld()->GetTxtNode() ); @@ -1830,7 +1832,7 @@ void SwDoc::ClearSwLayouterEntries() void SwDoc::SetModified() { ClearSwLayouterEntries(); - // We return the status for the link according to the old and new value of the flags + // give the old and new modified state to the link // Bit 0: -> old state // Bit 1: -> new state long nCall = mbModified ? 3 : 2; @@ -1849,7 +1851,7 @@ void SwDoc::SetModified() void SwDoc::ResetModified() { - // We return the status for the link according to the old and new value of the flags + // give the old and new modified state to the link // Bit 0: -> old state // Bit 1: -> new state long nCall = mbModified ? 1 : 0; diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 4e4aec3acf9d..a3ce1310739b 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -904,8 +904,8 @@ namespace // CntntType -- // 0x8000 = Bookmark Pos1 // 0x8001 = Bookmark Pos2 - // 0x2000 = Paragraph bound frame - // 0x2001 = Auto paragraph bound frame, which should be attached + // 0x2000 = Paragraph anchored frame + // 0x2001 = frame anchored at character, which should be moved // 0x1000 = Redline Mark // 0x1001 = Redline Point // 0x0800 = Crsr from the CrsrShell Mark @@ -1170,7 +1170,8 @@ void _DelBookmarks( pDoc->getIDocumentMarkAccess()->deleteMarks(rStt, rEnd, pSaveBkmk, pSttIdx, pEndIdx); - // Copy all red lines which are in the move area into an array, which holds all position information as offset. + // Copy all Redlines which are in the move area into an array + // which holds all position information as offset. // Assignement happens after moving. SwRedlineTbl& rTbl = (SwRedlineTbl&)pDoc->GetRedlineTbl(); for(sal_uInt16 nCnt = 0; nCnt < rTbl.Count(); ++nCnt ) @@ -1311,7 +1312,7 @@ void _SaveCntntIdx(SwDoc* pDoc, } } - // 4. Paragraph bound objects + // 4. Paragraph anchored objects { SwCntntNode *pNode = pDoc->GetNodes()[nNode]->GetCntntNode(); if( pNode ) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 8f4f56d59ff2..bd3ee2cdc3dd 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -255,7 +255,7 @@ sal_uLong CompareData::ShowDiffs( const CompareData& rData ) while( nStt2 < nLen2 && GetChanged( nStt2 )) ++nStt2; // rData is the original, - // this is what should go to the change + // "this" recieves the changes if( nSav2 != nStt2 && nSav1 != nStt1 ) CheckForChangesInLine( rData, nSav1, nStt1, nSav2, nStt2 ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 019e1606022e..c09d28ed318d 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -327,7 +327,7 @@ SwFieldType* SwDoc::GetFldType( sal_uInt16 nResId, const String& rName, */ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) { - // Call modify() for every field type, + // Call Modify() for every field type, // dependent SwTxtFld get notified ... for( sal_uInt16 i=0; i < pFldTypes->Count(); ++i) @@ -335,7 +335,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) switch( (*pFldTypes)[i]->Which() ) { // Update table fields second to last - // Update references at last + // Update references last case RES_GETREFFLD: case RES_TABLEFLD: case RES_DBFLD: @@ -378,7 +378,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) if( bCloseDB ) GetNewDBMgr()->CloseAll(); - // Only evaluate on CompleteUpdate + // Only evaluate on full update SetModified(); } @@ -524,7 +524,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt ) (pFld = (SwTblField*)pFmtFld->GetFld())->GetSubType() )) continue; - // needs to be recalculated (and is no textual note) + // needs to be recalculated if( !pFld->IsValid() ) { // table where this field is located @@ -543,7 +543,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt ) if( !pCalc ) pCalc = new SwCalc( *this ); - // get the values of all SetExpresion fields, that are valid + // get the values of all SetExpression fields that are valid // until the table SwFrm* pFrm = 0; if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() ) @@ -608,7 +608,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt ) if( !pCalc ) pCalc = new SwCalc( *this ); - // get the values of all SetExpresion fields, that are valid + // get the values of all SetExpression fields that are valid // until the table SwFrm* pFrm = 0; if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() ) @@ -921,11 +921,11 @@ sal_Bool _SetGetExpFld::operator<( const _SetGetExpFld& rFld ) const } } - // if it is the same section, then the field is in the same Node + // same Section: is the field in the same Node? if( pFirst != pNext ) return pFirst->GetIndex() < pNext->GetIndex(); - // same Node in the Section, then Position in the Node + // same Node in the Section, check Position in the Node return GetCntPosFromCntnt() < rFld.GetCntPosFromCntnt(); } @@ -2217,8 +2217,8 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) /// have to be known in order to insert the hide condition as a new /// expression field into the sorted field list (<pFldSortLst>). if ( eGetMode == GETFLD_ALL ) - // Collect the ranges first. Supply all with frames, which are hidden by condition, - // so that the contained fields are not sorted. + // Collect the sections first. Supply sections that are hidden by condition + // with frames so that the contained fields are sorted properly. { // In order for the frames to be created the right way, they have to be expanded // from top to bottom @@ -2646,7 +2646,8 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld, pDstFmtFld->ModifyNotification( 0, pMsgHnt ); } - // The fields we can calculate here are being triggered for an update here explicitily. + // The fields we can calculate here are being triggered for an update + // here explicitly. if( nFldWhich == RES_USERFLD ) UpdateUsrFlds(); } |