summaryrefslogtreecommitdiff
path: root/svl/source
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-05 21:31:06 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-05 22:12:31 +0100
commit3f78f26aa8db1d3ae56d9e509e0a8e5b4518821b (patch)
tree7576b0bf7738fbb0cc0de191993907a1b571107e /svl/source
parentc5bf9b10b9060b750d3651e9c0022ad0261612f8 (diff)
String to OUString in cell.[ch]xx and follow up
Diffstat (limited to 'svl/source')
-rw-r--r--svl/source/numbers/zforlist.cxx43
1 files changed, 43 insertions, 0 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index c454843ff018..475551e4965b 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1568,6 +1568,49 @@ void SvNumberFormatter::GetOutputString(String& sString,
}
}
+void SvNumberFormatter::GetOutputString(const double& fOutNumber,
+ sal_uInt32 nFIndex,
+ rtl::OUString& sOutString,
+ Color** ppColor)
+{
+ if (bNoZero && fOutNumber == 0.0)
+ {
+ sOutString = rtl::OUString();
+ return;
+ }
+ SvNumberformat* pFormat = GetFormatEntry( nFIndex );
+ if (!pFormat)
+ pFormat = GetFormatEntry(ZF_STANDARD);
+ ChangeIntl(pFormat->GetLanguage());
+ String aOutString;
+ pFormat->GetOutputString(fOutNumber, aOutString, ppColor);
+ sOutString = aOutString;
+}
+
+void SvNumberFormatter::GetOutputString(rtl::OUString& sString,
+ sal_uInt32 nFIndex,
+ rtl::OUString& sOutString,
+ Color** ppColor)
+{
+ SvNumberformat* pFormat = GetFormatEntry( nFIndex );
+ if (!pFormat)
+ pFormat = GetFormatEntry(ZF_STANDARD_TEXT);
+ if (!pFormat->IsTextFormat() && !pFormat->HasTextFormat())
+ {
+ *ppColor = NULL;
+ sOutString = sString;
+ }
+ else
+ {
+ ChangeIntl(pFormat->GetLanguage());
+ String aString = sString;
+ String aOutString = sOutString;
+ pFormat->GetOutputString(aString, aOutString, ppColor);
+ sString = aString;
+ sOutString = aOutString;
+ }
+}
+
bool SvNumberFormatter::GetPreviewString(const String& sFormatString,
double fPreviewNumber,
String& sOutString,