linguistic/source/spelldsp.cxx | 4 +++- sc/source/ui/optdlg/calcoptionsdlg.cxx | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit fe076b977661679842d44ecf21a66fca4d96ce33 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Nov 7 19:48:19 2014 -0600 sc, opencl dependant code called even without FEATURE_OPENCL Change-Id: I9629904b6b48d6b8356d6abb0c3cffe6e3fba517 diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 051cd98..06e74fa 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -582,6 +582,7 @@ void ScCalcOptionsDialog::SelectionChanged() mpEditField->Hide(); mpOpenCLWhiteAndBlackListGrid->Show(); mpOpenclInfoList->GetParent()->Hide(); +#if HAVE_FEATURE_OPENCL if ( nSelectedPos == CALC_OPTION_OPENCL_WHITELIST ) { mpFtAnnotation->SetText(maDescOpenCLWhiteList); @@ -592,6 +593,7 @@ void ScCalcOptionsDialog::SelectionChanged() mpFtAnnotation->SetText(maDescOpenCLBlackList); fillListBox(mpOpenCLWhiteAndBlackListBox, maConfig.maOpenCLBlackList); } +#endif } break; } @@ -803,9 +805,10 @@ void ScCalcOptionsDialog::EditFieldValueChanged(Control *pCtrl) rSet.erase(impl); rSet.insert(newImpl); - +#if HAVE_FEATURE_OPENCL fillListBox(mpOpenCLWhiteAndBlackListBox, rSet); mpOpenCLWhiteAndBlackListBox->SelectEntry(format(newImpl)); +#endif } } commit 169e1058d50cca32f8ed8702c6f6a13a39fe899f Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Nov 7 19:05:11 2014 -0600 coverity#1251171 Missing break in switch Change-Id: Iefdeecc9fb2032d171cc2a353fe160dcd92050b2 diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 3a2f025..c3b3282 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -696,8 +696,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( break; case CAPTYPE_ALLCAP: aProposalList.Prepend( pCharClass->uppercase(aAddRplcTxt) ); + break; default: - aProposalList.Prepend( aAddRplcTxt ); + /* can't happen because of if ct == above */ + break; } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits