diff options
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 7ad5d944ce43..bc83c820e909 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -779,7 +779,7 @@ namespace pcr // font style ::FontWeight eWeight = VCLUnoHelper::ConvertFontWeight( aFont.Weight ); - USHORT nStyleResID = RID_STR_FONTSTYLE_REGULAR; + sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR; if ( aFont.Slant == FontSlant_ITALIC ) { if ( eWeight > WEIGHT_NORMAL ) @@ -1256,7 +1256,7 @@ namespace pcr // boolean values if ( eType == TypeClass_BOOLEAN ) { - USHORT nResId = RID_RSC_ENUM_YESNO; + sal_uInt16 nResId = RID_RSC_ENUM_YESNO; if ( ( nPropId == PROPERTY_ID_SHOW_POSITION ) || ( nPropId == PROPERTY_ID_SHOW_NAVIGATION ) || ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS ) @@ -1418,7 +1418,7 @@ namespace pcr if ( aDescriptor.PrimaryButtonId.getLength() ) aDescriptor.HasPrimaryButton = sal_True; - if ( aDescriptor.SecondaryButtonId ) + if ( aDescriptor.SecondaryButtonId.getLength() ) aDescriptor.HasSecondaryButton = sal_True; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; |