diff options
| -rw-r--r-- | automation/source/server/statemnt.cxx | 4 | ||||
| -rw-r--r-- | automation/source/simplecm/simplecm.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/model/main/ChartModel_Persistence.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/attarray.cxx | 1 |
6 files changed, 9 insertions, 7 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index ed0e1103fe0d..12a00e38194a 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -692,7 +692,7 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} - if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} + if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1_and_Pointer.nLNr1 ) );} if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );} @@ -739,7 +739,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} - if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} + if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1_and_Pointer.nLNr1 ) );} if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );} diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 39f86436a9a3..2cc5b93e26f0 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -43,10 +43,10 @@ #include <stdio.h> void debug_printf( const char *chars ) { - static BOOL bPrint = (getenv("DEBUG") != NULL); + static bool bPrint = (getenv("DEBUG") != NULL); if ( bPrint ) { - printf( "%c\n", chars ); + printf( "%s\n", chars ); fflush( stdout ); } } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index b1cbbd0d3db8..809419b7c690 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -503,7 +503,7 @@ void SAL_CALL ChartModel::initNew() #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartModel::initNew: Showing ChartDocument structure" ); OSL_TRACE( "----------------------------------------------------" ); - debug::ChartDebugTraceDocument( Reference< chart2::XChartDocument >( this )); + ::chart::debug::ChartDebugTraceDocument( Reference< chart2::XChartDocument >( this )); #endif } diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 9fee9b342534..77d2b3f38079 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -322,7 +322,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartTypeTemplate::changeDiagramData: Showing Diagram structure" ); OSL_TRACE( "---------------------------------------------------------------" ); - debug::ChartDebugTraceDiagram( xDiagram ); + ::chart::debug::ChartDebugTraceDiagram( xDiagram ); #endif } catch( uno::Exception & ex ) @@ -822,7 +822,7 @@ void ChartTypeTemplate::FillDiagram( #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartTypeTemplate::FillDiagram: Showing Diagram structure" ); OSL_TRACE( "---------------------------------------------------------" ); - debug::ChartDebugTraceDiagram( xDiagram ); + ::chart::debug::ChartDebugTraceDiagram( xDiagram ); #endif } diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 26581c9c911a..327fd413d97d 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -52,6 +52,7 @@ #include <outdevstate.hxx> #include <polypolyaction.hxx> #include <textaction.hxx> +#include <stdio.h> #define EmfPlusRecordTypeHeader 16385 #define EmfPlusRecordTypeEndOfFile 16386 diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 6c1a989dbf65..4296beb707a0 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -55,6 +55,7 @@ #include "globstr.hrc" #include "segmenttree.hxx" #include "cell.hxx" +#include <rtl/strbuf.hxx> // STATIC DATA ----------------------------------------------------------- |