applied_patches/0882-svx-pptin-global-child-bounds-fix.diff

   1 Swap rotation adaptation for group shape import
   2
   3 From: Thorsten Behrens <thb@openoffice.org>
   4
   5
   6 ---
   7
   8  svx/source/msfilter/msdffimp.cxx |   12 ++++++------
   9  1 files changed, 6 insertions(+), 6 deletions(-)
  10
  11
  12 diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
  13 index 1895df8..0ef0d6e 100644
  14 --- svx/source/msfilter/msdffimp.cxx
  15 +++ svx/source/msfilter/msdffimp.cxx
  16 @@ -4505,13 +4505,13 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
  17                         if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 )
  18                                 || ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) )
  19                         {
  20 -                               sal_Int32 nHalfWidth = ( aGlobalChildRect.GetWidth() + 1 ) >> 1;
  21 -                               sal_Int32 nHalfHeight = ( aGlobalChildRect.GetHeight() + 1 ) >> 1;
  22 -                               Point aTopLeft( aGlobalChildRect.Left() + nHalfWidth - nHalfHeight,
  23 -                                                               aGlobalChildRect.Top() + nHalfHeight - nHalfWidth );
  24 -                               Size aNewSize( aGlobalChildRect.GetHeight(), aGlobalChildRect.GetWidth() );
  25 +                               sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1;
  26 +                               sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1;
  27 +                               Point aTopLeft( aClientRect.Left() + nHalfWidth - nHalfHeight,
  28 +                                                               aClientRect.Top() + nHalfHeight - nHalfWidth );
  29 +                               Size aNewSize( aClientRect.GetHeight(), aClientRect.GetWidth() );
  30                                 Rectangle aNewRect( aTopLeft, aNewSize );
  31 -                               aGlobalChildRect = aNewRect;
  32 +                               aClientRect = aNewRect;
  33                         }
  34
  35                         // now importing the inner objects of the group