diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-20 14:23:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-03-21 16:30:59 +0100 |
| commit | 9adcf67c9b164d019eebe45279bcaa91b0ce471a (patch) | |
| tree | 5e323faf067516423e0552c9775d56cb3e5d1a44 /oox | |
| parent | 03ab46c8a189b751ed1acffd0b575fae584c1d00 (diff) | |
Drop C/C++ DEBUG macro
...(that was defined iff OSL_DEBUG_LEVEL >= 2) and replace its uses with
OSL_DEBUG_LEVEL directly
Change-Id: I807c15a02cc8ced9852287df0afb4808761d19d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165067
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 4 | ||||
| -rwxr-xr-x | oox/source/drawingml/customshapes/generate.sh | 2 | ||||
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 533401f586dd..862ffd8624a3 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -118,7 +118,7 @@ void CustomShapeProperties::pushToPropSet( "found property map for preset: " << mnShapePresetType); aPropertyMap = maPresetDataMap[mnShapePresetType]; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >= 2 aPropertyMap.dumpCode( aPropertyMap.makePropertySet() ); #endif } @@ -372,7 +372,7 @@ void CustomShapeProperties::pushToPropSet( aPropertyMap.setProperty( PROP_Extrusion, aExtrusionSequence); } -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >= 2 // Note that the script oox/source/drawingml/customshapes/generatePresetsData.pl looks // for these ==cscode== and ==csdata== markers, so don't "clean up" these SAL_INFOs. SAL_INFO("oox.cscode", "==cscode== begin"); diff --git a/oox/source/drawingml/customshapes/generate.sh b/oox/source/drawingml/customshapes/generate.sh index b0e661ec1914..a13ef646dfb8 100755 --- a/oox/source/drawingml/customshapes/generate.sh +++ b/oox/source/drawingml/customshapes/generate.sh @@ -6,7 +6,7 @@ set -o errexit -# oox needs to be build with dbglevel=2 so that DEBUG is defined. +# oox needs to be build with dbglevel=2 so that OSL_DEBUG_LEVEL=2 is defined. make oox.clean && make oox dbglevel=2 diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 1c45988b2bfe..4a2287bc196b 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2644,7 +2644,7 @@ HtmlTextBoxModel::HtmlTextBoxModel() bool HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm ) { -#ifdef DEBUG +#if OSL_DEBUG_LEVEL >= 2 OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); // in msocximex ( where this is ported from, it appears *nothing* is read // from the control stream ), surely there is some useful info there ? |