summaryrefslogtreecommitdiff
path: root/vcl/source/outdev
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-19 12:22:03 +0200
committerNoel Grandin <noel@peralex.com>2015-10-19 13:08:29 +0200
commitc8479bdc5b007ca5ffe1d553be3d90fb03424526 (patch)
treef927ba8085da8c9dc46d1cda669fbac8af724abf /vcl/source/outdev
parent39e63bfac528d8c5c002ee8fef4a1e5d7181b826 (diff)
convert DBG_ASSERTWARNING to SAL_WARN_IF
I know the comment in debug.hxx said to use SAL_INFO, but SAL_WARN makes much more sense. Change-Id: I3d81f9db89ef8cebe1e4f2983941d69b4c7e6b7d
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r--vcl/source/outdev/map.cxx6
-rw-r--r--vcl/source/outdev/text.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 96d96e43ec02..4e84033789fc 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -708,7 +708,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
mpMetaFile->AddAction( new MetaMapModeAction( rNewMapMode ) );
#ifdef DBG_UTIL
if ( GetOutDevType() != OUTDEV_PRINTER )
- DBG_ASSERTWARNING( bRelMap, "Please record only relative MapModes!" );
+ SAL_WARN_IF( !bRelMap, "vcl", "Please record only relative MapModes!" );
#endif
}
@@ -1516,9 +1516,9 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
&& eUnitDest != MAP_APPFONT
&& eUnitDest != MAP_RELATIVE,
"Destination MapUnit nicht erlaubt" );
- DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL,
+ SAL_WARN_IF( eUnitSource == MAP_PIXEL, "vcl",
"MAP_PIXEL mit 72dpi angenaehert" );
- DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL,
+ SAL_WARN_IF( eUnitDest == MAP_PIXEL, "vcl",
"MAP_PIXEL mit 72dpi angenaehert" );
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index d8757e057dd3..d03f3cb106c8 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -496,7 +496,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
long nWidth, const OUString& rStr,
DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout )
{
- DBG_ASSERTWARNING( nWidth >= 0, "ImplGetTextLines: nWidth <= 0!" );
+ SAL_WARN_IF( nWidth <= 0, "vcl", "ImplGetTextLines: nWidth <= 0!" );
if ( nWidth <= 0 )
nWidth = 1;