diff options
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 3344a8a62c8b..bbfef69b8ebe 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -781,7 +781,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 ) @@ -1025,39 +1025,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SELECTION; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILTER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ORDER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FORMLINKFIELDS; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = UID_PROP_DLG_TABINDEX; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1065,8 +1065,8 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = ( PROPERTY_ID_TARGET_URL == nPropId ) - ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1083,13 +1083,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BACKGROUNDCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SYMBOLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BORDERCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1113,7 +1113,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_CONTROLLABEL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1143,7 +1143,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = UID_PROP_DLG_NUMBER_FORMAT; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1258,7 +1258,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 ) @@ -1344,7 +1344,7 @@ namespace pcr if ( nPropId == PROPERTY_ID_MAXTEXTLEN ) aMinValue.Value = -1; - else if ( ( nPropId == PROPERTY_ID_BOUNDCOLUMN ) || ( nPropId == PROPERTY_ID_VISIBLESIZE ) ) + else if ( nPropId == PROPERTY_ID_VISIBLESIZE ) aMinValue.Value = 1; else aMinValue.Value = 0; @@ -1368,7 +1368,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< ::rtl::OUString > aListEntries; @@ -1418,9 +1418,9 @@ namespace pcr } } - if ( aDescriptor.PrimaryButtonId ) + 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; @@ -2473,7 +2473,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; |