diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-06 18:11:43 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-07 03:46:21 +0100 |
| commit | cc59e69c6f2c95a4434623dfea9ab666de6ebe76 (patch) | |
| tree | af2d28a7c336db5583c4d6a54e120c6608939305 /sc/source/ui/view/output2.cxx | |
| parent | 128947050b4506bf1fd57d93fe249c476a184f61 (diff) | |
String->OUString in ScDocument and follow up
Diffstat (limited to 'sc/source/ui/view/output2.cxx')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index b0dba17f4507..1b732e72fbb7 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -495,12 +495,14 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell ) Color* pColor; sal_uLong nFormat = GetValueFormat(); + rtl::OUString aOUString = aString; ScCellFormat::GetString( pCell, - nFormat, aString, &pColor, + nFormat, aOUString, &pColor, *pOutput->pDoc->GetFormatTable(), pOutput->bShowNullValues, pOutput->bShowFormulas, ftCheck ); + aString = aOUString; if (aString.Len() > DRAWTEXT_MAX) aString.Erase(DRAWTEXT_MAX); @@ -2167,7 +2169,7 @@ bool ScOutputData::DrawEditParam::readCellContent( { sal_uLong nFormat = mpPattern->GetNumberFormat( pDoc->GetFormatTable(), mpCondSet ); - String aString; + rtl::OUString aString; Color* pColor; ScCellFormat::GetString( mpCell, nFormat,aString, &pColor, @@ -4904,7 +4906,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) { sal_uLong nFormat = pPattern->GetNumberFormat( pDoc->GetFormatTable(), pCondSet ); - String aString; + rtl::OUString aString; Color* pColor; ScCellFormat::GetString( pCell, nFormat,aString, &pColor, |