core.git: Branch 'libreoffice-24-2' - writerfilter/source

[Oliver Specht (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |    3 +++
 writerfilter/source/dmapper/PropertyIds.cxx  |    1 +
 writerfilter/source/dmapper/PropertyIds.hxx  |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit 02ecd57a8364b4ca049c59a978c3b16c0389a6cd
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Thu Feb 15 10:27:03 2024 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Feb 20 14:30:28 2024 +0100

    tdf#159730 add compatibility option in RTF import
    
    Set IgnoreTabsAndBlanksForLineCalculation in RTF import to improve 
formatting.
    
    Change-Id: If0129f748c48400f1dd882672b5779f62e685ecd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163429
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins
    (cherry picked from commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163614

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 7e4eeda7d3d9..bbeafa942de4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,6 +129,9 @@ DomainMapper::DomainMapper( const uno::Reference< 
uno::XComponentContext >& xCon
         m_pImpl->SetDocumentSettingsProperty(
             getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
             uno::Any(true));
+        m_pImpl->SetDocumentSettingsProperty(
+            getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
+            uno::Any(true));
 
         // Don't load the default style definitions to avoid weird mix
         m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", 
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index b8b4efc06222..8a83ca0bb064 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,6 +384,7 @@ namespace
         { PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
         { PROP_DECORATIVE, u"Decorative"},
         { PROP_PAPER_TRAY, u"PrinterPaperTray"},
+        { PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION, 
u"IgnoreTabsAndBlanksForLineCalculation"},
     });
 } // end anonymous ns
 
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index b39fcd24fa49..bb2fb833516c 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,6 +383,7 @@ enum PropertyIds
         ,PROP_RTL_GUTTER
         ,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
         ,PROP_PARA_CONNECT_BORDERS
+        ,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
     };
 
 //Returns the UNO string equivalent to eId.