diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-06 23:34:23 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-07 02:14:53 -0600 |
| commit | 27239ad23006b1fd1ddb21467f4c1fd637b560d5 (patch) | |
| tree | 605b30a50f25ef7e8f0d6511d6df24790ece90b9 /sc | |
| parent | f510217832a6edaf6a44169cabdf739985d00125 (diff) | |
basic: String -> OUString
Change-Id: I42479b4bade5111e38d69f04c889c166f340d5ba
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaapplication.cxx | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 3dd661bc6848..fc519c7c6e84 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3408,7 +3408,9 @@ void ScInterpreter::ScMacro() pMat->PutDouble( pV->GetDouble(), i, j ); } else - pMat->PutString( pV->GetString(), i, j ); + { + pMat->PutString( pV->GetOUString(), i, j ); + } } } PushMatrix( pMat ); @@ -3424,7 +3426,9 @@ void ScInterpreter::ScMacro() } } else - PushString( refRes->GetString() ); + { + PushString( refRes->GetOUString() ); + } } if (bVolatileMacro && meVolatileType == NOT_VOLATILE) diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index edb088a907db..d8b6a17be27d 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1296,7 +1296,7 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep SbxVariableRef refTemp = pMeth; // forces a broadcast SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth)); - OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); aRet = sbxToUnoValue( pNew ); } return aRet; |