Skip to content

C
core
Kaydet (Commit) 52595d98 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

DbgOutTypef -> SAL_WARN 

Change-Id: I837643b2c12bf70585dce128dad114cc65f7f0a1
üst f26b981a
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 54 deletions
vcl/source/app/dbggui.cxx
Dosyayı görüntüle @ 52595d98
...@@ -959,7 +959,8 @@ void DbgDialogTest( Window* pWindow ) ...@@ -959,7 +959,8 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->IsVisible() ) if ( pChild->IsVisible() )
{ {
if ( aAccelBuf[cAccel] ) if ( aAccelBuf[cAccel] )
DbgOutTypef( "Double mnemonic char: %c", cAccel ); SAL_WARN(
"vcl.app", "Double mnemonic char: " << cAccel);
else else
aAccelBuf[cAccel] = true; aAccelBuf[cAccel] = true;
} }
...@@ -984,11 +985,10 @@ void DbgDialogTest( Window* pWindow ) ...@@ -984,11 +985,10 @@ void DbgDialogTest( Window* pWindow )
pClass = "PushButton"; pClass = "PushButton";
else else
pClass = "Dontknow"; pClass = "Dontknow";
if( !cAccel ) SAL_WARN_IF(
DbgOutTypef( !cAccel, "vcl.app",
"%s should have a mnemonic char (~): %s", pClass << " should have a mnemonic char (~): "
pClass, << aErrorText);
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
// check text width // check text width
int aWidth=0; int aWidth=0;
...@@ -1006,29 +1006,25 @@ void DbgDialogTest( Window* pWindow ) ...@@ -1006,29 +1006,25 @@ void DbgDialogTest( Window* pWindow )
break; break;
default: break; default: break;
} }
if( pChild->IsVisible() && pChild->GetSizePixel().Width() < aWidth ) SAL_WARN_IF(
DbgOutTypef( pChild->IsVisible() && pChild->GetSizePixel().Width() < aWidth,
"%s exceeds window width: %s", "vcl.app",
pClass, pClass << " exceeds window width: " << aErrorText);
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
} }
} }
if ( pChild->GetType() == WINDOW_FIXEDLINE ) SAL_WARN_IF(
{ (pChild->GetType() == WINDOW_FIXEDLINE
if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) ) && pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText )),
DbgOutTypef( "FixedLine exceeds window width: %s", "vcl.app", "FixedLine exceeds window width: " << aErrorText);
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( pChild->GetType() == WINDOW_FIXEDTEXT ) if ( pChild->GetType() == WINDOW_FIXEDTEXT )
{ {
if ( (pChild->GetSizePixel().Height() >= pChild->GetTextHeight()*2) && SAL_WARN_IF(
!(pChild->GetStyle() & WB_WORDBREAK) ) (pChild->GetSizePixel().Height() >= pChild->GetTextHeight()*2) && !(pChild->GetStyle() & WB_WORDBREAK),
{ "vcl.app",
DbgOutTypef( "FixedText greater than one line, but WordBreak is not set: %s", "FixedText greater than one line, but WordBreak is not set: "
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); << aErrorText);
}
if ( pChild->IsVisible() ) if ( pChild->IsVisible() )
{ {
...@@ -1041,11 +1037,10 @@ void DbgDialogTest( Window* pWindow ) ...@@ -1041,11 +1037,10 @@ void DbgDialogTest( Window* pWindow )
else else
aWidth = pChild->GetTextWidth( aText ); aWidth = pChild->GetTextWidth( aText );
if ( pChild->GetSizePixel().Width() < aWidth && !(pChild->GetStyle() & WB_WORDBREAK) ) SAL_WARN_IF(
{ pChild->GetSizePixel().Width() < aWidth && !(pChild->GetStyle() & WB_WORDBREAK),
DbgOutTypef( "FixedText exceeds window width: %s", "vcl.app",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); "FixedText exceeds window width: " << aErrorText);
}
} }
if ( (i+1 < nChildCount) && !aText.isEmpty() ) if ( (i+1 < nChildCount) && !aText.isEmpty() )
...@@ -1070,16 +1065,15 @@ void DbgDialogTest( Window* pWindow ) ...@@ -1070,16 +1065,15 @@ void DbgDialogTest( Window* pWindow )
(pTempChild->GetType() == WINDOW_DATEBOX) || (pTempChild->GetType() == WINDOW_DATEBOX) ||
(pTempChild->GetType() == WINDOW_TIMEBOX) ) (pTempChild->GetType() == WINDOW_TIMEBOX) )
{ {
if ( !cAccel ) SAL_WARN_IF(
{ !cAccel, "vcl.app",
DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s", "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): "
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); << aErrorText);
} SAL_WARN_IF(
if ( !pTempChild->IsEnabled() && pChild->IsEnabled() ) !pTempChild->IsEnabled() && pChild->IsEnabled(),
{ "vcl.app",
DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s", "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: "
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); << aErrorText);
}
} }
} }
} }
...@@ -1162,11 +1156,9 @@ void DbgDialogTest( Window* pWindow ) ...@@ -1162,11 +1156,9 @@ void DbgDialogTest( Window* pWindow )
if ( pBox->GetMax() == Date( 31, 12, 9999 ) ) if ( pBox->GetMax() == Date( 31, 12, 9999 ) )
bMaxWarning = true; bMaxWarning = true;
} }
if ( bMaxWarning ) SAL_WARN_IF(
{ bMaxWarning, "vcl.app",
DbgOutTypef( "No Max-Value is set: %s", "No Max-Value is set: " << aErrorText);
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) || if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) || (pChild->GetType() == WINDOW_CHECKBOX) ||
...@@ -1202,22 +1194,21 @@ void DbgDialogTest( Window* pWindow ) ...@@ -1202,22 +1194,21 @@ void DbgDialogTest( Window* pWindow )
if ( cAccel || (pChild->GetStyle() & WB_TABSTOP) || if ( cAccel || (pChild->GetStyle() & WB_TABSTOP) ||
(pChild->GetType() == WINDOW_RADIOBUTTON) ) (pChild->GetType() == WINDOW_RADIOBUTTON) )
{ {
if ( (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()) ) SAL_WARN_IF(
{ (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()),
DbgOutTypef( "Possible wrong childorder for dialogcontrol: %s", "vcl.app",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); "Possible wrong childorder for dialogcontrol: "
} << aErrorText);
aTabPos = aNewPos; aTabPos = aNewPos;
} }
for ( sal_uInt16 j = 0; j < i; j++ ) for ( sal_uInt16 j = 0; j < i; j++ )
{ {
if ( ((pRectAry[j].Right() != 0) || (pRectAry[j].Bottom() != 0)) && SAL_WARN_IF(
aChildRect.IsOver( pRectAry[j] ) ) ((pRectAry[j].Right() != 0) || (pRectAry[j].Bottom() != 0)) && aChildRect.IsOver( pRectAry[j] ),
{ "vcl.app",
DbgOutTypef( "Window overlaps with sibling window: %s", "Window overlaps with sibling window: "
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); << aErrorText);
}
} }
pRectAry[i] = aChildRect; pRectAry[i] = aChildRect;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment