summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-09 17:15:10 +0000
committerDavid Tardon <dtardon@redhat.com>2015-12-10 14:29:09 +0000
commitb82567327fa64ceb7d486774df3ac9c95763009c (patch)
tree6b224c03265971ac933d7abfc7dba6d1b511187a /cui/source
parent75f25d00848068c677fca450d35aa59af0422c60 (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>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/dialogs/iconcdlg.cxx4
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);