[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-find-replace-empty-cells-sc.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a9ce43cb0ecac238389386c6fda2b137d1249c1f
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 18 23:24:13 2009 -0400

    Fixed wrong placement of closing paren which caused unintended behavior.
    
    * patches/dev300/calc-find-replace-empty-cells-sc.diff: wrong placement
      of the closing parenthesis caused incorrect search start position
      during search for empty cells.

diff --git a/patches/dev300/calc-find-replace-empty-cells-sc.diff b/patches/dev300/calc-find-replace-empty-cells-sc.diff
index 4d20135..549fa56 100644
--- a/patches/dev300/calc-find-replace-empty-cells-sc.diff
+++ b/patches/dev300/calc-find-replace-empty-cells-sc.diff
@@ -188,7 +188,7 @@
 +                SCCOL nBeginCol = rRange.aEnd.Col();
 +                if (nRow == rRow && nBeginCol >= rCol)
 +                    // always start from one cell before the cursor.
-+                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
++                    nBeginCol = rCol - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
 +
 +                for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
 +                {
@@ -218,7 +218,7 @@
 +                SCROW nBeginRow = rRange.aEnd.Row();
 +                if (nCol == rCol && nBeginRow >= rRow)
 +                    // always start from one cell before the cursor.
-+                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
++                    nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
 +                for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
 +                {   
 +                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
@@ -251,7 +251,7 @@
 +                SCCOL nBeginCol = rRange.aStart.Col();
 +                if (nRow == rRow && nBeginCol <= rCol)
 +                    // always start from one cell past the cursor.
-+                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
++                    nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
 +                for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
 +                {
 +                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
@@ -280,7 +280,7 @@
 +                SCROW nBeginRow = rRange.aStart.Row();
 +                if (nCol == rCol && nBeginRow <= rRow)
 +                    // always start from one cell past the cursor.
-+                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND) ? 1 : 0;
++                    nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
 +                for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
 +                {   
 +                    ScBaseCell* pCell = aCol[nCol].GetCell(nRow);