diff options
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 10 |
5 files changed, 25 insertions, 3 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index e42df415e2b1..d8406dcdb6c2 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) } return xLoader->filter( aArgs ); - }catch(const uno::Exception&) + }catch(...) {} } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 0817150b20f8..7be23f36612c 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes ) { + if (rTableNodes.empty()) + return NULL; + + std::vector<SwNodeRange> rFirstRange = *rTableNodes.begin(); + + if (rFirstRange.empty()) + return NULL; + /* Save first node in the selection if it is a content node. */ - SwCntntNode * pSttCntntNd = rTableNodes.begin()->begin()->aStart.GetNode().GetCntntNode(); + SwCntntNode * pSttCntntNd = rFirstRange.begin()->aStart.GetNode().GetCntntNode(); /**debug**/ #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 08e6ce57d7bd..2334391a9729 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) std::vector<VerticallyMergedCell> aMergedCells; SwTable const*const pTable = m_pImpl->m_pDoc->TextToTable( aTableNodes ); + + if (!pTable) + return uno::Reference< text::XTextTable >(); + SwXTextTable *const pTextTable = new SwXTextTable( *pTable->GetFrmFmt() ); const uno::Reference< text::XTextTable > xRet = pTextTable; const uno::Reference< beans::XPropertySet > xPrSet = pTextTable; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 17b48da7cf1e..89a71f1d2ede 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction() double nFullWidth = m_nTableWidth; //the positions have to be distibuted in a range of 10000 const double nFullWidthRelative = 10000.; - if( pTableGrid->size() == nGrids ) + if( pTableGrid->size() == nGrids && m_nCell > 0 ) { uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell - 1 ); text::TableColumnSeparator* pSeparators = aSeparators.getArray(); diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index d6dc3ca1027d..125319e6deeb 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword() { aBuf.append(ch); Strm() >> ch; + if (Strm().IsEof()) + { + ch = ' '; + break; + } } if (aBuf.getLength() > 32) // See RTF spec v1.9.1, page 7 @@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword() { aParameter.append(ch); Strm() >> ch; + if (Strm().IsEof()) + { + ch = ' '; + break; + } } nParam = aParameter.makeStringAndClear().toInt32(); if (bNeg) |