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

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Thu May 27 13:11:08 UTC 2021


 writerfilter/source/dmapper/NumberingManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3e4c05ce6feaebebb269f1c984a92c1175061a4
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Fri May 14 11:29:05 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Thu May 27 15:10:31 2021 +0200

    tdf#94628: sw: allow setting for bullet style for outline paragraphs
    
    Since LO 7.0 commit cad788328ec6ef4b3071cf9002dfac12347562da
    allowed bullets in the outline, I think you also want to be able
    to set the character style, wouldn't you?
    
    In any case, isOutlineNumbering is basically a meaningless
    and inaccurate concept anyway, so just get rid of that
    ancient clause.
    
    Change-Id: I2e40a3749b4a18864585c309349ea0e4ba73a9da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115613
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index ac8a9a4216eb..f7ee07c9c98c 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -268,7 +268,7 @@ uno::Sequence<beans::PropertyValue> ListLevel::GetLevelProperties(bool bDefaults
     }
 
     std::optional<PropertyMap::Property> aPropFont = getProperty(PROP_CHAR_FONT_NAME);
-    if(aPropFont && !isOutlineNumbering())
+    if (aPropFont)
         aNumberingProperties.emplace_back( getPropertyName(PROP_BULLET_FONT_NAME), 0, aPropFont->second, beans::PropertyState_DIRECT_VALUE );
 
     return comphelper::containerToSequence(aNumberingProperties);


More information about the Libreoffice-commits mailing list