diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-25 10:18:56 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-26 00:49:43 +0200 |
| commit | 239ce8ea56527c96bd1b30b68a3448872f382b47 (patch) | |
| tree | f3e385bc7f63e00f5af4681f5444b3ce451f63af | |
| parent | 39bf66b0384182970939334c98743551e7e95910 (diff) | |
Resolves: tdf#118862 new instances cannot be edited
Change-Id: I9b10ff4f043949c7140852ac9ad9106ca611c98c
Reviewed-on: https://gerrit.libreoffice.org/57963
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | svx/source/form/datanavi.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 076a4c35c291..5e077453f6ff 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1756,7 +1756,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 ) @@ -1910,8 +1910,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; |