summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-25 20:26:52 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-25 20:02:50 +0000
commit007b317fef91aa809deff8380a9e62c350eaf511 (patch)
tree3a2cd39f07c56463d68bc2fab371f057cdaea9bc
parentb8e595263841ff719bd38128507fdb5ae238f173 (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>
-rw-r--r--sc/source/ui/docshell/docsh.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 10d054008d2f..c6b372ce64d1 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