Address review comments
See https://gerrit.collaboraoffice.com/c/online/+/9927 Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com> Change-Id: I6139405c1285914323a4c2e0b3ef6ace0034195b Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/9953 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 609c2a17a654452409ec090c47351b49c4990349) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210335 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
committed by
Xisco Fauli
parent
ecf0efa073
commit
84c8ca6fd5
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user