Kaydet (Commit) 5e772cda authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Header/Footer,Page Break: fix bad test for printing mode (fdo#43962)

üst c9bc4a04
...@@ -3323,7 +3323,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitiv ...@@ -3323,7 +3323,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitiv
void SwPageFrm::PaintBreak( ) const void SwPageFrm::PaintBreak( ) const
{ {
if ( !pGlobalShell->GetViewOptions()->IsPrinting() && if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER &&
!pGlobalShell->GetViewOptions()->IsPDFExport() && !pGlobalShell->GetViewOptions()->IsPDFExport() &&
!pGlobalShell->IsPreView() ) !pGlobalShell->IsPreView() )
{ {
...@@ -3358,7 +3358,7 @@ void SwPageFrm::PaintBreak( ) const ...@@ -3358,7 +3358,7 @@ void SwPageFrm::PaintBreak( ) const
void SwColumnFrm::PaintBreak( ) const void SwColumnFrm::PaintBreak( ) const
{ {
if ( !pGlobalShell->GetViewOptions()->IsPrinting() && if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER &&
!pGlobalShell->GetViewOptions()->IsPDFExport() && !pGlobalShell->GetViewOptions()->IsPDFExport() &&
!pGlobalShell->IsPreView() ) !pGlobalShell->IsPreView() )
{ {
...@@ -3465,7 +3465,7 @@ void SwPageFrm::PaintDecorators( ) const ...@@ -3465,7 +3465,7 @@ void SwPageFrm::PaintDecorators( ) const
{ {
SwRect aBodyRect( pBody->Frm() ); SwRect aBodyRect( pBody->Frm() );
if ( !pGlobalShell->GetViewOptions()->IsPrinting() && if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER &&
!pGlobalShell->GetViewOptions()->IsPDFExport() && !pGlobalShell->GetViewOptions()->IsPDFExport() &&
!pGlobalShell->IsPreView() && !pGlobalShell->IsPreView() &&
pGlobalShell->IsShowHeaderFooterSeparator( ) ) pGlobalShell->IsShowHeaderFooterSeparator( ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment