[ooo-build-commit] 2 commits - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                         |    2 ++
 patches/dev300/dtrans-aqua-dragrect-fix.diff |   12 ++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 0ae99c5ba8dc77a2ce105b859c97ec78db81621d
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Thu Sep 10 15:03:39 2009 +0200

    Drawing layer textbounds fix is upstream (slightly different)
    
    * patches/dev300/apply:
    * patches/dev300/drawinglayer-textbounds-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3ca418b..51c0890 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3274,7 +3274,6 @@ link-with-comphelper.diff, tml
 # would be caused by our patches?
 import-export-dialogmodel.diff, tml
 
-drawinglayer-textbounds-fix.diff, n#523603, thorsten
 dtrans-aqua-dragrect-fix.diff, i#104390, thorsten
 
 [ OOXML ]
diff --git a/patches/dev300/drawinglayer-textbounds-fix.diff b/patches/dev300/drawinglayer-textbounds-fix.diff
deleted file mode 100644
index f4b0c5e..0000000
--- a/patches/dev300/drawinglayer-textbounds-fix.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix drawinglayer bound rect calculation for leading space
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- .../source/primitive2d/textlayoutdevice.cxx        |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-
-diff --git drawinglayer/source/primitive2d/textlayoutdevice.cxx drawinglayer/source/primitive2d/textlayoutdevice.cxx
-index 35f62a8..a5037dd 100644
---- drawinglayer/source/primitive2d/textlayoutdevice.cxx
-+++ drawinglayer/source/primitive2d/textlayoutdevice.cxx
-@@ -268,12 +268,12 @@ namespace drawinglayer
-                     nIndex,
-                     nLength);
- 
--                return basegfx::B2DRange(aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom());
--            }
--            else
--            {
--                return basegfx::B2DRange();
-+                if( !aRect.IsEmpty() )
-+                    return basegfx::B2DRange(aRect.Left(), aRect.Top(), 
-+                                             aRect.Right(), aRect.Bottom());
-             }
-+
-+            return basegfx::B2DRange();
-         }
-     } // end of namespace primitive2d
- } // end of namespace drawinglayer
commit 894cfc1ecc14522300cdc779f8a773ca0bacb2d9
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Aug 21 10:52:22 2009 +0200

    Fix missing drag rect on mac, fix wrong text bounds in Impress
    
    * patches/dev300/apply: added the two patches
    * patches/dev300/drawinglayer-textbounds-fix.diff: the drawinglayer
      was errorneously passing the magic 'empty rect' value literally
      up to B2DRange for text bounds processing, leading to huge negative
      values (which of course is wrong)
    * patches/dev300/dtrans-aqua-dragrect-fix.diff: give Cocoa a hint
      that display needs updating, after processing dragging events
      in dtrans. Makes the Calc drag rect actually appear.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bf1a43b..3ca418b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3274,6 +3274,9 @@ link-with-comphelper.diff, tml
 # would be caused by our patches?
 import-export-dialogmodel.diff, tml
 
+drawinglayer-textbounds-fix.diff, n#523603, thorsten
+dtrans-aqua-dragrect-fix.diff, i#104390, thorsten
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 
diff --git a/patches/dev300/drawinglayer-textbounds-fix.diff b/patches/dev300/drawinglayer-textbounds-fix.diff
new file mode 100644
index 0000000..f4b0c5e
--- /dev/null
+++ b/patches/dev300/drawinglayer-textbounds-fix.diff
@@ -0,0 +1,33 @@
+Fix drawinglayer bound rect calculation for leading space
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ .../source/primitive2d/textlayoutdevice.cxx        |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+
+diff --git drawinglayer/source/primitive2d/textlayoutdevice.cxx drawinglayer/source/primitive2d/textlayoutdevice.cxx
+index 35f62a8..a5037dd 100644
+--- drawinglayer/source/primitive2d/textlayoutdevice.cxx
++++ drawinglayer/source/primitive2d/textlayoutdevice.cxx
+@@ -268,12 +268,12 @@ namespace drawinglayer
+                     nIndex,
+                     nLength);
+ 
+-                return basegfx::B2DRange(aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom());
+-            }
+-            else
+-            {
+-                return basegfx::B2DRange();
++                if( !aRect.IsEmpty() )
++                    return basegfx::B2DRange(aRect.Left(), aRect.Top(), 
++                                             aRect.Right(), aRect.Bottom());
+             }
++
++            return basegfx::B2DRange();
+         }
+     } // end of namespace primitive2d
+ } // end of namespace drawinglayer
diff --git a/patches/dev300/dtrans-aqua-dragrect-fix.diff b/patches/dev300/dtrans-aqua-dragrect-fix.diff
new file mode 100644
index 0000000..f712bd7
--- /dev/null
+++ b/patches/dev300/dtrans-aqua-dragrect-fix.diff
@@ -0,0 +1,12 @@
+--- dtrans/source/aqua/DropTarget.cxx~	2009-07-27 11:20:36.000000000 +0200
++++ dtrans/source/aqua/DropTarget.cxx	2009-08-20 23:47:30.000000000 +0200
+@@ -297,6 +297,9 @@
+ 
+       fire_dragOver(dtde);
+ 
++      // drag over callbacks likely have rendered something 
++      [mView setNeedsDisplay: TRUE];
++
+       dragOp = OfficeToSystemDragActions(mSelectedDropAction);
+ 
+       //NSLog(@"Drag update: Source actions: %x proposed action %x selected action %x", mDragSourceSupportedActions, currentAction, mSelectedDropAction);