diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 17716b65cc05..0f93dd67b669 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1648,7 +1648,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt bOutFirstPage = false; } - // left-/right chain of pagedescs ? if ( pPd->GetFollow() && pPd != pPd->GetFollow() && pPd->GetFollow()->GetFollow() == pPd && @@ -1714,10 +1713,10 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); } - // write other headers/footers only if it's not the first page - I'm not quite sure + // write other headers/footers only if it's not on the first page - I'm not quite sure // this is technically correct, but it avoids first-page headers/footers // extending to all pages (bnc#654230) - if( pPdFmt != pPdFirstPgFmt ) + if( !titlePage || pPdFmt != pPdFirstPgFmt ) { MSWordSections::SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 9a51005d08b7..9448cca6b6e8 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2629,7 +2629,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) case RES_AUTHORFLD: { ww::eField eFld = - (AF_SHORTCUT & nSubType ? ww::eUSERINITIALS : ww::eUSERNAME); + (AF_SHORTCUT & pFld->GetFormat() ? ww::eUSERINITIALS : ww::eUSERNAME); GetExport().OutputField(pFld, eFld, FieldString(eFld)); } break; |