mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MacOS X fixup to bogus WaE: 'bValue' may be used uninitialized

Browse Source 
Change-Id: I1485e7f6b9147d4cec94833c0a2b35e730c397cf
This commit is contained in:
Lionel Elie Mamane
2013-10-17 04:14:47 +02:00
parent 9d5e05edb2
commit efd341157c
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forms/source/component/CheckBox.cxx
View File

@@ -211,6 +211,10 @@ bool OCheckBoxModel::DbUseBool()
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if defined __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
Any OCheckBoxModel::translateDbColumnToControlValue() Any OCheckBoxModel::translateDbColumnToControlValue()
{ {
Any aValue; Any aValue;
@@ -244,18 +248,16 @@ Any OCheckBoxModel::translateDbColumnToControlValue()
// Since above either bValue is initialised, either aValue.hasValue(), // Since above either bValue is initialised, either aValue.hasValue(),
// bValue cannot be used uninitialised here. // bValue cannot be used uninitialised here.
// But GCC does not see/understand that, which breaks -Werror builds. // But GCC does not see/understand that, which breaks -Werror builds.
#if defined __GNUC__ // Since the MacOS X compiler does not support #pragma GCC diagnostic
#pragma GCC diagnostic push // within a function, moved them to outside the function.
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
aValue <<= (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); aValue <<= (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK );
#if defined __GNUC__
#pragma GCC diagnostic pop
#endif
} }
return aValue; return aValue;
} }
#if defined __GNUC__
#pragma GCC diagnostic pop
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )