diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-22 13:12:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-22 13:13:05 +0000 |
| commit | 1c15a20df81fef594ef8fa887247aef9f2248c28 (patch) | |
| tree | c2308bf3962efdc44d0391b26eaddb3b1155ae1f /cui | |
| parent | 875c5905c71635c8e75d0756cc86d953523726e2 (diff) | |
loplugin:unusedmethods unused returns
Change-Id: I4da3374e31d3c7407b401d66275da7f56ae83d30
Reviewed-on: https://gerrit.libreoffice.org/29178
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 9 | ||||
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 3e38e4da4bf1..d104557001f4 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -682,7 +682,7 @@ bool IconChoiceDialog::OK_Impl() } -short IconChoiceDialog::Ok() +void IconChoiceDialog::Ok() { bInOK = true; @@ -693,7 +693,6 @@ short IconChoiceDialog::Ok() else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } - bool _bModified = false; for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { @@ -709,18 +708,12 @@ short IconChoiceDialog::Ok() if ( pPage->FillItemSet( &aTmp ) ) { - _bModified = true; pExampleSet->Put( aTmp ); pOutSet->Put( aTmp ); } } } } - - if ( _bModified || ( pOutSet && pOutSet->Count() > 0 ) ) - _bModified = true; - - return _bModified ? RET_OK : RET_CANCEL; } void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 6f9eda810afd..eb8a7432f576 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -146,7 +146,7 @@ protected: void DeActivatePageImpl (); void ResetPageImpl (); - short Ok(); + void Ok(); public: |