From 84c8ca6fd52d14af51c41a98189c681f415f4461 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 25 Aug 2026 12:16:00 +0500 Subject: [PATCH] Address review comments See https://gerrit.collaboraoffice.com/c/online/+/9927 Signed-off-by: Mike Kaganski Change-Id: I6139405c1285914323a4c2e0b3ef6ace0034195b Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/9953 Tested-by: Jenkins CPCI Reviewed-by: Miklos Vajna (cherry picked from commit 609c2a17a654452409ec090c47351b49c4990349) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210335 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- sc/source/filter/excel/xeescher.cxx | 4 ++-- sc/source/filter/oox/drawingfragment.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 0fab6991bc94..b8b81aeb24f4 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -864,8 +864,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mnXclFont = GetFontBuffer().Insert(maFontData, EXC_COLOR_CTRLTEXT); } - // Align holds the model default - centered on a button, left elsewhere - where the - // control has it at all; VerticalAlign is void unless set, and the member default centers + // The default for Align is centered on a button, left elsewhere; the default for + // VerticalAlign is center if (sal_Int16 nApiHorAlign = 0; aCtrlProp.GetProperty(nApiHorAlign, u"Align"_ustr)) { switch (nApiHorAlign) diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 4492c35b1580..4c0e27ac5ad6 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -907,7 +907,7 @@ void VmlDrawing::convertControlFontData( AxFontData& rAxFontData, sal_uInt32& rn { if (OUString aFontId; rFontModel.moUnderlineClass.value().startsWith(u"font", &aFontId)) { - if (FontRef rxFont = getStyles().getFont(aFontId.toInt32()); rxFont) + if (FontRef rxFont = getStyles().getFont(aFontId.toInt32())) rAxFontData.mbDblUnderline = (rxFont->getModel().mnUnderline == XML_double) || (rxFont->getModel().mnUnderline == XML_doubleAccounting);