Hello lo-devs,
this patch removes the unused DBG_WARNING4 and DBG_WARNING5 macros and
replaces also the DBG_WARNINGFILE with SAL_INFO as suggested in the
tools/debug.hxx headers.
regards
Marcel
---
cui/source/dialogs/iconcdlg.cxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 4 ++--
tools/inc/tools/debug.hxx | 14 ++------------
vcl/source/app/dbggui.cxx | 5 ++---
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 519f3d1..73921d7 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -945,7 +945,7 @@ void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*
SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
{
- DBG_WARNINGFILE( "CreateInputItemSet nicht implementiert" );
+ SAL_INFO( "cui", "CreateInputItemSet not implemented" );
return 0;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 108e46d..5ec3cc9 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -834,7 +834,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
}
else
{
- DBG_WARNINGFILE( "TabPage-Id not known" );
+ SAL_INFO( "sfx2", "TabPage-Id not known" );
}
}
@@ -973,7 +973,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
*/
{
- DBG_WARNINGFILE( "CreateInputItemSet not implemented" );
+ SAL_INFO( "sfx2", "CreateInputItemSet not implemented" );
return new SfxAllItemSet( SFX_APP()->GetPool() );
}
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index cba27d4..bf3b03b 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -45,8 +45,8 @@
Because the assertion macros (DBG_ASSERT, DBG_BF_ASSERT) have been used for
true assertions as well as to log warnings, they map to SAL_WARN instead of
standard assert. The warning and error macros (DBG_ASSERTWARNING,
- DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE,
- DBG_ERRORFILE) all map to SAL_INFO.
+ DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING3, DBG_ERRORFILE) all map to
+ SAL_INFO.
*/
// ------------
@@ -460,13 +460,6 @@ public:
SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2)
#define DBG_WARNING3( aWarning, x1, x2, x3 ) \
SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3)
-#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) \
- SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3, x4)
-#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) \
- SAL_DETAIL_INFO_IF_FORMAT( \
- true, "legacy.tools", aWarning, x1, x2, x3, x4, x5)
-#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_INFO_IF_FORMAT( \
- true, "legacy.tools", aWarning, __FILE__, __LINE__)
#define DBG_ERRORFILE( aError ) \
SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aError, __FILE__, __LINE__)
@@ -538,9 +531,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_WARNING1( aWarning, x1 ) ((void)0)
#define DBG_WARNING2( aWarning, x1, x2 ) ((void)0)
#define DBG_WARNING3( aWarning, x1, x2, x3 ) ((void)0)
-#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) ((void)0)
-#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) ((void)0)
-#define DBG_WARNINGFILE( aWarning ) ((void)0)
#define DBG_ERRORFILE( aError ) ((void)0)
#define DBG_TESTSOLARMUTEX() ((void)0)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index cb25dfd..d8cc776 100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -176,9 +176,8 @@ static const sal_Char* pDbgHelpText[] =
"dropdown list.\n"
"\n",
"Warnings\n",
-"DBG_WARNING() can be used to output warnings. DBG_WARNINGFILE() also outputs "
-"the file and the line number where the macro is located. DBG_WARNING1() to "
-"DBG_WARNING5() can be used to produce formatted output (printf format string). "
+"DBG_WARNING() can be used to output warnings. DBG_WARNING1() to "
+"DBG_WARNING3() can be used to produce formatted output (printf format string). "
"In case you want to have conditional warnings DBG_ASSERTWARNING() can be "
"used. The warning will be produced if the condition was not met. The first "
"parameter is the condition and the second parameter is the message to be "
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
