summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2024-12-11 20:00:33 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2024-12-19 17:16:26 +0100
commit0e3caf174a6a926d4780ac8abbad6f871c8faa75 (patch)
tree0b8eef3209084fd2ba37c136fe3e9b84cb6dd0d9
parent0c6756652fe9a189aca80774eb167439b5b087eb (diff)
fix ruby style name handling in SwXStyle::SetPropertyValue
code dates back to commit 023a58b5fbbf3b30692f4b66d5f5b07c28270934 Author: Oliver Specht <os@openoffice.org> Date: Mon Feb 19 07:04:57 2001 +0000 ruby properties added Both the other places in sw/ that CharFormatName from SwFormatRuby expect it to be a UIName not a programmatic name. Change-Id: Ic02670f6c7ca7bacc6cd30cd48642f32eb9beb29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178331 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit f15c86221b41739a578c8a9b15046b20b43cb8c1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178342 (cherry picked from commit baa997a412f1f87e4fe55af3927a685934dbcaba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178803 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index a6efe66e988a..45ba12a4e6fe 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1831,11 +1831,11 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_TXTATR_CJK_RUBY)>(const SfxItemPr
pRuby.reset(new SwFormatRuby(OUString()));
OUString sStyle;
SwStyleNameMapper::FillUIName(sValue, sStyle, SwGetPoolIdFromName::ChrFmt);
- pRuby->SetCharFormatName(sValue);
+ pRuby->SetCharFormatName(sStyle);
pRuby->SetCharFormatId(0);
if(!sValue.isEmpty())
{
- const sal_uInt16 nId(SwStyleNameMapper::GetPoolIdFromUIName(sValue, SwGetPoolIdFromName::ChrFmt));
+ const sal_uInt16 nId(SwStyleNameMapper::GetPoolIdFromUIName(sStyle, SwGetPoolIdFromName::ChrFmt));
pRuby->SetCharFormatId(nId);
}
rStyleSet.Put(std::move(pRuby));