[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Cédric Bosdonnat]

 sw/source/core/layout/paintfrm.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e09b9a635ee23ce162e1733fc804a2cc182bc25f
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Wed Dec 21 22:09:46 2011 +0100

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

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index c33da28..387d8a3 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3323,7 +3323,7 @@ drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorPrimitiv
 
 void SwPageFrm::PaintBreak( ) const
 {
-    if ( !pGlobalShell->GetViewOptions()->IsPrinting() &&
+    if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER  &&
          !pGlobalShell->GetViewOptions()->IsPDFExport() &&
          !pGlobalShell->IsPreView() )
     {
@@ -3358,7 +3358,7 @@ void SwPageFrm::PaintBreak( ) const
 
 void SwColumnFrm::PaintBreak( ) const
 {
-    if ( !pGlobalShell->GetViewOptions()->IsPrinting() &&
+    if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER  &&
          !pGlobalShell->GetViewOptions()->IsPDFExport() &&
          !pGlobalShell->IsPreView() )
     {
@@ -3465,7 +3465,7 @@ void SwPageFrm::PaintDecorators( ) const
         {
             SwRect aBodyRect( pBody->Frm() );
 
-            if ( !pGlobalShell->GetViewOptions()->IsPrinting() &&
+            if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER &&
                  !pGlobalShell->GetViewOptions()->IsPDFExport() &&
                  !pGlobalShell->IsPreView() &&
                  pGlobalShell->IsShowHeaderFooterSeparator( ) )