From 04b8bac4a9e8e251ca61c4373beb0f1df76b2d54 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 24 Jan 2012 10:19:42 +0100 Subject: finalize gcc 4.7 string literal operators --- avmedia/source/gstreamer/gstplayer.cxx | 2 +- extensions/source/plugin/base/nfuncs.cxx | 6 +++--- extensions/source/plugin/base/xplugin.cxx | 4 ++-- sal/qa/osl/socket/osl_Socket.cxx | 4 ++-- sal/qa/osl/socket/osl_Socket2.cxx | 4 ++-- sd/source/filter/eppt/pptx-epptbase.cxx | 6 +++--- vcl/test/dndtest.cxx | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index c394b503561f..a8d264211645 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -380,7 +380,7 @@ void SAL_CALL Player::setMediaTime( double fTime ) if( !isPlaying() ) gst_element_set_state( mpPlaybin, GST_STATE_PAUSED ); - DBG( "seek to: %"SAL_PRIdINT64" ns original: %lf s", gst_position, fTime ); + DBG( "seek to: %" SAL_PRIdINT64 " ns original: %lf s", gst_position, fTime ); } } diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 69b73f52df0d..b06665b1175d 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -56,7 +56,7 @@ void TRACE( char const * s ) if (s_file) { oslThreadIdentifier t = osl_getThreadIdentifier(0); - fprintf( s_file, "log [t_id=%"SAL_PRIuUINT32"]: %s\n", t, s ); + fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s\n", t, s ); fflush( s_file ); } } @@ -67,7 +67,7 @@ void TRACEN( char const * s, long n ) if (s_file) { oslThreadIdentifier t = osl_getThreadIdentifier(0); - fprintf( s_file, "log [t_id=%"SAL_PRIuUINT32"]: %s%ld\n", t, s, n ); + fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s%ld\n", t, s, n ); fflush( s_file ); } } @@ -78,7 +78,7 @@ void TRACES( char const* s, char const* s2 ) if (s_file) { oslThreadIdentifier t = osl_getThreadIdentifier(0); - fprintf( s_file, "log [t_id=%"SAL_PRIuUINT32"]: %s %s\n", t, s, s2 ); + fprintf( s_file, "log [t_id=%" SAL_PRIuUINT32 "]: %s %s\n", t, s, s2 ); fflush( s_file ); } } diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 0a9618d79d92..263cb4e3591a 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -751,7 +751,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, fprintf( stderr, "new stream \"%s\" of MIMEType \"%s\"\n" "for plugin \"%s\"\n" - "seekable = %s, length = %"SAL_PRIdINT32"\n", + "seekable = %s, length = %" SAL_PRIdINT32 "\n", aURL.getStr(), aMIME.getStr(), getPluginComm()->getLibName().getStr(), isfile ? "true" : "false", length ); @@ -862,7 +862,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, Guard< Mutex > aGuard( m_aMutex ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "XPlugin_Impl::setPosSize( %"SAL_PRIdINT32", %"SAL_PRIdINT32", %"SAL_PRIdINT32", %"SAL_PRIdINT32", %d )\n", + fprintf( stderr, "XPlugin_Impl::setPosSize( %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ", %d )\n", nX_, nY_, nWidth_, nHeight_, nFlags ); #endif diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 967c1fc14786..1c3b2125e2db 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -2470,7 +2470,7 @@ namespace osl_Socket // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value, // just judge it is zero or not! sal_Bool bOK = ( 0 != *pGetBuffer ); - t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); + t_print("#setOption_001: getOption is %" SAL_PRIdINT32 " \n", *pGetBuffer); // toggle check, set to 0 *pbDontRouteSet = 0; @@ -2482,7 +2482,7 @@ namespace osl_Socket sal_Bool bOK2 = ( 0 == *pGetBuffer ); - t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); + t_print("#setOption_001: getOption is %" SAL_PRIdINT32 " \n", *pGetBuffer); // LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) ); // LLA: *pbDontTouteSet = sal_True; diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 10e1c4b5ecdf..ba2c1d6294fc 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -1107,7 +1107,7 @@ namespace osl_Socket // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value, // just judge it is zero or not! sal_Bool bOK = ( 0 != *pGetBuffer ); - t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); + t_print("#setOption_001: getOption is %" SAL_PRIdINT32 " \n", *pGetBuffer); // toggle check, set to 0 *pbDontRouteSet = 0; @@ -1119,7 +1119,7 @@ namespace osl_Socket sal_Bool bOK2 = ( 0 == *pGetBuffer ); - t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); + t_print("#setOption_001: getOption is %" SAL_PRIdINT32 " \n", *pGetBuffer); // LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) ); // LLA: *pbDontTouteSet = sal_True; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 4f5767b1c577..dc3e22180aba 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -236,7 +236,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert for ( i = 0; i < mnPages; i++ ) { - DBG(printf( "call ImplCreateSlide( %"SAL_PRIuUINT32" )\n", i)); + DBG(printf( "call ImplCreateSlide( %" SAL_PRIuUINT32 " )\n", i)); if ( !CreateSlide( i ) ) return; } @@ -454,7 +454,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True ) aAny >>= nLayout; - DBG(printf("GetLayoutOffset %"SAL_PRIdINT32"\n", nLayout)); + DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout)); return nLayout; } @@ -485,7 +485,7 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE ) return pPHLayout[ nOffset ]; - DBG(printf("asked %"SAL_PRIdINT32" for layout outside of 0,%d array scope\n", nOffset, EPP_LAYOUT_SIZE )); + DBG(printf("asked %" SAL_PRIdINT32 " for layout outside of 0,%d array scope\n", nOffset, EPP_LAYOUT_SIZE )); return pPHLayout[ 0 ]; } diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index 680589f35e8c..20c0f1cb5fe4 100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx @@ -291,7 +291,7 @@ void MyWin::Resize() void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException) { - printf( "XDragGestureListener::dragGestureRecognized called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dge.DragOriginX, dge.DragOriginY ); + printf( "XDragGestureListener::dragGestureRecognized called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dge.DragOriginX, dge.DragOriginY ); Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY ); xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString(RTL_CONSTASCII_USTRINGPARAM("TestString")) ), this ); @@ -302,7 +302,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { - printf( "XDropTargetListener::drop called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); + printf( "XDropTargetListener::drop called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); dtde.Context->dropComplete( sal_True ); } @@ -311,7 +311,7 @@ void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) thr void SAL_CALL MyDragAndDropListener::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException) { - printf( "XDropTargetListener::dragEnter called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dtdee.LocationX, dtdee.LocationY ); + printf( "XDropTargetListener::dragEnter called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dtdee.LocationX, dtdee.LocationY ); dtdee.Context->acceptDrag( dtdee.DropAction ); } @@ -326,7 +326,7 @@ void SAL_CALL MyDragAndDropListener::dragExit( const DropTargetEvent& ) throw(Ru void SAL_CALL MyDragAndDropListener::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException) { - printf( "XDropTargetListener::dragOver called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); + printf( "XDropTargetListener::dragOver called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); dtde.Context->acceptDrag( dtde.DropAction ); } @@ -334,7 +334,7 @@ void SAL_CALL MyDragAndDropListener::dragOver( const DropTargetDragEvent& dtde ) void SAL_CALL MyDragAndDropListener::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException) { - printf( "XDropTargetListener::dropActionChanged called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); + printf( "XDropTargetListener::dropActionChanged called ( Window: %p, %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 " ).\n", m_pWindow, dtde.LocationX, dtde.LocationY ); dtde.Context->acceptDrag( dtde.DropAction ); } -- cgit