[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

[Caolán McNamara]

 cui/source/dialogs/iconcdlg.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e34e0c8d97b90786e9ca9cf88d9fc3e127ce8350
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 9 17:15:10 2015 +0000

    Resolves: tdf#86845 hyperlink details not retained between tabs
    
    Change-Id: Ib6c1df4a97598c156b10b1730debb078e362e0d2
    (cherry picked from commit eb38493c4101d8777052267ee83a5d4f883dd9ac)

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index c265576..5750641 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);