diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 15:03:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:36 +0000 |
| commit | dcbf9a087eb479268dd77f63149df6e1c936cb75 (patch) | |
| tree | 80e81ab33a0e6c34261c19a91744dd1c6b52780b /desktop | |
| parent | bdd63457a3baa38086ba67544d3c6772978e721b (diff) | |
avoid implicit cast
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 916316af4e9e..eaf9751a3aff 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -405,8 +405,7 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap) aStrBuf.append( "intro_" ); if ( _sAppName.getLength() > 0 ) { - aStrBuf.append( OString( _sAppName, _sAppName.getLength(), - RTL_TEXTENCODING_UTF8 ) ); + aStrBuf.append( OUStringToOString(_sAppName, RTL_TEXTENCODING_UTF8) ); aStrBuf.append( "_" ); } aResBuf.append( OString::valueOf( nWidth )); @@ -414,12 +413,12 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap) aResBuf.append( OString::valueOf( nHeight )); aStrBuf.append( aResBuf.getStr() ); - if (Application::LoadBrandBitmap (aStrBuf.makeStringAndClear(), rBitmap)) + if (Application::LoadBrandBitmap (aStrBuf.makeStringAndClear().getStr(), rBitmap)) return; aStrBuf.append( "intro_" ); aStrBuf.append( aResBuf.getStr() ); - if (Application::LoadBrandBitmap (aResBuf.makeStringAndClear(), rBitmap)) + if (Application::LoadBrandBitmap (aResBuf.makeStringAndClear().getStr(), rBitmap)) return; Application::LoadBrandBitmap ("intro", rBitmap); |