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

INTEGRATION: CWS ww8export05_SRC680 (1.98.166.2.2); FILE MERGED

Browse source 
2007/06/12 10:05:32 ama 1.98.166.2.2.3: FIx #148063#148064#: Page breaks and para style
2007/06/11 12:17:04 ama 1.98.166.2.2.2: Fix #148018#148021#i77900#: Page break attribute instead '0x0c'
2007/06/06 15:45:08 od 1.98.166.2.2.1: merge changes from cws ww8export03 into cws ww8export05
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Kurt Zenker 2007-06-20 07:54:38 +00:00
parent 0a9a410bb0
commit 2547f766ca
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sw/source/filter/ww8/ww8atr.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: ww8atr.cxx,v $
*
* $Revision: 1.103 $
* $Revision: 1.104 $
*
* last change: $Author: obo $ $Date: 2007-06-12 05:56:43 $
* last change: $Author: kz $ $Date: 2007-06-20 08:54:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -742,6 +742,14 @@ void SwWW8Writer::Out_SfxBreakItems(const SfxItemSet *pSet, const SwNode& rNd)
ItemGet<SvxFmtBreakItem>(*pNd, RES_BREAK);
if (rBreak.GetBreak() == SVX_BREAK_PAGE_BEFORE)
bHackInBreak = true;
else
{ // Even a pagedesc item is set, the break item can be set 'NONE',
// but a pagedesc item is an implicit page break before...
const SwFmtPageDesc &rPageDesc =
ItemGet<SwFmtPageDesc>( *pNd, RES_PAGEDESC );
if( rPageDesc.GetRegisteredIn() )
bHackInBreak = true;
}
}
}
@ -3692,8 +3700,18 @@ static Writer& OutWW8_SwFmtBreak( Writer& rWrt, const SfxPoolItem& rHt )
break;
case SVX_BREAK_PAGE_BEFORE: // PageBreak
bBefore = true;
nC = cPageBreak;
// From now on(fix for #i77900#) we prefer to save a page break as
// paragraph attribute, this has to be done after the export of the
// paragraph ( => !rWW8Wrt.bBreakBefore )
if( !rWW8Wrt.bBreakBefore )
{
// sprmPPageBreakBefore/sprmPFPageBreakBefore
if( rWW8Wrt.bWrtWW8 )
rWW8Wrt.InsUInt16( 0x2407 );
else
rWW8Wrt.pO->Insert( 9, rWW8Wrt.pO->Count() );
rWW8Wrt.pO->Insert( (BYTE)1, rWW8Wrt.pO->Count() );
}
break;
case SVX_BREAK_PAGE_AFTER:
case SVX_BREAK_PAGE_BOTH: