summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-10-29 23:14:57 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-07 10:45:12 +0100
commit6598a61ff42d9754949dde7ffeaff476183e06bd (patch)
tree12348d99a8a9829e51086ab3261fc00f4e65cb13 /sw
parent4415af54b4f7d2ce4d3b10f789801adc082d5afa (diff)
Printing: remove an other manual swap out call
Change-Id: I2b6d6eaa072d9948eb5734e978d68d3bc37701b2
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/notxtfrm.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 7f8666064bfe..563144a40c3e 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -878,7 +878,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
pOut->SetAntialiasing( nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW );
}
- bool bForceSwap = false, bContinue = true;
+ bool bContinue = true;
const GraphicObject& rGrfObj = pGrfNd->GetGrfObj();
GraphicAttr aGrfAttr;
@@ -917,7 +917,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if( bContinue )
{
- const bool bSwapped = rGrfObj.IsSwappedOut();
const bool bSwappedIn = pGrfNd->SwapIn( bPrn );
if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic())
{
@@ -976,15 +975,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true );
}
-
- // When printing, we must not collect the graphics
- if( bSwapped && bPrn )
- bForceSwap = true;
}
- if( bForceSwap )
- pGrfNd->SwapOut();
-
if ( pShell->Imp()->GetDrawView()->IsAntiAliasing() )
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}