Resolves: tdf#86845 hyperlink details not retained between tabs

Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2 (cherry picked from commit eb38493c)

Resolves: tdf#86845 hyperlink details not retained between tabs
Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2 (cherry picked from commit eb38493c)
e34e0c8d · Caolán McNamara · 28b5fb6a · e34e0c8d
Kaydet (Commit) e34e0c8d authored Ara 09, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

iconcdlg.cxx cui/source/dialogs/iconcdlg.cxx +2 -2

No files found.
--- 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);