From 3dae33bd19062c2328464f6d48a9ee0869679b58 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 25 Mar 2016 20:26:52 +0100 Subject: use the ScRefCellValue already available, tdf#97989 Change-Id: Iccfff23f72d33ee012f91a230f2598b8fe3131cf Reviewed-on: https://gerrit.libreoffice.org/23514 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 007b317fef91aa809deff8380a9e62c350eaf511) --- sc/source/ui/docshell/docsh.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sc') 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 -- cgit