Resolves: tdf#86845 hyperlink details not retained between tabs

Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2
(cherry picked from commit eb38493c)
(cherry picked from commit e34e0c8d)
Reviewed-on: https://gerrit.libreoffice.org/20549Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit b8256732)

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);