[ooo-build-commit] Branch 'ooo/master' - sw/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Sep 1 04:19:01 PDT 2009
sw/source/filter/ww8/wrtw8sty.cxx | 22 +++++++++++-----------
sw/source/filter/ww8/wrtww8.hxx | 12 +++++++-----
sw/source/filter/ww8/ww8atr.cxx | 11 +++++++----
3 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 5cd4cd02a22e310c949736bfc6ffed2b898f713d
Author: Release Engineers <releng at openoffice.org>
Date: Mon Aug 31 11:25:58 2009 +0000
#i10000# errors induced by conflicting CWS resolved
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 452e631..c6f6ce0 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1123,7 +1123,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
if ( nFlag & nHFFlags )
{
pTxtPos->Append( rCpPos );
- rWrt.WriteHeaderFooterText( rFmt, bHeader );
+ rWrt.WriteHeaderFooterText( rFmt, bHeader);
rWrt.WriteStringAsPara( aEmptyStr ); // CR ans Ende ( sonst mault WW )
rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
}
@@ -1411,31 +1411,31 @@ void WW8Export::SetupSectionPositions( WW8_PdAttrDesc* pA )
}
void WW8Export::WriteHeadersFooters( BYTE nHeadFootFlags,
- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt )
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE nBreakCode )
{
ULONG nCpPos = Fc2Cp( Strm().Tell() );
IncrementHdFtIndex();
if ( !(nHeadFootFlags & WW8_HEADER_EVEN) && pDop->fFacingPages )
- pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD );
+ pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
else
- pSepx->OutHeaderFooter( *this, true, rLeftFmt, nCpPos, nHeadFootFlags, WW8_HEADER_EVEN );
+ pSepx->OutHeaderFooter( *this, true, rLeftFmt, nCpPos, nHeadFootFlags, WW8_HEADER_EVEN, nBreakCode );
IncrementHdFtIndex();
- pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD );
+ pSepx->OutHeaderFooter( *this, true, rFmt, nCpPos, nHeadFootFlags, WW8_HEADER_ODD, nBreakCode );
IncrementHdFtIndex();
if ( !(nHeadFootFlags & WW8_FOOTER_EVEN) && pDop->fFacingPages )
- pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD );
+ pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
else
- pSepx->OutHeaderFooter( *this, false, rLeftFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_EVEN );
+ pSepx->OutHeaderFooter( *this, false, rLeftFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_EVEN, nBreakCode );
IncrementHdFtIndex();
- pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD );
+ pSepx->OutHeaderFooter( *this, false, rFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
//#i24344# Drawing objects cannot be directly shared between main hd/ft
//and title hd/ft so we need to differenciate them
IncrementHdFtIndex();
- pSepx->OutHeaderFooter( *this, true, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_HEADER_FIRST );
- pSepx->OutHeaderFooter( *this, false, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_FIRST );
+ pSepx->OutHeaderFooter( *this, true, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_HEADER_FIRST, nBreakCode );
+ pSepx->OutHeaderFooter( *this, false, rFirstPageFmt, nCpPos, nHeadFootFlags, WW8_FOOTER_FIRST, nBreakCode );
}
void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAttrDesc* pA )
@@ -1672,7 +1672,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
const SwTxtNode *pOldPageRoot = GetHdFtPageRoot();
SetHdFtPageRoot( rSepInfo.pPDNd ? rSepInfo.pPDNd->GetTxtNode() : 0 );
- WriteHeadersFooters( nHeadFootFlags, *pPdFmt, *pPdLeftFmt, *pPdFirstPgFmt );
+ WriteHeadersFooters( nHeadFootFlags, *pPdFmt, *pPdLeftFmt, *pPdFirstPgFmt, nBreakCode );
SetHdFtPageRoot( pOldPageRoot );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index e3d9044..a96a2e5 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -256,8 +256,8 @@ public:
private:
void WriteFtnEndTxt( WW8Export& rWrt, ULONG nCpStt );
public:
- void OutHeaderFooter( WW8Export& rWrt, bool bHeader,
- const SwFmt& rFmt, ULONG& rCpPos, BYTE nHFFlags, BYTE nFlag );
+ void OutHeaderFooter(WW8Export& rWrt, bool bHeader,
+ const SwFmt& rFmt, ULONG& rCpPos, BYTE nHFFlags, BYTE nFlag, BYTE nBreakCode);
};
//--------------------------------------------------------------------------
@@ -657,7 +657,7 @@ public:
const SwTxtNode* pNd );
/// Write header/footer text.
- void WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader );
+ void WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader);
/// Format of the section.
const SwSectionFmt* GetSectionFormat( const SwNode& rNd ) const;
@@ -700,7 +700,8 @@ public:
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( BYTE nHeadFootFlags,
- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt ) = 0;
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt,
+ BYTE nBreakCode) = 0;
/// Write the field
virtual void OutputField( const SwField* pFld, ww::eField eFldType,
@@ -1090,7 +1091,8 @@ public:
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( BYTE nHeadFootFlags,
- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt );
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt,
+ BYTE nBreakCode);
protected:
/// Output SwGrfNode
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 196b151..778436e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2205,6 +2205,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
// }
}
+
if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
{
@@ -2229,7 +2230,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
// non-standard style for that level, i.e. ignore headline
// styles 1-9 and find the lowest valid outline level
BYTE nPosOfLowestNonStandardLvl = MAXLEVEL;
- const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
+ const SwTxtFmtColls& rColls = *GetExport().pDoc->GetTxtFmtColls();
for( n = rColls.Count(); n; )
{
const SwTxtFmtColl* pColl = rColls[ --n ];
@@ -2281,7 +2282,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
}
}
- }
+ }
if( nsSwTOXElement::TOX_TEMPLATE & pTOX->GetCreateType() )
// --> OD 2009-02-27 #i99641#
@@ -2300,7 +2301,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
TOX_STYLE_DELIMITER, nPos ));
if( sStyle.Len() )
{
- SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(sStyle);
+ SwTxtFmtColl* pColl = GetExport().pDoc->FindTxtFmtCollByName(sStyle);
if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
{
if( sTOption.Len() )
@@ -2373,6 +2374,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
sStr.APPEND_CONST_ASC("\\h");
}
break;
+ }
}
if( sStr.Len() )
@@ -2381,8 +2383,9 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
GetExport( ).OutputField( 0, eCode, sStr, WRITEFIELD_START | WRITEFIELD_CMD_START |
WRITEFIELD_CMD_END );
}
+
+ GetExport( ).bStartTOX = false;
}
- GetExport( ).bStartTOX = false;
}
void AttributeOutputBase::EndTOX( const SwSection& rSect )
More information about the ooo-build-commit
mailing list