[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source

[Luboš Luňák]

 dev/null                                          |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx          |    9 ---------
 writerfilter/source/dmapper/DomainMapper.cxx      |   12 ------------
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   19 +++++++------------
 4 files changed, 7 insertions(+), 33 deletions(-)

New commits:
commit ac66504fb119bfbbac3076d6e2fe875ec2e2ff89
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Mon Apr 21 19:25:43 2014 +0200

    Revert "handle properly page breaks even if a page contains only a frame (fdo#55381)"
    
    I didn't mean to push without review.
    
    This reverts commit a859ff2db69457cc98c257d377f68c8786c50fa2.

diff --git a/sw/qa/extras/ooxmlimport/data/fdo55381.docx b/sw/qa/extras/ooxmlimport/data/fdo55381.docx
deleted file mode 100644
index ffeae1f..0000000
Binary files a/sw/qa/extras/ooxmlimport/data/fdo55381.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6c2f3a7..1c8665b 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 c7625e3..dbb16d0 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 6591673..7fe53ae8 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