summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-11-18 18:55:49 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-11-18 19:57:23 -0600
commit271b11a3d56ba0c5f542a142ab859a0819530dba (patch)
treed8719dd652134f89ea980b1a42d3a59a8db949b6 /svx
parentcc63555fd02217e3b68caccfa5c8a0171aca149c (diff)
migrate one GetOutputString variatn to OUString
that create some clutter on some of the caller, this will be resolved as things progress to ward OUString only This is done that way to be incremental and avoid creating too big patches Change-Id: I4a881d85cc2ee1eb53bc0c0d0902838b1d3720a2
Diffstat (limited to 'svx')
-rw-r--r--svx/source/items/numfmtsh.cxx22
1 files changed, 19 insertions, 3 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index c2495313b2bb..5e12eb8ace56 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -449,11 +449,19 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) );
if ( bUseText )
- pFormatter->GetOutputString( aValStr, nExistingFormat,
- rPreviewStr, &rpFontColor );
+ {
+ OUString sTempIn(aValStr);
+ OUString sTempOut(rPreviewStr);
+ pFormatter->GetOutputString( sTempIn, nExistingFormat,
+ sTempOut, &rpFontColor );
+ aValStr = sTempIn;
+ rPreviewStr = sTempOut;
+ }
else
+ {
pFormatter->GetOutputString( nValNum, nExistingFormat,
rPreviewStr, &rpFontColor, bUseStarFormat );
+ }
}
}
@@ -1150,9 +1158,17 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol
( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) );
if ( bUseText )
- pFormatter->GetOutputString( aValStr, nCurFormatKey, rString, &rpColor );
+ {
+ OUString sTempIn(aValStr);
+ OUString sTempOut(rString);
+ pFormatter->GetOutputString( sTempIn, nCurFormatKey, sTempOut, &rpColor );
+ aValStr = sTempIn;
+ rString = sTempOut;
+ }
else
+ {
pFormatter->GetOutputString( nValNum, nCurFormatKey, rString, &rpColor, bUseStarFormat );
+ }
}
// -----------------------------------------------------------------------