Kaydet (Commit) 6c2d66e5 authored tarafından Michael Meeks's avatar Michael Meeks

remove const sal_Char * casts of rtl::OUStringToOString results, fixes ucb

üst 9891d072
...@@ -634,7 +634,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) ...@@ -634,7 +634,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
catch (const uno::Exception &e) catch (const uno::Exception &e)
{ {
fprintf( stderr, "Exception '%s' thrown\n" , fprintf( stderr, "Exception '%s' thrown\n" ,
(const sal_Char *) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ) ); ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
......
...@@ -230,8 +230,8 @@ OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; ...@@ -230,8 +230,8 @@ OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0;
String CreateMD5FromString( const OUString& aMsg ) String CreateMD5FromString( const OUString& aMsg )
{ {
#if (OSL_DEBUG_LEVEL > 2) #if (OSL_DEBUG_LEVEL > 2)
fprintf (stderr, "create md5 from '%s'\n", fprintf( stderr, "create md5 from '%s'\n",
(const sal_Char *)rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8)); rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() );
#endif #endif
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
......
...@@ -130,7 +130,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: ...@@ -130,7 +130,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
m_pOutFd = fdopen( fd, "w" ); m_pOutFd = fdopen( fd, "w" );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n", fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n",
fd, (const sal_Char *)rtl::OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ), fd, rtl::OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ).getStr(),
m_pOutFd ); m_pOutFd );
#endif #endif
} }
......
...@@ -370,8 +370,7 @@ void ChildWindow::init() ...@@ -370,8 +370,7 @@ void ChildWindow::init()
catch (const uno::Exception &e) catch (const uno::Exception &e)
{ {
OSL_TRACE( "Exception '%s' thrown\n" , OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message, ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
RTL_TEXTENCODING_UTF8 ));
} }
} }
...@@ -385,8 +384,8 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ ) ...@@ -385,8 +384,8 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ )
catch (const uno::Exception &e) catch (const uno::Exception &e)
{ {
OSL_TRACE( "Exception '%s' thrown\n" , OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message, ::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 )); RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
...@@ -478,8 +477,8 @@ void DemoWindow::init() ...@@ -478,8 +477,8 @@ void DemoWindow::init()
catch (const uno::Exception &e) catch (const uno::Exception &e)
{ {
OSL_TRACE( "Exception '%s' thrown\n" , OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message, ::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 )); RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
......
...@@ -175,7 +175,7 @@ static void createTheme( rtl::OUString aThemeName, ...@@ -175,7 +175,7 @@ static void createTheme( rtl::OUString aThemeName,
if( aGraphic.GetType() == GRAPHIC_NONE ) if( aGraphic.GetType() == GRAPHIC_NONE )
{ {
fprintf( stderr, "Failed to load '%s'\n", fprintf( stderr, "Failed to load '%s'\n",
(const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) ); rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ).getStr() );
continue; continue;
} }
......
...@@ -113,8 +113,8 @@ ContentProvider::queryContent( ...@@ -113,8 +113,8 @@ ContentProvider::queryContent(
{ {
#ifdef DEBUG #ifdef DEBUG
g_warning ("QueryContent: '%s'", g_warning ("QueryContent: '%s'",
(const sal_Char *)rtl::OUStringToOString rtl::OUStringToOString (Identifier->getContentIdentifier(),
(Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr() ); RTL_TEXTENCODING_UTF8).getStr() );
#endif #endif
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
......
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