diff options
author | Justin Luth <justin_luth@sil.org> | 2018-07-04 08:01:23 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-07-04 17:45:21 +0200 |
commit | 58eb31be2dff045aa29e328c73a505104181b563 (patch) | |
tree | d85b6e01ccca8f8c9ae986aae4c6bc96507e250c /writerfilter | |
parent | Check for HasAttrFlags::Protected instead ATTR_PROTECTION, tdf#68290 follow-up (diff) | |
download | core-58eb31be2dff045aa29e328c73a505104181b563.tar.gz core-58eb31be2dff045aa29e328c73a505104181b563.zip |
tdf#82175 writerfilter: honor basedOn -none- for built-in styles
This section of code was introduced when
LO 5.3 commit b79b5e0d for tdf#53856 reset built-in inheritance to
Standard. (Not sure why I didn't try "none" at that time.)
This commit prevents settings specifically applied to LO's "Default"
paragraph style from affecting built-in styles that have been
re-defined by the document settings to not have any parent.
I don't know why this commit would cause regressions, but it probably
will so committing early in 6.2 development. Since both "Standard" and
every other built-in style has had LO-specific settings cleared
by SetPropertiesToDefault(), they ought to be identical, so
dependence on "Standard" should be irrelevant for default values.
Change-Id: Ie306d036f8667ef9ae1d51678f4e8e108d754641
Reviewed-on: https://gerrit.libreoffice.org/56919
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 1047d9c20904..7bb43fe5c6de 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -938,7 +938,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) && pEntry->sBaseStyleIdentifier.isEmpty() && !xStyle->getParentStyle().isEmpty() ) { - xStyle->setParentStyle( "Standard" ); + xStyle->setParentStyle( "" ); } } } |