include/vcl/salbtype.hxx | 1
vcl/generic/app/geninst.cxx | 1
vcl/generic/fontmanager/fontmanager.cxx | 4 -
vcl/generic/fontmanager/parseAFM.cxx | 1
vcl/generic/glyphs/glyphcache.cxx | 1
vcl/headless/svpgdi.cxx | 10 +---
vcl/headless/svpvd.cxx | 2
vcl/osx/DataFlavorMapping.cxx | 1
vcl/osx/DropTarget.cxx | 1
vcl/source/app/svdata.cxx | 4 -
vcl/source/filter/graphicfilter2.cxx | 1
vcl/unx/generic/app/saltimer.cxx | 1
vcl/unx/generic/dtrans/X11_clipboard.cxx | 2
vcl/unx/generic/dtrans/X11_transferable.cxx | 10 ----
vcl/unx/generic/gdi/xrender_peer.cxx | 2
vcl/unx/gtk/a11y/atkaction.cxx | 2
vcl/unx/gtk/a11y/atkbridge.cxx | 1
vcl/unx/gtk/a11y/atkeditabletext.cxx | 1
vcl/unx/gtk/a11y/atkhypertext.cxx | 2
vcl/unx/gtk/a11y/atkimage.cxx | 2
vcl/unx/gtk/a11y/atkselection.cxx | 2
vcl/unx/gtk/a11y/atktable.cxx | 68 ++++++++++------------------
vcl/unx/gtk/a11y/atkvalue.cxx | 1
vcl/unx/kde/kdedata.cxx | 1
vcl/unx/kde4/KDESalFrame.cxx | 4 -
vcl/unx/kde4/KDEXLib.cxx | 2
vcl/unx/kde4/main.cxx | 4 -
vcl/win/source/gdi/salgdi_gdiplus.cxx | 1
vcl/workben/svpclient.cxx | 5 --
29 files changed, 35 insertions(+), 103 deletions(-)
New commits:
commit c2690669d29c0679b7de8eec1e91a0fd17cea054
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat May 23 18:58:41 2015 +0200
Remove include stdio (part6)
Change-Id: I4dde46c81b36b318710e32c8f420dff8d9c2e655
Reviewed-on: https://gerrit.libreoffice.org/15879
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 6d8e7e6..c145d88 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_VCL_SALBTYPE_HXX
#define INCLUDED_VCL_SALBTYPE_HXX
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <tools/debug.hxx>
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 327d880..eeb2a57 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -18,7 +18,6 @@
*/
#include <string.h>
-#include <stdio.h>
#include <stdlib.h>
#include <osl/module.hxx>
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index d478256..b90abdc 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1340,10 +1340,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont*
pFont ) const
CloseTTFont( pTTFont );
bSuccess = true;
}
-#if OSL_DEBUG_LEVEL > 1
else
- fprintf( stderr, "could not OpenTTFont \"%s\"\n", aFile.getStr() );
-#endif
+ SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile.getStr() << "\"\n");
return bSuccess;
}
diff --git a/vcl/generic/fontmanager/parseAFM.cxx
b/vcl/generic/fontmanager/parseAFM.cxx
index 91c7a89..b8b8225 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -72,7 +72,6 @@
* - changed (width == 250) to (width = 250) in initializeArray
*/
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/vcl/generic/glyphs/glyphcache.cxx
b/vcl/generic/glyphs/glyphcache.cxx
index cf75255..50042c2 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <gcach_ftyp.hxx>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index a41626f..6abd6e4 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -39,8 +39,6 @@
#include <sys/stat.h>
#endif
-#include <stdio.h>
-
inline void dbgOut( const basebmp::BitmapDeviceSharedPtr&
#if OSL_DEBUG_LEVEL > 2
rDevice
@@ -233,7 +231,7 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox
&aRange, SvpSalGraphi
if( nHit == 0 ) // rendering outside any clipping region
{
-// fprintf (stderr, "denegerate case detected ...\n");
+ SAL_WARN("vcl.headless", "SvpSalGraphics::isClippedSetup: denegerate
case detected ...\n");
return true;
}
else if( nHit == 1 ) // common path: rendering against just one clipping
region
@@ -242,10 +240,10 @@ bool SvpSalGraphics::isClippedSetup( const
basegfx::B2IBox &aRange, SvpSalGraphi
{
//The region to be painted (aRect) is equal to or inside the
//current clipping region
-// fprintf (stderr, " is inside ! avoid deeper clip ...\n");
+ SAL_WARN("vcl.headless", "SvpSalGraphics::isClippedSetup: is
inside ! avoid deeper clip ...\n");
return false;
}
-// fprintf (stderr, " operation only overlaps with a single clip zone\n" );
+ SAL_WARN("vcl.headless", "SvpSalGraphics::isClippedSetup: operation
only overlaps with a single clip zone\n");
rUndo.m_aDevice = m_aDevice;
m_aDevice = basebmp::subsetBitmapDevice( m_aOrigDevice,
basegfx::B2IBox
(aHitRect.Left(),
@@ -254,7 +252,7 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox
&aRange, SvpSalGraphi
aHitRect.Bottom() + 1) );
return false;
}
-// fprintf (stderr, "URK: complex & slow clipping case\n" );
+ SAL_INFO("vcl.headless", "SvpSalGraphics::isClippedSetup: URK: complex &
slow clipping case\n");
// horribly slow & complicated case ...
ensureClip();
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index f720d18..1dfa8c0 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -29,8 +29,6 @@
#include <basegfx/vector/b2ivector.hxx>
#include <basebmp/scanlineformats.hxx>
-#include "stdio.h"
-
using namespace basegfx;
using namespace basebmp;
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 6d25ce6..374ac54 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -32,7 +32,6 @@
#include <osl/endian.h>
#include <cassert>
-#include <stdio.h>
#include <string.h>
#include <premac.h>
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 2b90bd5..8e12d97 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -27,7 +27,6 @@
#include "DragActionConversion.hxx"
#include "DragSource.hxx"
#include <rtl/ustring.h>
-#include <stdio.h>
#include <premac.h>
#include <Carbon/Carbon.h>
#include <postmac.h>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 14cf94d..8b1a2a6 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -56,8 +56,6 @@
#include "vcl/opengl/OpenGLContext.hxx"
-#include <stdio.h>
-
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
@@ -171,7 +169,7 @@ ResMgr* ImplGetResMgr()
const char* pMsg =
"Missing vcl resource. This indicates that files vital to
localization are missing. "
"You might have a corrupt installation.";
- fprintf( stderr, "%s\n", pMsg );
+ SAL_WARN("vcl", "" << pMsg << "\n");
ScopedVclPtrInstance< MessageDialog > aBox( nullptr,
OUString(pMsg, strlen(pMsg), RTL_TEXTENCODING_ASCII_US) );
aBox->Execute();
}
diff --git a/vcl/source/filter/graphicfilter2.cxx
b/vcl/source/filter/graphicfilter2.cxx
index 21d584d..d3ab1a7 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -18,7 +18,6 @@
*/
#include <string.h>
-#include <stdio.h>
#include <tools/stream.hxx>
#include <tools/fract.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx
index 44f3853..1de121f 100644
--- a/vcl/unx/generic/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdio.h>
#include <sys/time.h>
#include <sys/times.h>
#include <time.h>
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx
b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 95d44a5..f947345 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -81,7 +81,7 @@ X11Clipboard::~X11Clipboard()
MutexGuard aGuard( *Mutex::getGlobalMutex() );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "shutting down instance of X11Clipboard (this=%p,
Selecttion=\"%s\")\n", this, OUStringToOString( m_rSelectionManager.getString(
m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+ fprintf( stderr, "shutting down instance of X11Clipboard (this=%p,
Selection=\"%s\")\n", this, OUStringToOString( m_rSelectionManager.getString(
m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
#endif
if( m_aSelection != None )
m_rSelectionManager.deregisterHandler( m_aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx
b/vcl/unx/generic/dtrans/X11_transferable.cxx
index e2f427c..092165a 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
#include <X11_transferable.hxx>
#include <X11/Xatom.h>
#include <com/sun/star/io/IOException.hpp>
@@ -66,11 +62,7 @@ Any SAL_CALL X11Transferable::getTransferData( const
DataFlavor& rFlavor )
if( reinterpret_cast<sal_Unicode const
*>(aData.getConstArray())[nLen-1] == 0 )
nLen--;
OUString aString( reinterpret_cast<sal_Unicode const
*>(aData.getConstArray()), nLen );
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "X11Transferable::getTransferData( \"%s\" )\n ->
\"%s\"\n",
- OUStringToOString( rFlavor.MimeType, RTL_TEXTENCODING_ISO_8859_1
).getStr(),
- OUStringToOString( aString, RTL_TEXTENCODING_ISO_8859_1
).getStr() );
-#endif
+ SAL_INFO( "vcl", "X11Transferable::getTransferData( \"" <<
rFlavor.MimeType << "\" )\n -> \"" << aString << "\"\n");
aRet <<= aString.replaceAll("\r\n", "\n");
}
else
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx
b/vcl/unx/generic/gdi/xrender_peer.cxx
index b7c5d76..808fe14 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdio.h>
-
#include <rtl/ustring.hxx>
#include <unx/salunx.h>
#include <unx/saldata.hxx>
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 545630c..41c6e36 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -29,8 +29,6 @@
#include <algorithm>
#include <map>
-#include <stdio.h>
-
using namespace ::com::sun::star;
// FIXME
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index e3ffdc6..9f14e08 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -23,7 +23,6 @@
#include "atkfactory.hxx"
#include "atkutil.hxx"
#include "atkwindow.hxx"
-#include <stdio.h>
bool InitAtkBridge()
{
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx
b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index 8155c45..82aebc7 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
-#include <stdio.h>
#include <string.h>
using namespace ::com::sun::star;
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx
b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 9b01e6b..e11f498 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -21,8 +21,6 @@
#include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
-#include <stdio.h>
-
using namespace ::com::sun::star;
// ---------------------- AtkHyperlink ----------------------
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index d8d220d..2f6759f 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -21,8 +21,6 @@
#include <com/sun/star/accessibility/XAccessibleImage.hpp>
-#include <stdio.h>
-
using namespace ::com::sun::star;
// FIXME
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx
b/vcl/unx/gtk/a11y/atkselection.cxx
index 7e7f3fd..50bd94f 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.cxx
@@ -21,8 +21,6 @@
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <stdio.h>
-
using namespace ::com::sun::star;
static accessibility::XAccessibleSelection*
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 3715263..13ee31d 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -21,17 +21,13 @@
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-#ifdef ENABLE_TRACING
-#include <stdio.h>
-#endif
-
using namespace ::com::sun::star;
static inline AtkObject *
atk_object_wrapper_conditional_ref( const uno::Reference<
accessibility::XAccessible >& rxAccessible )
{
#ifdef ENABLE_TRACING
- fprintf( stderr, ": %p\n", rxAccessible.get() );
+ SAL_INFO( "vcl.a11y", ": " << rxAccessible.get() << "\n");
#endif
if( rxAccessible.is() )
@@ -89,11 +85,10 @@ table_wrapper_ref_at (AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleCellAt( %u, %u ) returns", row,
column );
+ SAL_INFO( "vcl.a11y", "getAccessibleCellAt( " << row << ", " <<
column << " ) returns\n");
if( column >= 255 )
- fprintf(stderr, "getAccessibleCellAt( %u, %u ) returns", row,
column );
-
+ SAL_INFO( "vcl.a11y", "getAccessibleCellAt( " << row << ", " <<
column << " ) returns\n");
#endif
if( pTable )
@@ -119,8 +114,7 @@ table_wrapper_get_index_at (AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleIndex( %u, %u ) returns %u\n",
- row, column, pTable->getAccessibleIndex( row, column ) );
+ SAL_INFO( "vcl.a11y", "getAccessibleIndex( " << row << ", " <<
column << " ) returns " << pTable->getAccessibleIndex( row, column ) << "\n");
#endif
if( pTable )
@@ -144,8 +138,7 @@ table_wrapper_get_column_at_index (AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleColumn( %u ) returns %u\n",
- nIndex, pTable->getAccessibleColumn( nIndex ) );
+ SAL_INFO( "vcl.a11y", "getAccessibleColumn( " << nIndex << " )
returns " << pTable->getAccessibleColumn( nIndex ) << "\n");
#endif
if( pTable )
@@ -169,8 +162,7 @@ table_wrapper_get_row_at_index( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleRow( %u ) returns %u\n",
- nIndex, pTable->getAccessibleRow( nIndex ) );
+ SAL_INFO( "vcl.a11y", "getAccessibleRow( " << nIndex << " )
returns " << pTable->getAccessibleRow( nIndex ) << "\n");
#endif
if( pTable )
@@ -193,8 +185,7 @@ table_wrapper_get_n_columns( AtkTable *table )
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "XAccessibleTable::getAccessibleColumnCount
returns %u\n",
- pTable->getAccessibleColumnCount() );
+ SAL_INFO( "vcl.a11y", "XAccessibleTable::getAccessibleColumnCount
returns " << pTable->getAccessibleColumnCount() << "\n");
#endif
if( pTable )
@@ -217,8 +208,7 @@ table_wrapper_get_n_rows( AtkTable *table )
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleRowCount() returns %u\n",
- pTable->getAccessibleRowCount() );
+ SAL_INFO( "vcl.a11y", "getAccessibleRowCount returns " <<
pTable->getAccessibleRowCount() << "\n");
#endif
if( pTable )
@@ -243,8 +233,8 @@ table_wrapper_get_column_extent_at( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleColumnExtentAt( %u, %u ) returns
%u\n",
- row, column, pTable->getAccessibleColumnExtentAt( row, column
) );
+ SAL_INFO( "vcl.a11y", "getAccessibleColumnExtentAt ( " << row <<
", " << column << " ) returns "
+ << pTable->getAccessibleColumnExtentAt( row, column ) <<
"\n");;
#endif
if( pTable )
@@ -269,8 +259,8 @@ table_wrapper_get_row_extent_at( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleRowExtentAt( %u, %u ) returns %u\n",
- row, column, pTable->getAccessibleRowExtentAt( row, column ) );
+ SAL_INFO( "vcl.a11y", "getAccessibleRowExtentAt ( " << row << ", "
<< column << " ) returns "
+ << pTable->getAccessibleRowExtentAt( row, column ) << "\n");;
#endif
if( pTable )
@@ -293,7 +283,7 @@ table_wrapper_get_caption( AtkTable *table )
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleCaption() returns" );
+ SAL_INFO( "vcl.a11y", "getAccessibleCaption() returns\n");
#endif
if( pTable )
@@ -318,8 +308,7 @@ table_wrapper_get_row_description( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleRowDescription( %u ) returns %s\n",
- row, getAsConst( pTable->getAccessibleRowDescription( row ) )
);
+ SAL_INFO( "vcl.a11y", "getAccessibleRowDescription( " << row << "
) returns " << getAsConst(pTable->getAccessibleRowDescription(row)) << "\n");
#endif
if( pTable )
@@ -343,8 +332,7 @@ table_wrapper_get_column_description( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleColumnDescription( %u ) returns
%s\n",
- column, getAsConst( pTable->getAccessibleColumnDescription(
column ) ) );
+ SAL_INFO( "vcl.a11y", "getAccessibleColumnDescription( " << column
<< " ) returns " << getAsConst(pTable->getAccessibleColumnDescription(column))
<< "\n");
#endif
if( pTable )
@@ -371,10 +359,9 @@ table_wrapper_get_row_header( AtkTable *table,
#ifdef ENABLE_TRACING
if( xRowHeaders.is() )
- fprintf(stderr, "getAccessibleRowHeader( %u
)->getAccessibleCellAt( 0, %u ) returns",
- row, row );
+ SAL_INFO( "vcl.a11y", "getAccessibleRowHeader( " << row <<
")->getAccessibleCellAt( 0, " << row << " ) returns\n");
else
- fprintf(stderr, "getAccessibleRowHeader( %u ) returns %p\n",
row, xRowHeaders.get() );
+ SAL_INFO( "vcl.a11y", "getAccessibleRowHeader( " << row << ")
returns " << xRowHeaders.get() << "\n");
#endif
if( xRowHeaders.is() )
@@ -403,10 +390,9 @@ table_wrapper_get_column_header( AtkTable *table,
#ifdef ENABLE_TRACING
if( xColumnHeaders.is() )
- fprintf(stderr, "getAccessibleColumnHeader( %u
)->getAccessibleCellAt( 0, %u ) returns",
- column, column );
+ SAL_INFO( "vcl.a11y", "getAccessibleColumnHeader( " << column
<< " )->getAccessibleCellAt( 0, " << column << " ) returns\n");
else
- fprintf(stderr, "getAccessibleColumnHeader( %u ) returns
%p\n", column, xColumnHeaders.get() );
+ SAL_INFO( "vcl.a11y", "getAccessibleColumnHeader( " << column
<< " ) returns " << xColumnHeaders.get() << "\n");
#endif
if( xColumnHeaders.is() )
@@ -430,7 +416,7 @@ table_wrapper_get_summary( AtkTable *table )
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getAccessibleSummary() returns" );
+ SAL_INFO( "vcl.a11y", "getAccessibleSummary() returns\n");
#endif
if( pTable )
@@ -473,7 +459,7 @@ table_wrapper_get_selected_columns( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getSelectedAccessibleColumns() \n" );
+ SAL_INFO( "vcl.a11y", "getSelectedAccessibleColumns()\n");
#endif
if( pTable )
@@ -498,7 +484,7 @@ table_wrapper_get_selected_rows( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "getSelectedAccessibleRows() \n" );
+ SAL_INFO( "vcl.a11y", "getSelectedAccessibleRows()\n");
#endif
if( pTable )
@@ -522,8 +508,7 @@ table_wrapper_is_column_selected( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "isAccessibleColumnSelected( %u ) returns %s\n",
- column, pTable->isAccessibleColumnSelected( column ) ? "true"
: "false" );
+ SAL_INFO( "vcl.a11y", "isAccessibleColumnSelected( " << column <<
" ) returns " << pTable->isAccessibleColumnSelected( column ) ? "true" :
"false" << "\n");
#endif
if( pTable )
@@ -547,8 +532,7 @@ table_wrapper_is_row_selected( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "isAccessibleRowSelected( %u ) returns %s\n",
- row, pTable->isAccessibleRowSelected( row ) ? "true" : "false"
);
+ SAL_INFO( "vcl.a11y", "isAccessibleRowSelected( " << row << " )
returns " << pTable->isAccessibleRowSelected( row ) ? "true" : "false" << "\n");
#endif
if( pTable )
@@ -573,8 +557,8 @@ table_wrapper_is_selected( AtkTable *table,
#ifdef ENABLE_TRACING
if( pTable )
- fprintf(stderr, "isAccessibleSelected( %u, %u ) returns %s\n",
- row, column, pTable->isAccessibleSelected( row , column ) ?
"true" : "false" );
+ SAL_INFO( "vcl.a11y", "isAccessibleSelected( " << row << ", " <<
column
+ << " ) returns " << pTable->isAccessibleSelected( row , column
) ? "true" : "false" << "\n");
#endif
if( pTable )
diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index 50874b7..a81f6cd 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <stdio.h>
#include <string.h>
using namespace ::com::sun::star;
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index c97882b..83e9111 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -22,7 +22,6 @@
#include <unistd.h>
#include <fcntl.h>
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index b7806f4..540773d 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -45,10 +45,6 @@
#include <svdata.hxx>
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nState ) :
X11SalFrame( pParent, nState )
{
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 3101d37..6040100 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -40,8 +40,6 @@
#include "KDESalDisplay.hxx"
-#include <stdio.h>
-
#include <config_kde4.h>
#if KDE_HAVE_GLIB
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 8c13180..131dc9c 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -24,10 +24,6 @@
#include <vclpluginapi.h>
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
#include <rtl/string.hxx>
/// entry point for the KDE4 VCL plugin
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx
b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 094a05c..9b6319e 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdio.h>
#include <string.h>
#include <svsys.h>
#include <win/wincomp.hxx>
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index b0577d9..183b018 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -45,7 +45,6 @@
#include <errno.h>
#include <unistd.h>
-#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -264,9 +263,7 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, )
Bitmap aBitmap = aGraphicResult.GetBitmap();
- fprintf( stderr, "got bitmap of size %ldx%ld\n",
- sal::static_int_cast< long >(aBitmap.GetSizePixel().Width()),
- sal::static_int_cast< long
>(aBitmap.GetSizePixel().Height()));
+ SAL_INFO("vcl", "got bitmap of size " <<
aBitmap.GetSizePixel().Width() << "x" << aBitmap.GetSizePixel().Height() <<
"\n");
Size aFixedSize( aBitmap.GetSizePixel() );
aFixedSize.Width() += 10;
aFixedSize.Height() += 10;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
