Skip to content

C
core
Kaydet (Commit) eb8e39f2 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

make svx ByteString free

üst 210d239b
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 14 deletions
svx/source/gallery2/gallery1.cxx
Dosyayı görüntüle @ eb8e39f2
...@@ -573,25 +573,42 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const ...@@ -573,25 +573,42 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
// try fallback, if no entry was found // try fallback, if no entry was found
if( !pFound ) if( !pFound )
{ {
ByteString aFallback; rtl::OString aFallback;
switch( nThemeId ) switch( nThemeId )
{ {
case( GALLERY_THEME_3D ): aFallback = "3D"; break; case( GALLERY_THEME_3D ):
case( GALLERY_THEME_BULLETS ): aFallback = "Bullets"; break; aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("3D"));
case( GALLERY_THEME_HOMEPAGE ): aFallback = "Homepage"; break; break;
case( GALLERY_THEME_HTMLBUTTONS ): aFallback = "private://gallery/hidden/HtmlExportButtons"; break; case( GALLERY_THEME_BULLETS ):
case( GALLERY_THEME_POWERPOINT ): aFallback = "private://gallery/hidden/imgppt"; break; aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("Bullets"));
case( GALLERY_THEME_FONTWORK ): aFallback = "private://gallery/hidden/fontwork"; break; break;
case( GALLERY_THEME_FONTWORK_VERTICAL ): aFallback = "private://gallery/hidden/fontworkvertical"; break; case( GALLERY_THEME_HOMEPAGE ):
case( GALLERY_THEME_RULERS ): aFallback = "Rulers"; break; aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("Homepage"));
case( GALLERY_THEME_SOUNDS ): aFallback = "Sounds"; break; break;
case( GALLERY_THEME_HTMLBUTTONS ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/HtmlExportButtons"));
break;
case( GALLERY_THEME_POWERPOINT ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/imgppt"));
break;
case( GALLERY_THEME_FONTWORK ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/fontwork"));
break;
case( GALLERY_THEME_FONTWORK_VERTICAL ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/fontworkvertical"));
break;
case( GALLERY_THEME_RULERS ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("Rulers"));
break;
case( GALLERY_THEME_SOUNDS ):
aFallback = rtl::OString(RTL_CONSTASCII_STRINGPARAM("Sounds"));
break;
default: default:
break; break;
} }
pFound = ( (Gallery*) this )->ImplGetThemeEntry( String::CreateFromAscii( aFallback.GetBuffer() ) ); pFound = const_cast<Gallery*>(this)->ImplGetThemeEntry(rtl::OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US));
} }
return( pFound ? pFound->GetThemeName() : rtl::OUString() ); return( pFound ? pFound->GetThemeName() : rtl::OUString() );
......
svx/source/inc/trace.hxx
Dosyayı görüntüle @ eb8e39f2
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
class Tracer class Tracer
{ {
ByteString m_sBlockDescription; rtl::OString m_sBlockDescription;
DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int ); DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
static MapThreadId2Int s_aThreadIndents; static MapThreadId2Int s_aThreadIndents;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment