diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 08:58:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 09:00:06 +0100 |
| commit | 25ab24b4c4fe748a05a59fb4eba0b2f96e71da38 (patch) | |
| tree | 03a4dcb3225d3bc278322affa3545c1dd32eec07 /cui/source/dialogs/iconcdlg.cxx | |
| parent | 1bc9a5a909be343520ce31b7c9a79998fabf65a2 (diff) | |
Resolves: tdf#100896 crash in hyperlink dialog
regression from...
commit 98747742b20c82382ed16b193e7bec175e905978
Author: Noel Grandin <noel@peralex.com>
Date: Fri Jun 24 13:12:25 2016 +0200
loplugin:singlevalfields in cui
which cut too deep
Change-Id: I0e42eed48196c9e037ba343eea93c2c854c0991c
Diffstat (limited to 'cui/source/dialogs/iconcdlg.cxx')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 1a8973017573..fbaaf4753159 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -412,7 +412,17 @@ void IconChoiceDialog::ActivatePageImpl () { if ( !pData->pPage ) { - pData->pPage = (pData->fnCreatePage)( m_pTabContainer, this, *CreateInputItemSet( mnCurrentPageId ) ); + const SfxItemSet* pTmpSet = nullptr; + + if ( pSet ) + { + pTmpSet = pSet; + } + + if ( pTmpSet ) + pData->pPage = (pData->fnCreatePage)( m_pTabContainer, this, *pTmpSet ); + else + pData->pPage = (pData->fnCreatePage)( m_pTabContainer, this, *CreateInputItemSet( mnCurrentPageId ) ); pData->pPage->Reset( *pSet ); |