[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-selection-fixed-cursor.diff |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ece2a0d7ec94331a762ee8af7c1baaddd6cf498d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jun 16 13:13:14 2009 -0400

    Fixed another regression related to new range selection.
    
    Selecting a range during formula input mode didn't initiate
    reference mode when selection a range that included the formula
    cell. (n#512060)
    
    * patches/dev300/calc-selection-fixed-cursor.diff:

diff --git a/patches/dev300/calc-selection-fixed-cursor.diff b/patches/dev300/calc-selection-fixed-cursor.diff
index 4021847..522f7a4 100644
--- a/patches/dev300/calc-selection-fixed-cursor.diff
+++ b/patches/dev300/calc-selection-fixed-cursor.diff
@@ -333,7 +333,7 @@ index bd9515c..bd744e4 100644
  void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
  {
      //	Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
-@@ -414,6 +408,290 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+@@ -414,6 +408,296 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
          aHdrFunc.SetAnchorFlag( FALSE );
  }
  
@@ -524,6 +524,12 @@ index bd9515c..bd744e4 100644
 +        // Nothing to do.  Bail out.
 +        return;
 +
++    ScTabViewShell* pViewShell = aViewData.GetViewShell();
++    bool bRefInputMode = pViewShell && pViewShell->IsRefInputMode();
++    if (bRefInputMode && !aViewData.IsRefMode())
++        // initialize formula reference mode if it hasn't already.
++        InitRefMode(aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), SC_REFTYPE_REF);
++
 +    ScDocument* pDoc = aViewData.GetDocument();
 +
 +    if (aViewData.IsRefMode())