[Libreoffice-commits] core.git: sfx2/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue May 21 07:54:30 UTC 2019


 sfx2/source/dialog/tabdlg.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d92d98b35bb1846c82b401a53392a64118f51da2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 20 21:36:34 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 21 09:53:24 2019 +0200

    tdf#125384 allow setting initial tabpage before dialog is running
    
    Change-Id: I79ad38e05e6b66089a0ed47d4054d416b8c61ff8
    Reviewed-on: https://gerrit.libreoffice.org/72633
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 65d0e1e54d62..32ab60c49776 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1535,9 +1535,8 @@ IMPL_LINK(SfxTabDialogController, DeactivatePageHdl, const OString&, rPage, bool
     }
 
     VclPtr<SfxTabPage> pPage = pDataObject->pTabPage;
-    DBG_ASSERT( pPage, "no active Page" );
     if (!pPage)
-        return false;
+        return true;
 
     DeactivateRC nRet = DeactivateRC::LeavePage;
 


More information about the Libreoffice-commits mailing list