[Libreoffice-commits] core.git: writerfilter/source

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 11 19:32:35 UTC 2020


 writerfilter/source/dmapper/PropertyMap.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 98665425ebb5cdeeda341336871ca4da7f4842b7
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Tue Aug 11 09:14:39 2020 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Tue Aug 11 21:31:47 2020 +0200

    related tdf#135343 writerfilter: document broken nextColumn
    
    Fortunately, it is rather hard in Word to insert a nextColumn
    section-break, so this situation is rarely seen,
    and bug 135343's fix made it even more irrelevant.
    The fix includes unit tests demonstrating this problem.
    
    The column break should be inserted around m_xStartingRange,
    but the section should start from pPrevSection->m_xStartingRange
    and be extended include this section. But I have no idea
    how to do that.
    
    At least documenting that something is completely broken
    should be very useful for anyone drawn to this code.
    
    Change-Id: I878f99601bb2181500d215a0440a34a62f3840f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100461
    Tested-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 6b5af2fd9404..578738175238 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1536,6 +1536,10 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
         try
         {
             InheritOrFinalizePageStyles( rDM_Impl );
+            /*TODO tdf#135343: Just inserting a column break sounds like the right idea, but the implementation is wrong.
+             * Somehow, the previous column section needs to be extended to cover this new text.
+             * Currently, it is completely broken, producing a no-column section that starts on a new page.
+             */
             uno::Reference< beans::XPropertySet > xRangeProperties;
             if ( m_xStartingRange.is() )
             {


More information about the Libreoffice-commits mailing list