incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172120 - /incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx
Date Sat, 17 Sep 2011 22:40:50 GMT
Author: mst
Date: Sat Sep 17 22:40:50 2011
New Revision: 1172120

URL: http://svn.apache.org/viewvc?rev=1172120&view=rev
Log:
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider instances of <SwFlyDrawObj>

# HG changeset patch
# User Oliver-Rainer Wittmann <od@openoffice.org>
# Date 1304666159 -7200
# Node ID 5f7a7d1da1328ca43af2986cea79db76fc6e3e66
# Parent  c1d78b76cbb1b9ea97bfa253e5d0d88b15b232ff

Modified:
    incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx

Modified: incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx?rev=1172120&r1=1172119&r2=1172120&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/layout/paintfrm.cxx Sat Sep 17 22:40:50 2011
@@ -3422,7 +3422,13 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *p
 	{
 		//Das Paint kann evtl. von von uebergeordneten Flys verhindert werden.
         SwFrm *pAnch = 0;
-		if ( pObj->ISA(SwVirtFlyDrawObj) )
+        // --> OD #i117962#
+        if ( pObj->ISA(SwFlyDrawObj) )
+        {
+            bPaint = false;        
+        }
+        // <--
+        else if ( pObj->ISA(SwVirtFlyDrawObj) )
 		{
 			SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
 			if ( pFlyOnlyDraw && pFlyOnlyDraw == pFly )



Mime
View raw message