diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 6a21e524b18d..dbadd0ce57ee 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -833,7 +833,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) { nSwNumLevel = *pData - 1; if (!bNoAttrImport) - //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei + //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei // Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt // werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt @@ -860,7 +860,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen ) // Sprm 12 { { - SwWW8StyInf * pStyInf = GetStyle(nAktColl); + SwWW8StyInf * pStyInf = GetStyle(nAktColl); if( !pAktColl || nLen <= 0 // nur bei Styledef || (pStyInf && !pStyInf->bColl) // CharFmt -> ignorieren || ( nIniFlags & WW8FL_NO_OUTLINE ) ){ @@ -2399,7 +2399,7 @@ void WW8TabDesc::CalcDefaults() } } */ - if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || + if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || (nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned @@ -2572,7 +2572,7 @@ void WW8TabDesc::CreateSwTable() nLeft = GetMinLeft(); else { - if (nPreferredWidth) + if (nPreferredWidth) { nLeft = pIo->maSectionManager.GetTextAreaWidth(); nLeft = nLeft - nPreferredWidth - nOrgDxaLeft; @@ -3602,25 +3602,25 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) bool lcl_PamContainsFly(SwPaM & rPam) { - bool bResult = false; + bool bResult = false; SwNodeRange aRg( rPam.Start()->nNode, rPam.End()->nNode ); SwDoc * pDoc = rPam.GetDoc(); - - sal_uInt16 n = 0; + + sal_uInt16 n = 0; SwSpzFrmFmts * pSpzFmts = pDoc->GetSpzFrmFmts(); - sal_uInt16 nCount = pSpzFmts->Count(); + sal_uInt16 nCount = pSpzFmts->Count(); while (!bResult && n < nCount) { SwFrmFmt* pFly = (*pSpzFmts)[n]; const SwFmtAnchor* pAnchor = &pFly->GetAnchor(); - + switch (pAnchor->GetAnchorId()) { case FLY_AT_PARA: case FLY_AT_CHAR: { const SwPosition* pAPos = pAnchor->GetCntntAnchor(); - + if (pAPos != NULL && aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd) @@ -3632,10 +3632,10 @@ bool lcl_PamContainsFly(SwPaM & rPam) default: break; } - + ++n; } - + return bResult; } |