core.git: sw/source

[Ashok (via logerrit)]

 sw/source/core/unocore/unosett.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca44362491b8f823b4d36cddfd5e6242074cc211
Author:     Ashok <ashokemai...@yahoo.com>
AuthorDate: Wed Sep 11 13:45:23 2024 -0700
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 12 18:34:19 2024 +0200

    tdf#135335 Use font family name as the value of BulletFontName property
    
    instead of style name.
    
    Change-Id: Id1e5734384bc850435a084ae1b1d9610032e6161
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173238
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 0df88955250e..0dcea7091769 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1474,7 +1474,7 @@ uno::Sequence<beans::PropertyValue> 
SwXNumberingRules::GetPropertiesForNumFormat
             
aPropertyValues.push_back(comphelper::makePropertyValue(u"BulletChar"_ustr, 
aUString));
 
             //BulletFontName
-            aUString = pFont ? pFont->GetStyleName() : OUString();
+            aUString = pFont ? pFont->GetFamilyName() : OUString();
             
aPropertyValues.push_back(comphelper::makePropertyValue(u"BulletFontName"_ustr, 
aUString));
 
             //BulletFont
@@ -1640,7 +1640,7 @@ uno::Any SwXNumberingRules::GetPropertyForNumFormat(
             if (rPropName == u"BulletFontName"_ustr)
             {
                 std::optional<vcl::Font> pFont = rFormat.GetBulletFont();
-                return uno::Any(pFont ? pFont->GetStyleName() : OUString());
+                return uno::Any(pFont ? pFont->GetFamilyName() : OUString());
             }
 
             //BulletFont