use helpers some more

Change-Id: Ia448046b41d6d7594b1ff6f630dbbd4217e13732

sw/source/core/unocore/unotbl.cxx

@@ -2108,9 +2108,7 @@ uno::Reference< table::XTableColumns >  SwXTextTable::getColumns(void) throw( un
 uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(!pFmt)
-        throw uno::RuntimeException();
     SwTable* pTable = SwTable::FindTable(pFmt);
     SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox(sCellName));
     if(!pBox)
@@ -2136,9 +2134,7 @@ uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(cons
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(!pFmt)
-        throw uno::RuntimeException();
     uno::Reference<text::XTextTableCursor> xRet;
     SwTable* pTable = SwTable::FindTable(pFmt);
     SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTblBox(sCellName));
@@ -2230,18 +2226,14 @@ uno::Reference<text::XTextRange>  SwXTextTable::getAnchor(void)
         throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt(GetFrmFmt());
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(!pFmt)
-        throw uno::RuntimeException();
     return new SwXTextRange(*pFmt);
 }
 
 void SwXTextTable::dispose(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(!pFmt)
-        throw uno::RuntimeException();
     SwTable* pTable = SwTable::FindTable(pFmt);
     SwSelBoxes aSelBoxes;
     for(auto& rBox : pTable->GetTabSortBoxes() )
@@ -2345,12 +2337,8 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCellRange >  aRef;
-    SwFrmFmt* pFmt(GetFrmFmt());
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(pFmt)
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFmt), static_cast<cppu::OWeakObject*>(this));
-    {
-        SwTable* pTable = SwTable::FindTable( pFmt );
-        if(!pTable->IsTblComplex())
-        {
     sal_Int32 nPos = 0;
     const OUString sTLName(sRange.getToken(0, ':', nPos));
     const OUString sBRName(sRange.getToken(0, ':', nPos));
@@ -2367,9 +2355,6 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin
     // point to the top-left and bottom-right cells
     aDesc.Normalize();
     return GetRangeByName(pFmt, pTable, sTLName, sBRName, aDesc);
-        }
-    }
-    throw uno::RuntimeException();
 }
 
 uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
@@ -2573,12 +2558,8 @@ void SwXTextTable::autoFormat(const OUString& sAutoFmtName)
            std::exception)
 {
     SolarMutexGuard aGuard;
-    SwFrmFmt* pFmt = GetFrmFmt();
+    SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this));
-    if(pFmt)
+    SwTable* pTable = lcl_EnsureTableNotComplex(SwTable::FindTable(pFmt), static_cast<cppu::OWeakObject*>(this));
-    {
-        SwTable* pTable = SwTable::FindTable( pFmt );
-        if(!pTable->IsTblComplex())
-        {
     SwTableAutoFmtTbl aAutoFmtTbl;
     aAutoFmtTbl.Load();
     for (size_t i = aAutoFmtTbl.size(); i;)
@@ -2595,10 +2576,6 @@ void SwXTextTable::autoFormat(const OUString& sAutoFmtName)
             pFmt->GetDoc()->SetTableAutoFmt( aBoxes, aAutoFmtTbl[i] );
             break;
         }
-        }
-    }
-    else
-        throw uno::RuntimeException();
 }
 
 uno::Reference< beans::XPropertySetInfo >  SwXTextTable::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception )
@@ -3622,24 +3599,16 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
 }
 
 void SwXCellRange::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
-{
+    { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
-    OSL_FAIL("not implemented");
-}
 
 void SwXCellRange::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
-{
+    { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
-    OSL_FAIL("not implemented");
-}
 
 void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
-{
+    { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
-    OSL_FAIL("not implemented");
-}
 
 void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
-{
+    { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
-    OSL_FAIL("not implemented");
-}
 
 void SwXCellRange::GetDataSequence(
         uno::Sequence< uno::Any >   *pAnySeq,   //-> first pointer != 0 is used