From 21de55596c0fdc2be736c6d0369bd9d3783020be Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 28 Nov 2018 15:13:42 +0200 Subject: remove unnecessary "if (!empty()" checks before loops found with git grep -n -A4 'if.*!.*empty' | grep -B3 -P '(\bfor)|(\bwhile)|(\bdo)' Change-Id: I582235b7cf977a0f9fb4099eb306fdb4a07b5334 Reviewed-on: https://gerrit.libreoffice.org/64169 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/doc/saveastemplatedlg.cxx | 7 ++----- sfx2/source/doc/templatedlg.cxx | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'sfx2/source') diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 5a6a12277f8d..b801462e877a 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -113,11 +113,8 @@ void SfxSaveAsTemplateDialog::initialize() void SfxSaveAsTemplateDialog::SetCategoryLBEntries(const std::vector& rFolderNames) { - if (!rFolderNames.empty()) - { - for (size_t i = 0, n = rFolderNames.size(); i < n; ++i) - m_xLBCategory->insert_text(i+1, rFolderNames[i]); - } + for (size_t i = 0, n = rFolderNames.size(); i < n; ++i) + m_xLBCategory->insert_text(i+1, rFolderNames[i]); m_xLBCategory->select(0); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index c78cf5b002ac..717eabb934c2 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -344,11 +344,8 @@ void SfxTemplateManagerDlg::fillFolderComboBox() { std::vector aFolderNames = mpLocalView->getFolderNames(); - if (!aFolderNames.empty()) - { - for (size_t i = 0, n = aFolderNames.size(); i < n; ++i) - mpCBFolder->InsertEntry(aFolderNames[i], i+1); - } + for (size_t i = 0, n = aFolderNames.size(); i < n; ++i) + mpCBFolder->InsertEntry(aFolderNames[i], i+1); mpCBFolder->SelectEntryPos(0); mpActionMenu->HideItem(MNI_ACTION_RENAME_FOLDER); } @@ -1377,11 +1374,8 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, weld::TreeView&, v void SfxTemplateCategoryDialog::SetCategoryLBEntries(std::vector aFolderNames) { - if (!aFolderNames.empty()) - { - for (size_t i = 0, n = aFolderNames.size(); i < n; ++i) - mxLBCategory->append_text(aFolderNames[i]); - } + for (size_t i = 0, n = aFolderNames.size(); i < n; ++i) + mxLBCategory->append_text(aFolderNames[i]); mxLBCategory->select(0); } -- cgit