diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-01-04 15:28:42 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-01-04 15:29:55 +0200 |
commit | 8be957adae2db23a385edbb75ebdad1d1ae631dd (patch) | |
tree | 09cc2964b899db1eb68fff481cb41c6b14c4bf5c /vcl | |
parent | 9236a99ad4640cd568abe9040ac37e398c60061f (diff) |
Get rid of silly stderr0 macro
Change-Id: Ibc51fb4cc72163fb643a85ad3f0b6061b7d77ccc
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/unx/salgdi.h | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 6 |
3 files changed, 7 insertions, 13 deletions
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 59a5dc43bd59..690a66679694 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -351,12 +351,6 @@ inline Display *X11SalGraphics::GetXDisplay() const inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const { return GetColormap().GetPixel( nSalColor ); } -#ifdef DBG_UTIL -#define stderr0( s ) fprintf( stderr, s ) -#else -#define stderr0( s ) ; -#endif - #endif // INCLUDED_VCL_INC_UNX_SALGDI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 645db2ce2a72..be649906bb89 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -603,7 +603,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, if( !xDDB ) { - stderr0( "SalGraphics::CopyBits !pSrcGraphics->GetBitmap()\n" ); + SAL_WARN( "vcl", "SalGraphics::CopyBits !pSrcGraphics->GetBitmap()" ); return; } @@ -613,7 +613,7 @@ void X11SalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, drawBitmap( aPosAry, *xDDB ); } else { - stderr0( "X11SalGraphicsImpl::CopyBits from Printer not yet implemented\n" ); + SAL_WARN( "vcl", "X11SalGraphicsImpl::CopyBits from Printer not yet implemented" ); } } @@ -1667,7 +1667,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY ) XGetWindowAttributes( mrParent.GetXDisplay(), mrParent.GetDrawable(), &aAttrib ); if( aAttrib.map_state != IsViewable ) { - stderr0( "X11SalGraphics::GetPixel drawable not viewable\n" ); + SAL_WARN( "vcl", "X11SalGraphics::GetPixel drawable not viewable" ); return 0; } } @@ -1680,7 +1680,7 @@ SalColor X11SalGraphicsImpl::getPixel( long nX, long nY ) ZPixmap ); if( !pXImage ) { - stderr0( "X11SalGraphics::GetPixel !XGetImage()\n" ); + SAL_WARN( "vcl", "X11SalGraphics::GetPixel !XGetImage()" ); return 0; } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 783bd3186143..d7eb98dce954 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1996,7 +1996,7 @@ void X11SalFrame::Minimize() if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ ) { - stderr0( "X11SalFrame::Minimize on withdrawn window\n" ); + SAL_WARN( "vcl", "X11SalFrame::Minimize on withdrawn window" ); return; } @@ -2028,7 +2028,7 @@ void X11SalFrame::Restore() if( SHOWSTATE_UNKNOWN == nShowState_ || SHOWSTATE_HIDDEN == nShowState_ ) { - stderr0( "X11SalFrame::Restore on withdrawn window\n" ); + SAL_WARN( "vcl", "X11SalFrame::Restore on withdrawn window" ); return; } @@ -3802,7 +3802,7 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent ) #endif else if( pEvent->message_type == rWMAdaptor.getAtom( WMAdaptor::SAL_QUITEVENT ) ) { - stderr0( "X11SalFrame::Dispatch Quit\n" ); + SAL_WARN( "vcl", "X11SalFrame::Dispatch Quit" ); Close(); // ??? return 1; } |