diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:34:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 09:41:47 +0100 |
| commit | 70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 (patch) | |
| tree | ffb31ef817b5f2037cf7c332da422b9179d613d5 /vcl | |
| parent | f2972242673cc9608960e9ca70e82766be5275e3 (diff) | |
New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
addressed.
* Some replacements tools String -> rtl::OUString.
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/source/app/dbggui.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 468e7c87ae65..126c56cadd77 100755 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -39,6 +39,7 @@ #include <limits.h> #include "tools/debug.hxx" +#include "sal/log.h" #include "vcl/svapp.hxx" #include "vcl/event.hxx" @@ -1454,10 +1455,12 @@ void DbgDialogTest( Window* pWindow ) if ( bButton ) { - if ( !bOKCancelButton ) - DbgError( "Dialogs should have a OK- or CancelButton" ); - if ( !bDefPushButton ) - DbgError( "Dialogs should have a Button with WB_DEFBUTTON" ); + SAL_WARN_IF( + !bOKCancelButton, "vcl", + "Dialogs should have a OK- or CancelButton"); + SAL_WARN_IF( + !bDefPushButton, "vcl", + "Dialogs should have a Button with WB_DEFBUTTON"); } } @@ -1626,15 +1629,12 @@ void DbgDialogTest( Window* pWindow ) } } - if ( pChild->GetType() == WINDOW_MULTILINEEDIT ) - { - if ( ( 0 == ( pChild->GetStyle() & WB_IGNORETAB ) ) - && ( 0 == ( pChild->GetStyle() & WB_READONLY ) ) - ) - { - DbgError( "editable MultiLineEdits in Dialogs should have the Style WB_IGNORETAB" ); - } - } + SAL_WARN_IF( + (pChild->GetType() == WINDOW_MULTILINEEDIT + && (pChild->GetStyle() & (WB_IGNORETAB | WB_READONLY)) == 0), + "vcl", + ("editable MultiLineEdits in Dialogs should have the Style" + " WB_IGNORETAB")); if ( (pChild->GetType() == WINDOW_RADIOBUTTON) || (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) || |