summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-05-24 16:40:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-05-25 07:52:21 +0200
commit839c5010241842835a1c066be0838df4a8a53dc7 (patch)
tree5b8d8afe549a7aab39f20dbd04e7f134aa577e13 /forms
parent9a4b768b0a22bd3ae627c7355bbd223b9cf65015 (diff)
use more TypedWhichId in editeng
Change-Id: I2eb2b50ef7002e23221c985ab3218617b3832aa7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152203 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/rtattributehandler.cxx6
-rw-r--r--forms/source/richtext/specialdispatchers.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index b5cfb55b7820..19ae60dc892b 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -304,8 +304,8 @@ namespace frm
FontSizeHandler::FontSizeHandler( AttributeId _nAttributeId, WhichId _nWhichId )
:AttributeHandler( _nAttributeId, _nWhichId )
{
- OSL_ENSURE( ( _nAttributeId == SID_ATTR_CHAR_FONTHEIGHT ) || ( _nAttributeId == SID_ATTR_CHAR_CTL_FONTHEIGHT )
- || ( _nAttributeId == SID_ATTR_CHAR_CJK_FONTHEIGHT ) || ( _nAttributeId == SID_ATTR_CHAR_LATIN_FONTHEIGHT ),
+ OSL_ENSURE( ( _nAttributeId == sal_uInt16(SID_ATTR_CHAR_FONTHEIGHT) ) || ( _nAttributeId == sal_uInt16(SID_ATTR_CHAR_CTL_FONTHEIGHT) )
+ || ( _nAttributeId == sal_uInt16(SID_ATTR_CHAR_CJK_FONTHEIGHT) ) || ( _nAttributeId == sal_uInt16(SID_ATTR_CHAR_LATIN_FONTHEIGHT) ),
"FontSizeHandler::FontSizeHandler: invalid attribute id!" );
}
@@ -360,7 +360,7 @@ namespace frm
SvxFontHeightItem aNewItem( nHeight, 100, getWhich() );
aNewItem.SetProp( pFontHeightItem->GetProp(), pFontHeightItem->GetPropUnit() );
- if ( ( getAttributeId() == SID_ATTR_CHAR_FONTHEIGHT ) && _nForScriptType != SvtScriptType::NONE)
+ if ( ( getAttributeId() == sal_uInt16(SID_ATTR_CHAR_FONTHEIGHT) ) && _nForScriptType != SvtScriptType::NONE)
putItemForScript( _rNewAttribs, aNewItem, _nForScriptType );
else
_rNewAttribs.Put( aNewItem );
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index db7ef6807df8..d75e06590fc2 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -155,7 +155,7 @@ namespace frm
{
bool bEnable = true;
OSL_VERIFY( pLookup->Value >>= bEnable );
- if ( m_nAttributeId == SID_ATTR_PARA_SCRIPTSPACE )
+ if ( m_nAttributeId == sal_uInt16(SID_ATTR_PARA_SCRIPTSPACE) )
return new SvxScriptSpaceItem( bEnable, static_cast<WhichId>(m_nAttributeId) );
return new SfxBoolItem( static_cast<WhichId>(m_nAttributeId), bEnable );
}