From 977118753c3b4a05701866586136b78a669925c7 Mon Sep 17 00:00:00 2001
From: Jianyuan Li <lijiany@apache.org>
Date: Thu, 16 Aug 2012 01:19:24 +0000
Subject: Resolves: #i119570# fix chaotically grouped object when imported

Reported by: Du Jing
Patch by: Jianyuan Li
Review by: SunYing

(cherry picked from commit cbdcdbffea20596ab0547fab57e601a9633fe2b8)

Conflicts:
	filter/source/msfilter/msdffimp.cxx

Change-Id: I8a6e87a949d1fe10b2e6c6c9a2a7be0da843eb5d
---
 filter/source/msfilter/msdffimp.cxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'filter/source/msfilter/msdffimp.cxx')

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 922dec334bba..dc726b1b243d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4618,6 +4618,7 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS
     if (!rHd.SeekToContent(rSt))
         return aChildAnchor;
 
+    bool bIsClientRectRead = false;
     while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) )
     {
         DffRecordHeader aShapeHd;
@@ -4652,7 +4653,16 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS
                         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 = true;
+                        }
                     }
                     break;
                 }
-- 
cgit