strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS hb22

Browse source
This commit is contained in:
obo 2010-10-08 08:45:29 +02:00
commit 4db1a7895d
5 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sw/source/core/doc/number.cxx
View file

@ -101,8 +101,15 @@ const SwNumFmt& SwNumRule::Get( USHORT i ) const
const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
{
const SwNumFmt * pResult = NULL;
ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
return aFmts[ i ];
if ( i < MAXLEVEL && eRuleType < RULE_END)
{
pResult = aFmts[ i ];
}
return pResult;
}
// --> OD 2008-07-08 #i91400#

8
sw/source/core/docnode/ndtbl.cxx
View file

@ -334,7 +334,13 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
new SwEndNode( aEndIdx, *pSttNd );
pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
pLine->GetTabBoxes().C40_INSERT( SwTableBox, pPrvBox, nInsPos + n );
SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
USHORT nRealInsPos = nInsPos + n;
if (nRealInsPos > rTabBoxes.Count())
nRealInsPos = rTabBoxes.Count();
rTabBoxes.C40_INSERT( SwTableBox, pPrvBox, nRealInsPos );
//if( NO_NUMBERING == pTxtColl->GetOutlineLevel()//#outline level,zhaojianwei
if( ! pTxtColl->IsAssignedToListLevelOfOutlineStyle()//<-end,zhaojianwei

8
sw/source/filter/rtf/rtfnum.cxx
View file

@ -806,8 +806,8 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
// suche die Rule - steht unter Nummer 3
nListNo = 3;
bContinus = FALSE;
nLevel = MAXLEVEL <= nTokenValue ? MAXLEVEL - 1
: BYTE( nTokenValue - 1 );
nLevel = MAXLEVEL <= (unsigned long) nTokenValue ? MAXLEVEL - 1
: (!nTokenValue ? 0 : BYTE( nTokenValue - 1 ));
}
else
{
@ -815,9 +815,9 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
{
case RTF_PNLVL: nListNo = 3;
bContinus = FALSE;
nLevel = MAXLEVEL <= nTokenValue
nLevel = MAXLEVEL <= (unsigned long) nTokenValue
? MAXLEVEL - 1
: BYTE( nTokenValue-1 );
: (!nTokenValue ? 0 : BYTE( nTokenValue-1 ));
break;
case RTF_PNLVLBODY:

4
sw/source/filter/ww8/ww8par3.cxx
View file

@ -1400,7 +1400,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
pLFOInfo->pNumRule->Set(aLFOLVL.nLevel, aNumFmt);
}
bLVLOk = true;
pLFOInfo->maOverrides[aLFOLVL.nLevel] = aLFOLVL;
if (nMaxLevel > aLFOLVL.nLevel)
pLFOInfo->maOverrides[aLFOLVL.nLevel] = aLFOLVL;
}
if( !bLVLOk )
break;

12
sw/source/filter/ww8/ww8scan.cxx
View file

@ -7179,8 +7179,16 @@ void WW8DopTypography::ReadFromMem(BYTE *&pData)
for (i=0; i < nMaxLeading; ++i)
rgxchLPunct[i] = Get_Short(pData);
rgxchFPunct[cchFollowingPunct]=0;
rgxchLPunct[cchLeadingPunct]=0;
if (cchFollowingPunct >= 0 && cchFollowingPunct < nMaxFollowing)
rgxchFPunct[cchFollowingPunct]=0;
else
rgxchFPunct[nMaxFollowing - 1]=0;
if (cchLeadingPunct >= 0 && cchLeadingPunct < nMaxLeading)
rgxchLPunct[cchLeadingPunct]=0;
else
rgxchLPunct[nMaxLeading - 1]=0;
}
void WW8DopTypography::WriteToMem(BYTE *&pData) const