Kaydet (Commit) 6598a61f authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Printing: remove an other manual swap out call

Change-Id: I2b6d6eaa072d9948eb5734e978d68d3bc37701b2
üst 4415af54
...@@ -878,7 +878,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons ...@@ -878,7 +878,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
pOut->SetAntialiasing( nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW ); pOut->SetAntialiasing( nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW );
} }
bool bForceSwap = false, bContinue = true; bool bContinue = true;
const GraphicObject& rGrfObj = pGrfNd->GetGrfObj(); const GraphicObject& rGrfObj = pGrfNd->GetGrfObj();
GraphicAttr aGrfAttr; GraphicAttr aGrfAttr;
...@@ -917,7 +917,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons ...@@ -917,7 +917,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if( bContinue ) if( bContinue )
{ {
const bool bSwapped = rGrfObj.IsSwappedOut();
const bool bSwappedIn = pGrfNd->SwapIn( bPrn ); const bool bSwappedIn = pGrfNd->SwapIn( bPrn );
if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic()) if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic())
{ {
...@@ -976,15 +975,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons ...@@ -976,15 +975,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true ); ::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() ) if ( pShell->Imp()->GetDrawView()->IsAntiAliasing() )
pOut->SetAntialiasing( nFormerAntialiasingAtOutput ); pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
} }
......
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