[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                  |    1 
 patches/dev300/svx-pptin-global-child-bounds-fix.diff |   35 ------------------
 2 files changed, 36 deletions(-)

New commits:
commit 34b81319b7ee80eb7daa16f72ea6c73fe3ea141e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 17:20:56 2009 +0300

    svx-pptin-global-child-bounds-fix.diff is upstream
    
    * patches/dev300/svx-pptin-global-child-bounds-fix.diff: Delete. Is
      upstream.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0c3e773..554c0f5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3174,7 +3174,6 @@ calc-perf-rowheight-no-progress-bar.diff, n#514156, kohei
 [ Fixes ]
 wmf-mm-text.diff, n#417818, rodo
 sd-create-table-height-fix.diff, i#100275, thorsten
-svx-pptin-global-child-bounds-fix.diff, n#485637, thorsten
 pptx-autoplay-fix.diff, n#485645, thorsten
 
 
diff --git a/patches/dev300/svx-pptin-global-child-bounds-fix.diff b/patches/dev300/svx-pptin-global-child-bounds-fix.diff
deleted file mode 100644
index 7acc975..0000000
--- a/patches/dev300/svx-pptin-global-child-bounds-fix.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Swap rotation adaptation for group shape import
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- svx/source/msfilter/msdffimp.cxx |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-
-diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
-index 1895df8..0ef0d6e 100644
---- svx/source/msfilter/msdffimp.cxx
-+++ svx/source/msfilter/msdffimp.cxx
-@@ -4505,13 +4505,13 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
- 			if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 )
- 				|| ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) )
- 			{
--				sal_Int32 nHalfWidth = ( aGlobalChildRect.GetWidth() + 1 ) >> 1;
--				sal_Int32 nHalfHeight = ( aGlobalChildRect.GetHeight() + 1 ) >> 1;
--				Point aTopLeft( aGlobalChildRect.Left() + nHalfWidth - nHalfHeight,
--								aGlobalChildRect.Top() + nHalfHeight - nHalfWidth );
--				Size aNewSize( aGlobalChildRect.GetHeight(), aGlobalChildRect.GetWidth() );
-+				sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1;
-+				sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1;
-+				Point aTopLeft( aClientRect.Left() + nHalfWidth - nHalfHeight,
-+								aClientRect.Top() + nHalfHeight - nHalfWidth );
-+				Size aNewSize( aClientRect.GetHeight(), aClientRect.GetWidth() );
- 				Rectangle aNewRect( aTopLeft, aNewSize );
--				aGlobalChildRect = aNewRect;
-+				aClientRect = aNewRect;
- 			}
- 
- 			// now importing the inner objects of the group