[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                               |    4 ----
 patches/dev300/build-fix.diff                      |   17 -----------------
 patches/dev300/calc-perf-lazy-overlay-objects.diff |   11 ++++++++++-
 3 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit b7bbad6e20a0c7581d4cca01d186eacac706bbee
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 11 02:12:08 2009 -0400

    Moved build fix to the right patch.
    
    * patches/dev300/apply: removed FIXME comment.
    * patches/dev300/build-fix.diff: removed hunk.
    * patches/dev300/calc-perf-lazy-overlay-objects.diff: combined
      hunk from the patch above.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f3677b8..7bc7133 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -859,10 +859,6 @@ calc-perf-sort.diff, n#504827, kohei
 calc-perf-lazy-overlay-objects.diff, n#511006, kohei
 
 # Better algorithm for row flag copying.
-
-# FIXME: 2009-08-21: Doesn't apply, presumably because some earlier
-# patch has been commented out, might apply once they are used
-# again. --tml
 calc-perf-copy-table-flags.diff, n#514156, kohei
 
 # don't show progress bar during row height adjustment if the row count is 
diff --git a/patches/dev300/build-fix.diff b/patches/dev300/build-fix.diff
index 3f06200..c07aeff 100644
--- a/patches/dev300/build-fix.diff
+++ b/patches/dev300/build-fix.diff
@@ -13,20 +13,3 @@ index ec8bb6b..89841d7 100644
  
  /*
   * Pointer (Mauszeiger)
-diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
-index d6fdb75..57c4740 100644
---- sc/source/ui/view/cellsh1.cxx
-+++ sc/source/ui/view/cellsh1.cxx
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 07d5d14..7a13b81 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -5452,7 +5452,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
-                 aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
-             std::vector< basegfx::B2DRange > aRanges;
-             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
--            basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);
-+            basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1);
-             
-             aRB.transform(aTransform);
-             aRanges.push_back(aRB);
diff --git a/patches/dev300/calc-perf-lazy-overlay-objects.diff b/patches/dev300/calc-perf-lazy-overlay-objects.diff
index 1c5c85d..dca9454 100644
--- a/patches/dev300/calc-perf-lazy-overlay-objects.diff
+++ b/patches/dev300/calc-perf-lazy-overlay-objects.diff
@@ -37,7 +37,7 @@ index aae0353..7b9bac5 100644
      ScViewData*				pViewData;
      ScSplitPos				eWhich;
 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index e591f86..f6fa81c 100644
+index e591f86..9754ccd 100644
 --- sc/source/ui/view/gridwin.cxx
 +++ sc/source/ui/view/gridwin.cxx
 @@ -159,7 +159,19 @@ extern USHORT nScFillModeMouseModifier;				// global.cxx
@@ -145,6 +145,15 @@ index e591f86..f6fa81c 100644
      
          // #i70788# get the OverlayManager safely
          ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
+@@ -5407,7 +5416,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
+                 aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
+             std::vector< basegfx::B2DRange > aRanges;
+             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
+-            basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);
++            basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1);
+             
+             aRB.transform(aTransform);
+             aRanges.push_back(aRB);
 @@ -5422,10 +5431,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
              mpOOAutoFill = new ::sdr::overlay::OverlayObjectList;
              mpOOAutoFill->append(*pOverlay);