diff options
| author | Henning Brinkmann <hbrinkm@openoffice.org> | 2011-01-05 13:43:48 +0100 |
|---|---|---|
| committer | Henning Brinkmann <hbrinkm@openoffice.org> | 2011-01-05 13:43:48 +0100 |
| commit | 7efe40c915619ac4f1ca5d5a26641a10aeafe418 (patch) | |
| tree | 2eeea967924270983c05791280dc8f561f406fa4 /writerfilter | |
| parent | f1896f1247ff93549a9e52dde90df8ade994daed (diff) | |
DomainMapper_Impl::finishParagraph: check if pParaContext is valid
DomainMapperTableHandler::endTable: catch all exceptions
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 1a5f45fe5bac..c6869aca5f2b 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -734,14 +734,14 @@ void DomainMapperTableHandler::endTable() dmapper_logger->chars("failed to import table!"); #endif } -#ifdef DEBUG_DMAPPER_TABLE_HANDLER catch ( uno::Exception e ) { +#ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("exception"); dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( )); dmapper_logger->endElement("exeception"); - } #endif + } } m_aTableProperties.reset(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 92349beaf70d..11d03655b5db 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -629,7 +629,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) dmapper_logger->attribute("isTextAppend", xTextAppend.is()); #endif - if(xTextAppend.is() && ! getTableManager( ).isIgnore()) + if(xTextAppend.is() && ! getTableManager( ).isIgnore() && pParaContext != NULL) { try { @@ -648,7 +648,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) old _and_ new DropCap must not occur */ - bool bIsDropCap = pParaContext->IsFrameMode() && sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none; + bool bIsDropCap = + pParaContext->IsFrameMode() && + sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none; + style::DropCapFormat aDrop; ParagraphPropertiesPtr pToBeSavedProperties; bool bKeepLastParagraphProperties = false; |