strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Michael Meeks 2011-10-05 14:00:00 +01:00
parent 9891d0722f
commit 6c2d66e525
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canvas/workben/canvasdemo.cxx
View file

@ -634,7 +634,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
catch (const uno::Exception &e)
{
fprintf( stderr, "Exception '%s' thrown\n" ,
(const sal_Char *) ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ) );
::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}

4
desktop/source/app/officeipcthread.cxx
View file

@ -230,8 +230,8 @@ OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0;
String CreateMD5FromString( const OUString& aMsg )
{
#if (OSL_DEBUG_LEVEL > 2)
fprintf (stderr, "create md5 from '%s'\n",
(const sal_Char *)rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8));
fprintf( stderr, "create md5 from '%s'\n",
rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() );
#endif
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );

2
desktop/unx/splash/unxsplash.cxx
View file

@ -130,7 +130,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
m_pOutFd = fdopen( fd, "w" );
#if OSL_DEBUG_LEVEL > 1
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 );
#endif
}

11
slideshow/test/demoshow.cxx
View file

@ -370,8 +370,7 @@ void ChildWindow::init()
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ));
::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@ -385,8 +384,8 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ )
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ));
::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@ -478,8 +477,8 @@ void DemoWindow::init()
catch (const uno::Exception &e)
{
OSL_TRACE( "Exception '%s' thrown\n" ,
(const sal_Char*)::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ));
::rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
}

2
svx/source/gengal/gengal.cxx
View file

@ -175,7 +175,7 @@ static void createTheme( rtl::OUString aThemeName,
if( aGraphic.GetType() == GRAPHIC_NONE )
{
fprintf( stderr, "Failed to load '%s'\n",
(const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) );
rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ).getStr() );
continue;
}

4
ucb/source/ucp/gvfs/gvfs_provider.cxx
View file

@ -113,8 +113,8 @@ ContentProvider::queryContent(
{
#ifdef DEBUG
g_warning ("QueryContent: '%s'",
(const sal_Char *)rtl::OUStringToOString
(Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr() );
rtl::OUStringToOString (Identifier->getContentIdentifier(),
RTL_TEXTENCODING_UTF8).getStr() );
#endif
osl::MutexGuard aGuard( m_aMutex );