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:54 +0200 |
| commit | 9b18192fc3af465fb424dd8d5a81cd46fc3331b6 (patch) | |
| tree | b8342bab922c3786a5dc567e242d770030cd10cf | |
| parent | 9becb1824d95caa5905b1192c515ac5b732c45f5 (diff) | |
Resolves: tdf#118862 new instances cannot be edited
Change-Id: I9b10ff4f043949c7140852ac9ad9106ca611c98c
Reviewed-on: https://gerrit.libreoffice.org/57961
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 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; |