diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-06-20 15:51:55 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-20 16:13:32 +0000 |
| commit | 7dddccdcec91d8136d95469f4e607ce0829bde65 (patch) | |
| tree | 5853f1fc54b94b887803aebe366552aade537e3d /vcl | |
| parent | 0ac092ed0b04ce4ea8b401a56998e36bc2cca402 (diff) | |
reduce warnings in vcl
pHelpWin is always false,
array sizes can be checked at compile time
Change-Id: I945ede9432b4927b30c31018a1420396176ecb94
Reviewed-on: https://gerrit.libreoffice.org/26518
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/help.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/control/button.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 877d1b5fbe8d..28bc632cb810 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -539,7 +539,6 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHe ) nDelayMode = HELPDELAY_NONE; - SAL_WARN_IF( pHelpWin, "vcl", "Noch ein HelpWin ?!" ); pHelpWin = VclPtr<HelpTextWindow>::Create( pParent, rHelpText, nHelpWinStyle, nStyle ); pSVData->maHelpData.mpHelpWin = pHelpWin; pHelpWin->SetStatusText( rStatusText ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index e42737070a1c..0e4dc5b16a9c 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2792,10 +2792,10 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings, aColorAry2[5] = rStyleSettings.GetWindowTextColor(); Color aMaskColor(0x00, 0x00, 0xFF ); - SAL_WARN_IF( sizeof(aColorAry1) != sizeof(aColorAry2), "vcl", "aColorAry1 must match aColorAry2" ); + static_assert( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" ); // FIXME: do we want the mask for the checkbox ? pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, - aColorAry1, aColorAry2, sizeof(aColorAry1) / sizeof(Color)); + aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1)); } Image RadioButton::GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ) |