diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 17:15:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 17:18:29 +0000 |
commit | e34e0c8d97b90786e9ca9cf88d9fc3e127ce8350 (patch) | |
tree | d8e12c7cf62d816bc0a008bf26cf889f7fc65450 | |
parent | 28b5fb6aa23ab060cf4ca99097532749e9d4403a (diff) |
Resolves: tdf#86845 hyperlink details not retained between tabs
Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2
(cherry picked from commit eb38493c4101d8777052267ee83a5d4f883dd9ac)
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index c265576032e6..575064151ff0 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -333,8 +333,6 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) { sal_uInt16 nOldPageId = GetCurPageId(); bool bInvalidate = nOldPageId != nId; - SetCurPageId(nId); - ActivatePageImpl(); if (bInvalidate) { IconChoicePageData* pOldData = GetPageData(nOldPageId); @@ -346,6 +344,8 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) Invalidate(); } + SetCurPageId(nId); + ActivatePageImpl(); IconChoicePageData* pNewData = GetPageData(nId); if (pNewData && pNewData->pPage) ShowPageImpl(pNewData); |