fail early, limit scope

Change-Id: I0acd496c6276c59c0c53b1ee9503897800771a44

1 files changed, 5 insertions, 3 deletions

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b59aa178eecb..2342be79ec30 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1754,14 +1754,16 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(!pUnoCrsr)
         return;
-    auto pSttNode = pUnoCrsr->GetNode().StartOfSectionNode();
-    const SwTableNode* pTblNode = pSttNode->FindTableNode();
-    lcl_FormatTable(pTblNode->GetTable().GetFrmFmt());
     auto pEntry(m_pPropSet->getPropertyMap().getByName(rPropertyName));
     if(!pEntry)
         throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
     if(pEntry->nFlags & beans::PropertyAttribute::READONLY)
         throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
+    {
+        auto pSttNode = pUnoCrsr->GetNode().StartOfSectionNode();
+        const SwTableNode* pTblNode = pSttNode->FindTableNode();
+        lcl_FormatTable(pTblNode->GetTable().GetFrmFmt());
+    }
     auto& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
     rTblCrsr.MakeBoxSels();
     SwDoc* pDoc = pUnoCrsr->GetDoc();