summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-25 10:18:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-07-25 12:43:25 +0200
commite161206709ea4bd6182fa9feeedf4b3f08231fe5 (patch)
treedb4dc0d26a6e35b040fabcaefb1ece0fba6d8a8b /svx
parent1ac55de4674035c7306df4d66db088c3b8f99438 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/datanavi.cxx4
1 files changed, 3 insertions, 1 deletions
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;