svn commit: r1373700 - /incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx

[lijiany]

Author: lijiany
Date: Thu Aug 16 02:19:24 2012
New Revision: 1373700

URL: http://svn.apache.org/viewvc?rev=1373700&view=rev
Log:
#119570# fix chaos grouped object when import
Reported by: Du Jing
Patch by: Jianyuan Li
Review by: SunYing

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1373700&r1=1373699&r2=1373700&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Thu Aug 16 
02:19:24 2012
@@ -4945,6 +4945,7 @@ Rectangle SvxMSDffManager::GetGlobalChil
 {
        Rectangle aChildAnchor;
        rHd.SeekToContent( rSt );
+       sal_Bool bIsClientRectRead = sal_False;
        while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < 
rHd.GetRecEndFilePos() ) )
        {
                DffRecordHeader aShapeHd;
@@ -4979,7 +4980,16 @@ Rectangle SvxMSDffManager::GetGlobalChil
                                                Scale( t );
                                                Scale( r );
                                                Scale( b );
-                                               aClientRect = Rectangle( l, t, 
r, b );
+                                               if ( bIsClientRectRead ) 
+                                               {
+                                                       Rectangle aChild( l, t, 
r, b );
+                                                       aChildAnchor.Union( 
aChild );
+                                               }
+                                               else
+                                               {
+                                                       aClientRect = 
Rectangle( l, t, r, b );
+                                                       bIsClientRectRead = 
sal_True;
+                                               }
                                        }
                                        break;
                                }