diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-20 19:52:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-21 20:12:45 +0200 |
| commit | c4f96bdb57d7d6a1e51bebcf6c1d23e8deed5379 (patch) | |
| tree | d876a1ee0ba4decb985a21c7b09ef7289b7482fb | |
| parent | 574c437319e9f6b19b7cd83d397c6d0f06064c21 (diff) | |
aUS is always empty
Change-Id: I77ae732ea4bcaf0e76acb71fd8886af6b36d8284
Reviewed-on: https://gerrit.libreoffice.org/62101
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 9147492639e6..a652ca151881 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -455,7 +455,7 @@ void IconChoiceDialog::ResetPageImpl () | \**********************************************************************/ -const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) +const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& ) { if ( pSet ) { @@ -465,25 +465,9 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) if ( pRanges ) return pRanges.get(); - std::vector<sal_uInt16> aUS; - size_t nCount = maPageList.size(); - - // remove double Id's - { - nCount = aUS.size(); - for ( size_t i = 0; i < nCount; ++i ) - aUS[i] = rPool.GetWhich( aUS[i] ); - } - - if ( aUS.size() > 1 ) - { - std::sort( aUS.begin(), aUS.end() ); - } - - pRanges.reset(new sal_uInt16[aUS.size() + 1]); - std::copy( aUS.begin(), aUS.end(), pRanges.get() ); - pRanges[aUS.size()] = 0; + pRanges.reset(new sal_uInt16[1]); + pRanges[0] = 0; return pRanges.get(); } |