[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/calc-cursor-split-view.diff |   30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

New commits:
commit a00fd663bb9fdee7d6a234a1e3eab12ce341de9e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 15:40:15 2009 +0300

    Adapt calc-cursor-split-view.diff to dev300-m57

diff --git a/patches/dev300/calc-cursor-split-view.diff b/patches/dev300/calc-cursor-split-view.diff
index 62bab0c..c8b455a 100644
--- a/patches/dev300/calc-cursor-split-view.diff
+++ b/patches/dev300/calc-cursor-split-view.diff
@@ -37,25 +37,27 @@ index e842c7d..180cbc7 100644
          }
      }
  
-@@ -5362,6 +5354,10 @@ void ScGridWindow::UpdateCursorOverlay()
+@@ -5362,7 +5354,10 @@ void ScGridWindow::UpdateCursorOverlay()
  
-             ScOverlayType eType = bOld ? SC_OVERLAY_INVERT : SC_OVERLAY_SOLID;
-             Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+         if(pOverlayManager)
+         {
+-            const Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
++            Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
 +            if (pViewData->GetActivePart() != eWhich)
 +                // non-active pane uses a different color.
 +                aCursorColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
-+
-             sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( eType, aCursorColor, aRanges );
- 
-             pOverlayManager->add(*pOverlay);
-@@ -5513,6 +5509,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
+             std::vector< basegfx::B2DRange > aRanges;
+             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
+             
+@@ -5513,7 +5509,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
  
-             ScOverlayType eType = bOld ? SC_OVERLAY_INVERT : SC_OVERLAY_SOLID;
-             Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+         if(pOverlayManager)
+         {
+-            const Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
++            Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
 +            if (pViewData->GetActivePart() != eWhich)
 +                // non-active pane uses a different color.
 +                aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
-+
-             sdr::overlay::OverlayObjectCell* pOverlay =
-                 new sdr::overlay::OverlayObjectCell( eType, aHandleColor, aRanges );
- 
+             std::vector< basegfx::B2DRange > aRanges;
+             const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
+             basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);