diff options
author | Armin Le Grand <alg@apache.org> | 2013-07-16 10:55:54 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-16 14:17:29 +0100 |
commit | c239615ca48a2ca15460a12ac654774ef927bfdc (patch) | |
tree | ddd702a3c297014293137c5dd2fcbb6adc8fc607 /svx | |
parent | 4780d94d6d52ff68c72a81bf3e00dbe850995c8c (diff) |
Resolves: #i122753# Force SwapIn for BitmapObjects which...
are part of a conversion to BitmapEx
(cherry picked from commit 4dc54d2ec37bc1595eb85548f5e3c6d2add2b10a)
Change-Id: I43a92bfbdb41c8c2215aacd65b65774dcf5ab2be
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index f750448e9be9..5359d57a2959 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -490,8 +490,17 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const for(sal_uInt32 a(0); a < nCount; a++) { + SdrObject* pCandidate = aSdrObjects[a]; + SdrGrafObj* pSdrGrafObj = dynamic_cast< SdrGrafObj* >(pCandidate); + + if(pSdrGrafObj) + { + // #122753# To ensure existance of graphic content, force swap in + pSdrGrafObj->ForceSwapIn(); + } + xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D( - aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence()); + pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence()); } // get logic range |