[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - svx/source

[Libreoffice Gerrit user]

 svx/source/form/datanavi.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6f8e4f7df7190ce1a1751bf968a5d899e95bc1b9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 25 10:18:56 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Aug 2 17:39:30 2018 +0200

    Resolves: tdf#118862 new instances cannot be edited
    
    Change-Id: I9b10ff4f043949c7140852ac9ad9106ca611c98c
    Reviewed-on: https://gerrit.libreoffice.org/57962
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 2446606e373d..bb4732cd945c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1760,7 +1760,7 @@ namespace svxform
 
     bool DataNavigatorWindow::IsAdditionalPage(sal_uInt16 nId) const
     {
-        return m_pTabCtrl->GetPagePos(nId) >= 3;
+        return m_pTabCtrl->GetPageName(nId).isEmpty();
     }
 
     IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void )
@@ -1914,8 +1914,10 @@ namespace svxform
                 XFormsPage* pPage = GetCurrentPage( nId );
                 DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" );
                 if (IsAdditionalPage(nId) || m_pTabCtrl->GetPageName(nId) == "instance")
+                {
                     // instance page
                     nPagePos = m_pTabCtrl->GetPagePos( nId );
+                }
                 m_bIsNotifyDisabled = true;
                 OUString sText = pPage->SetModel( xFormsModel, nPagePos );
                 m_bIsNotifyDisabled = false;