diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 17:15:10 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-10 16:14:51 +0100 |
| commit | a2920ac6cd255cf27e51de58113c915ff53733fc (patch) | |
| tree | 7302793c4f2a42a4dc7cdea31c9a9c745e96ed35 | |
| parent | fbff9f884dbf5aa1dc962d5b608c6ae1941a50ff (diff) | |
Resolves: tdf#86845 hyperlink details not retained between tabs
Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2
(cherry picked from commit eb38493c4101d8777052267ee83a5d4f883dd9ac)
(cherry picked from commit e34e0c8d97b90786e9ca9cf88d9fc3e127ce8350)
Reviewed-on: https://gerrit.libreoffice.org/20549
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit b82567327fa64ceb7d486774df3ac9c95763009c)
| -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 0b77226a9512..d6eab9a6a4a7 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); |