[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/ui/docshell/docsh.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 007b317fef91aa809deff8380a9e62c350eaf511
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Fri Mar 25 20:26:52 2016 +0100

    use the ScRefCellValue already available, tdf#97989
    
    Change-Id: Iccfff23f72d33ee012f91a230f2598b8fe3131cf
    Reviewed-on: https://gerrit.libreoffice.org/23514
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 10d0540..c6b372c 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1968,7 +1968,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const 
ScImportOptions& rAsciiOpt
                         if ( bFixedWidth || bSaveAsShown )
                         {
                             Color* pDummy;
-                            aString = ScCellFormat::GetString(aDocument, aPos, 
nFormat, &pDummy, rFormatter);
+                            ScCellFormat::GetString(*pCell, nFormat, aString, 
&pDummy, rFormatter, &aDocument);
                             bString = bSaveAsShown && rFormatter.IsTextFormat( 
nFormat);
                         }
                         else
@@ -1983,7 +1983,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const 
ScImportOptions& rAsciiOpt
                         {
                             sal_uInt32 nFormat = 
aDocument.GetNumberFormat(aPos);
                             Color* pDummy;
-                            aString = ScCellFormat::GetString(aDocument, aPos, 
nFormat, &pDummy, rFormatter);
+                            ScCellFormat::GetString(*pCell, nFormat, aString, 
&pDummy, rFormatter, &aDocument);
                         }
                         else
                             aString = 
pCell->mpFormula->GetString().getString();
@@ -1996,7 +1996,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const 
ScImportOptions& rAsciiOpt
                 {
                     sal_uInt32 nFormat = aDocument.GetNumberFormat(aPos);
                     Color* pDummy;
-                    aString = ScCellFormat::GetString(aDocument, aPos, 
nFormat, &pDummy, rFormatter);
+                    ScCellFormat::GetString(*pCell, nFormat, aString, &pDummy, 
rFormatter, &aDocument);
                 }
                 else
                     aString = pCell->mpString->getString();
@@ -2018,7 +2018,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const 
ScImportOptions& rAsciiOpt
                     if ( bFixedWidth || bSaveAsShown )
                     {
                         Color* pDummy;
-                        aString = ScCellFormat::GetString(aDocument, aPos, 
nFormat, &pDummy, rFormatter);
+                        ScCellFormat::GetString(*pCell, nFormat, aString, 
&pDummy, rFormatter, &aDocument);
                         bString = bSaveAsShown && rFormatter.IsTextFormat( 
nFormat);
                     }
                     else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits