From 080e9c298738988f36df43b8edd7b6e7bf4224cf Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Thu, 17 Oct 2013 16:00:07 +0200 Subject: [PATCH] bogus WaE: 'bValue' may be used uninitialized in this function Change-Id: Ifde0f9370d093f447edac4899c5bbc7940da5a8c --- forms/source/component/CheckBox.cxx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 479672948661..04a5399d23da 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -211,17 +211,13 @@ bool OCheckBoxModel::DbUseBool() } //------------------------------------------------------------------------------ -#if defined __GNUC__ && ! defined __clang__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -#endif Any OCheckBoxModel::translateDbColumnToControlValue() { Any aValue; ////////////////////////////////////////////////////////////////// // Set value in ControlModel - bool bValue; + bool bValue = bool(); // avoid warning if(DbUseBool()) { bValue = m_xColumn->getBoolean(); @@ -247,17 +243,13 @@ Any OCheckBoxModel::translateDbColumnToControlValue() { // Since above either bValue is initialised, either aValue.hasValue(), // bValue cannot be used uninitialised here. - // But GCC does not see/understand that, which breaks -Werror builds. - // And Clang compiler does not support #pragma GCC diagnostic - // within a function, moved them to outside the function. + // But GCC does not see/understand that, which breaks -Werror builds, + // so we explicitly default-initialise it. aValue <<= (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); } return aValue; } -#if defined __GNUC__ && ! defined __clang__ -#pragma GCC diagnostic pop -#endif //----------------------------------------------------------------------------- sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )