diff options
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo55381.docx | bin | 4710 -> 0 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 12 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 |
4 files changed, 7 insertions, 33 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo55381.docx b/sw/qa/extras/ooxmlimport/data/fdo55381.docx Binary files differdeleted file mode 100644 index ffeae1f874eb..000000000000 --- a/sw/qa/extras/ooxmlimport/data/fdo55381.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 6c2f3a725bca..1c8665b7a480 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1645,15 +1645,6 @@ DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas, "strict-lockedcanvas.docx") getShape(1); } -DECLARE_OOXMLIMPORT_TEST(testFdo55381, "fdo55381.docx") -{ - uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); - uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); - uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); - xCursor->jumpToLastPage(); - CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor->getPage()); -} - #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index c7625e35033b..dbb16d0b8427 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3643,18 +3643,6 @@ void DomainMapper::lcl_endSectionGroup() { m_pImpl->CheckUnregisteredFrameConversion(); m_pImpl->ExecuteFrameConversion(); - if(m_pImpl->GetIsFirstParagraphInSection()) - { - // This section has no paragraph at all (e.g. they are all actually in a frame). - // If this section has a page break, there would be nothing to apply to the page - // style, so force a dummy paragraph. - lcl_startParagraphGroup(); - lcl_startCharacterGroup(); - sal_uInt8 sBreak[] = { 0xd }; - lcl_text(sBreak, 1); - lcl_endCharacterGroup(); - lcl_endParagraphGroup(); - } PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_SECTION); SectionPropertyMap* pSectionContext = dynamic_cast< SectionPropertyMap* >( pContext.get() ); OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 65916731df98..7fe53ae8c9a9 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1140,6 +1140,12 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) uno::Reference< text::XTextRange > xParaEnd( xCur, uno::UNO_QUERY ); CheckParaRedline( xParaEnd ); + m_bIsFirstParaInSection = false; + m_bIsLastParaInSection = false; + m_bParaChanged = false; + + // Reset the frame properties for the next paragraph + pParaContext->ResetFrameProperties(); } if( !bKeepLastParagraphProperties ) rAppendContext.pLastParagraphProperties = pToBeSavedProperties; @@ -1148,22 +1154,11 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) { OSL_FAIL( "IllegalArgumentException in DomainMapper_Impl::finishParagraph" ); } - catch(const uno::Exception& e) + catch(const uno::Exception&) { - SAL_WARN( "writerfilter", "finishParagraph() exception: " << e.Message ); } } - m_bParaChanged = false; - if(!pParaContext->IsFrameMode()) - { // If the paragraph is in a frame, it's not a paragraph of the section itself. - m_bIsFirstParaInSection = false; - m_bIsLastParaInSection = false; - } - - // Reset the frame properties for the next paragraph - pParaContext->ResetFrameProperties(); - #ifdef DEBUG_DOMAINMAPPER dmapper_logger->endElement(); #endif |