[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/calc-general-type-auto-decimal-sc.diff |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 0fbc8e8e4d3c9f14dcd18f5bcae46be863dee18e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Sep 30 17:22:19 2009 +0200

    Fix calc-general-type-auto-decimal-sc.diff to apply
    
    * patches/dev300/calc-general-type-auto-decimal-sc.diff: update to apply with
      dev300-m58

diff --git a/patches/dev300/calc-general-type-auto-decimal-sc.diff b/patches/dev300/calc-general-type-auto-decimal-sc.diff
index 4cea62e..c0a4db1 100644
--- a/patches/dev300/calc-general-type-auto-decimal-sc.diff
+++ b/patches/dev300/calc-general-type-auto-decimal-sc.diff
@@ -62,13 +62,13 @@ diff --git sc/source/ui/view/output2.cxx sc/source/ui/view/output2.cxx
 index 8942a38..5826bb1 100644
 --- sc/source/ui/view/output2.cxx
 +++ sc/source/ui/view/output2.cxx
-@@ -454,12 +454,20 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
+@@ -451,12 +451,23 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
  
              Color* pColor;
              ULONG nFormat = GetValueFormat();
 -            ScCellFormat::GetString( pCell,
 -                                     nFormat, aString, &pColor,
--                                     *pFormatter,
+-                                     *pOutput->pDoc->GetFormatTable(),
 -                                     pOutput->bShowNullValues,
 -                                     pOutput->bShowFormulas,
 -                                     ftCheck );
@@ -78,11 +78,14 @@ index 8942a38..5826bb1 100644
 +                // is displayed in the edit window, which automatically
 +                // adjusts the number of decimal places based on the value of
 +                // the cell.
-+                ScCellFormat::GetInputString(pCell, nFormat, aString, *pFormatter, &pColor);
++                ScCellFormat::GetInputString( pCell,
++                                              nFormat, aString,
++                                              *pOutput->pDoc->GetFormatTable(),
++                                              &pColor );
 +            else
 +                ScCellFormat::GetString( pCell,
 +                                         nFormat, aString, &pColor,
-+                                         *pFormatter,
++                                         *pOutput->pDoc->GetFormatTable(),
 +                                         pOutput->bShowNullValues,
 +                                         pOutput->bShowFormulas,
 +                                         ftCheck );