Kaydet (Commit) 97711875 authored tarafından Jianyuan Li's avatar Jianyuan Li Kaydeden (comit) Caolán McNamara

Resolves: #i119570# fix chaotically grouped object when imported

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

(cherry picked from commit cbdcdbff)

Conflicts:
	filter/source/msfilter/msdffimp.cxx

Change-Id: I8a6e87a949d1fe10b2e6c6c9a2a7be0da843eb5d
üst 87ee9a16
...@@ -4618,6 +4618,7 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS ...@@ -4618,6 +4618,7 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS
if (!rHd.SeekToContent(rSt)) if (!rHd.SeekToContent(rSt))
return aChildAnchor; return aChildAnchor;
bool bIsClientRectRead = false;
while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) ) while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) )
{ {
DffRecordHeader aShapeHd; DffRecordHeader aShapeHd;
...@@ -4652,7 +4653,16 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS ...@@ -4652,7 +4653,16 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS
Scale( t ); Scale( t );
Scale( r ); Scale( r );
Scale( b ); 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; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment