diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-03-25 20:26:52 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-05-02 17:56:23 +0200 |
| commit | 3dae33bd19062c2328464f6d48a9ee0869679b58 (patch) | |
| tree | 1c5a4aa802ebd0f46387c64391cbfc4a62900857 | |
| parent | afd2095bd2acd201ff125959b41550f39303cee5 (diff) | |
use the ScRefCellValue already available, tdf#97989
Change-Id: Iccfff23f72d33ee012f91a230f2598b8fe3131cf
Reviewed-on: https://gerrit.libreoffice.org/23514
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 007b317fef91aa809deff8380a9e62c350eaf511)
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index d0c083625465..57667ff7c8fc 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1964,7 +1964,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 @@ -1979,7 +1979,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(); @@ -1992,7 +1992,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(); @@ -2014,7 +2014,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 |