openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1503655 - /openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx
Date Tue, 16 Jul 2013 10:55:55 GMT
Author: alg
Date: Tue Jul 16 10:55:54 2013
New Revision: 1503655

URL: http://svn.apache.org/r1503655
Log:
i122753 Force SwapIn for BitmapObjects which are part of a conversion to BitmapEx

Modified:
    openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx

Modified: openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx?rev=1503655&r1=1503654&r2=1503655&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdxcgv.cxx Tue Jul 16 10:55:54 2013
@@ -574,8 +574,17 @@ BitmapEx SdrExchangeView::GetMarkedObjBi
 
                 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



Mime
View raw message