[Libreoffice-commits] core.git: desktop/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 20 11:22:46 UTC 2019
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 12 +-----------
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2 +-
2 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 9b231713790c6e94eb64c3fc108ce99ebd2b90af
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 09:10:45 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 20 13:21:34 2019 +0200
Related: tdf#127645 return value is unused
which is handy, cause its wrong anyway
Change-Id: I0b52b3ac55c264dcd53acaa80f505cabd54faa15
Reviewed-on: https://gerrit.libreoffice.org/79270
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e55a7ea717eb..c68fab086eaf 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -531,23 +531,13 @@ IMPL_LINK(UpdateDialog, entryToggled, const row_col&, rRowCol, void)
enableOk();
}
-sal_uInt16 UpdateDialog::insertItem(UpdateDialog::Index *pEntry, bool bEnabledCheckBox)
+void UpdateDialog::insertItem(UpdateDialog::Index *pEntry, bool bEnabledCheckBox)
{
int nEntry = m_xUpdates->n_children();
m_xUpdates->append();
m_xUpdates->set_toggle(nEntry, bEnabledCheckBox ? TRISTATE_TRUE : TRISTATE_FALSE, 0);
m_xUpdates->set_text(nEntry, pEntry->m_aName, 1);
m_xUpdates->set_id(nEntry, OUString::number(reinterpret_cast<sal_Int64>(pEntry)));
-
- for (sal_uInt16 i = nEntry; i != 0 ;)
- {
- i -= 1;
- UpdateDialog::Index const * p = reinterpret_cast< UpdateDialog::Index const * >(m_xUpdates->get_id(i).toInt64());
- if ( p == pEntry )
- return i;
- }
- OSL_ASSERT(false);
- return 0;
}
void UpdateDialog::addAdditional(UpdateDialog::Index * index, bool bEnabledCheckBox)
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index d5b4f841c48c..e9cfd6f234f8 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -99,7 +99,7 @@ private:
friend class CheckListBox;
- sal_uInt16 insertItem(UpdateDialog::Index *pIndex, bool bEnableCheckBox);
+ void insertItem(UpdateDialog::Index *pIndex, bool bEnableCheckBox);
void addAdditional(UpdateDialog::Index *pIndex, bool bEnableCheckBox);
bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
More information about the Libreoffice-commits
mailing list