diff options
-rw-r--r-- | vcl/source/window/btndlg.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 3c9880134a86..94862da3826d 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -322,8 +322,7 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId, void ButtonDialog::RemoveButton( sal_uInt16 nId ) { - btn_iterator it; - for (it = maItemList.begin(); it != maItemList.end(); ++it) + for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it) { if (it->mnId == nId) { @@ -333,12 +332,11 @@ void ButtonDialog::RemoveButton( sal_uInt16 nId ) delete it->mpPushButton; maItemList.erase(it); - break; + return; } } - if (it == maItemList.end()) - SAL_WARN( "vcl.window", "ButtonDialog::RemoveButton(): ButtonId invalid" ); + SAL_WARN( "vcl.window", "ButtonDialog::RemoveButton(): ButtonId invalid" ); } void ButtonDialog::Clear() |