summaryrefslogtreecommitdiff
path: root/tools
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 /tools
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 'tools')
-rw-r--r--tools/source/generic/color.cxx4
-rw-r--r--tools/source/generic/gen.cxx8
-rw-r--r--tools/source/generic/poly.cxx4
-rw-r--r--tools/source/generic/poly2.cxx8
4 files changed, 12 insertions, 12 deletions
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 697de7ebc2f8..e85cf9d0b9a8 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -243,7 +243,7 @@ OUString Color::AsRGBHexString() const
SvStream& ReadColor( SvStream& rIStream, Color& rColor )
{
- DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Color::>> - Solar-Version not set on rIStream" );
sal_uInt16 nColorName;
@@ -335,7 +335,7 @@ void Color::ApplyTintOrShade(sal_Int16 n100thPercent)
SvStream& WriteColor( SvStream& rOStream, const Color& rColor )
{
- DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Color::<< - Solar-Version not set on rOStream" );
sal_uInt16 nColorName = COL_NAME_USER;
sal_uInt16 nRed = rColor.GetRed();
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index cb5b1dc2a674..33a4ae490454 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -27,7 +27,7 @@
SvStream& ReadPair( SvStream& rIStream, Pair& rPair )
{
- DBG_ASSERTWARNING( rIStream.GetVersion(), "Pair::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Pair::>> - Solar-Version not set on rIStream" );
sal_Int32 nTmpA(0), nTmpB(0);
rIStream.ReadInt32( nTmpA ).ReadInt32( nTmpB );
@@ -39,7 +39,7 @@ SvStream& ReadPair( SvStream& rIStream, Pair& rPair )
SvStream& WritePair( SvStream& rOStream, const Pair& rPair )
{
- DBG_ASSERTWARNING( rOStream.GetVersion(), "Pair::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Pair::<< - Solar-Version not set on rOStream" );
rOStream.WriteInt32( rPair.nA ).WriteInt32( rPair.nB );
@@ -173,7 +173,7 @@ bool Rectangle::IsOver( const Rectangle& rRect ) const
SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect )
{
- DBG_ASSERTWARNING( rIStream.GetVersion(), "Rectangle::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Rectangle::>> - Solar-Version not set on rIStream" );
sal_Int32 nTmpL(0), nTmpT(0), nTmpR(0), nTmpB(0);
@@ -189,7 +189,7 @@ SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect )
SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect )
{
- DBG_ASSERTWARNING( rOStream.GetVersion(), "Rectangle::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Rectangle::<< - Solar-Version not set on rOStream" );
rOStream.WriteInt32( rRect.nLeft )
.WriteInt32( rRect.nTop )
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index f5cf0dfd46d0..f53dbf19c36c 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1536,7 +1536,7 @@ bool Polygon::IsEqual( const tools::Polygon& rPoly ) const
SvStream& ReadPolygon( SvStream& rIStream, tools::Polygon& rPoly )
{
- DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Polygon::>> - Solar-Version not set on rIStream" );
sal_uInt16 i;
sal_uInt16 nPoints(0);
@@ -1587,7 +1587,7 @@ SvStream& ReadPolygon( SvStream& rIStream, tools::Polygon& rPoly )
SvStream& WritePolygon( SvStream& rOStream, const tools::Polygon& rPoly )
{
- DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Polygon::<< - Solar-Version not set on rOStream" );
sal_uInt16 i;
sal_uInt16 nPoints = rPoly.GetSize();
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 6d6b3d888a14..7005a56a90e2 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -551,7 +551,7 @@ bool PolyPolygon::operator==( const tools::PolyPolygon& rPolyPoly ) const
SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly )
{
- DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools", "PolyPolygon::>> - Solar-Version not set on rIStream" );
tools::Polygon* pPoly;
sal_uInt16 nPolyCount(0);
@@ -592,7 +592,7 @@ SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly )
SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly )
{
- DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "PolyPolygon::<< - Solar-Version not set on rOStream" );
// Write number of polygons
sal_uInt16 nPolyCount = rPolyPoly.mpImplPolyPolygon->mnCount;
@@ -609,7 +609,7 @@ void PolyPolygon::Read( SvStream& rIStream )
{
VersionCompat aCompat( rIStream, StreamMode::READ );
- DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" );
+ SAL_WARN_IF( !rIStream.GetVersion(), "tools","PolyPolygon::>> - Solar-Version not set on rIStream" );
tools::Polygon* pPoly;
sal_uInt16 nPolyCount(0);
@@ -650,7 +650,7 @@ void PolyPolygon::Write( SvStream& rOStream ) const
{
VersionCompat aCompat( rOStream, StreamMode::WRITE, 1 );
- DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" );
+ SAL_WARN_IF( !rOStream.GetVersion(), "tools", "PolyPolygon::<< - Solar-Version not set on rOStream" );
// Write number of polygons
sal_uInt16 nPolyCount = mpImplPolyPolygon->mnCount;