[Libreoffice-commits] core.git: svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jul 25 10:43:53 UTC 2018
svx/source/form/datanavi.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e161206709ea4bd6182fa9feeedf4b3f08231fe5
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 25 10:18:56 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 25 12:43:25 2018 +0200
Resolves: tdf#118862 new instances cannot be edited
Change-Id: I9b10ff4f043949c7140852ac9ad9106ca611c98c
Reviewed-on: https://gerrit.libreoffice.org/57960
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index c7d65c0b0c91..b23bcbba4391 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;
More information about the Libreoffice-commits
mailing list