summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2024-02-15 10:27:03 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2024-02-20 18:42:35 +0100
commit6dbe242fd16aada3e1f507e35334c6d416e00994 (patch)
tree536a6f80cf40ba6fbddc6ccc282266559b5a845e
parenttdf#155663 writerfilter: RTF import: don't lose \piccrop* (diff)
downloadcore-6dbe242fd16aada3e1f507e35334c6d416e00994.tar.gz
core-6dbe242fd16aada3e1f507e35334c6d416e00994.zip
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.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163655
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx3
-rw-r--r--writerfilter/source/dmapper/PropertyIds.cxx1
-rw-r--r--writerfilter/source/dmapper/PropertyIds.hxx1
3 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index c4001cf0fe61..ecd6ad6b242a 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 11ef07230fad..4069a9ac7fe5 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -378,6 +378,7 @@ namespace
{ PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"},
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
+ { 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 6708c6dfbf35..25099a684dcd 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -377,6 +377,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.