summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cppuhelper/source/shlib.cxx4
-rw-r--r--sax/source/tools/fastserializer.cxx6
-rw-r--r--sax/source/tools/fastserializer.hxx4
-rw-r--r--sw/source/core/layout/pagechg.cxx2
-rw-r--r--sw/source/core/unocore/unotext.cxx14
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx11
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx2
-rw-r--r--xmloff/source/style/bordrhdl.cxx4
9 files changed, 14 insertions, 37 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 0408c37df01e..d2ed0cf8a524 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -95,7 +95,7 @@ namespace
}
m_aAccessDPath.push_back( aFileUrl );
} while( nIndex != -1 );
- #if OSL_G_LEVEL > 1
+ #if OSL_DEBUG_LEVEL > 1
out( "> cpld: acknowledged following access path(s): \"" );
::std::vector< OUString >::const_iterator iPos( m_aAccessDPath.begin() );
while (iPos != m_aAccessDPath.end())
@@ -111,7 +111,7 @@ namespace
else
{
// no access path env set
- #if OSL_G_LEVEL > 1
+ #if OSL_DEBUG_LEVEL > 1
out( "=> no CPLD_ACCESSPATH set.\n" );
#endif
}
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 31aac1e285f8..9966b856265e 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -28,7 +28,7 @@
#include <string.h>
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 0
#include <iostream>
#endif
@@ -295,7 +295,7 @@ namespace sax_fastparser {
return maData;
}
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 0
void FastSaxSerializer::ForMerge::print( )
{
std::cerr << "Data: ";
@@ -398,7 +398,7 @@ namespace sax_fastparser {
return ForMerge::getData();
}
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 0
void FastSaxSerializer::ForSort::print( )
{
std::map< sal_Int32, Int8Sequence >::iterator iter = maData.begin();
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 70bc1533b482..4e9f87115e6d 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -163,7 +163,7 @@ private:
virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {}
virtual Int8Sequence& getData();
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 0
virtual void print();
#endif
@@ -194,7 +194,7 @@ private:
virtual Int8Sequence& getData();
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 0
virtual void print();
#endif
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 8b95ee6738c3..7915bc9d0c9d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -178,7 +178,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
void SwBodyFrm::Paint( const SwRect& rRect, const SwPrintData* ) const
{
-#if OSL_DEBUG_LAYOUT > 1
+#if OSL_DEBUG_LEVEL > 1
// Paint a red border around the SwBodyFrm in debug mode
ViewShell *pSh = GetShell();
OutputDevice* pOut = pSh->GetOut();
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index f2e0bd062cef..0aafea97bd45 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2286,18 +2286,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
}
catch (const uno::Exception& e)
{
-#if DEBUG
- std::clog << "Exception when setting property: ";
- std::clog << rtl::OUStringToOString(
- pTableProperties[nProperty].Name, RTL_TEXTENCODING_UTF8)
- .getStr();
- std::clog << ". Message: ";
- std::clog << rtl::OUStringToOString( e.Message,
- RTL_TEXTENCODING_UTF8 ).getStr();
- std::clog << std::endl;
-#else
- (void)e;
-#endif
+ SAL_WARN( "sw.uno", "Exception when setting property: "
+ + pTableProperties[nProperty].Name + ". Message: " + e.Message );
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 39144e9229b6..45aeba057d54 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4244,7 +4244,7 @@ void SwWW8ImplReader::ReadDocInfo()
if (!aSttb.Read( *pTableStream ) )
OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
pTableStream->Seek( nCur ); // return to previous position, is that necessary?
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 1
aSttb.Print( stderr );
#endif
String sPath = aSttb.getStringAtIndex( 0x1 );
@@ -4324,7 +4324,7 @@ bool WW8Customizations::Import( SwDocShell* pShell )
SAL_WARN("sw.ww8", "** Read of Customization data failed!!!! ");
return false;
}
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 1
aTCG.Print( stderr );
#endif
return aTCG.ImportCustomToolBar( *pShell );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 423019cb6bfe..62e91e6bfdbe 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -62,11 +62,6 @@
#endif
#include <ooxml/OOXMLFastTokens.hxx>
-#if DEBUG
-#include <stdio.h>
-#include <com/sun/star/style/TabStop.hpp>
-#endif
-
#include <map>
#include <comphelper/configurationhelper.hxx>
@@ -3596,11 +3591,7 @@ bool DomainMapper_Impl::ExecuteFrameConversion()
}
catch( const uno::Exception& rEx)
{
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "Exception caught when converting to frame: %s\n",
- OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
- (void)rEx;
+ SAL_WARN( "writerfilter", "Exception caught when converting to frame: " + rEx.Message );
bRet = false;
}
m_xFrameStartRange = 0;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index cb763204253e..2a61ec107ad1 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -565,7 +565,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Get the merged level properties
uno::Sequence< beans::PropertyValue > aLvlProps = aProps[sal_Int32( nLevel )];
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 1
lcl_printProperties( aLvlProps );
#endif
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index ed6284382250..9da972d28779 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -26,10 +26,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/table/BorderLine2.hpp>
-#if DEBUG
-#include <cstdio>
-#endif
-
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 12:08:16 +0000