diff options
Diffstat (limited to 'forms/source/component')
24 files changed, 25 insertions, 25 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index d3db076b9507..b7c759aeedb9 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -137,7 +137,7 @@ StringSequence OButtonModel::getSupportedServiceNames() throw() //------------------------------------------------------------------------------ OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index dd24d44e7b39..3c79725a9b7d 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -141,7 +141,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co //------------------------------------------------------------------------------ OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_CHECKBOX); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 84613659ac90..b28d93577339 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -324,7 +324,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg //------------------------------------------------------------------------------ OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_COMBOBOX); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index fecd337523eb..c47f18d428d8 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -198,7 +198,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co //------------------------------------------------------------------------------ OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 13bc6248955d..0a493978bb30 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2357,7 +2357,7 @@ void ODatabaseForm::invlidateParameters() //------------------------------------------------------------------------------ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) { - if ((evt.PropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length)) && !m_bForwardingConnection) + if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection) { // the rowset changed its active connection itself (without interaction from our side), so // we need to fire this event, too @@ -3862,7 +3862,7 @@ const sal_uInt16 DONTAPPLYFILTER = 0x0002; //------------------------------------------------------------------------------ OUString ODatabaseForm::getServiceName() throw( RuntimeException ) { - return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 7ebc20d53389..2ac56ab34453 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -162,7 +162,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() //------------------------------------------------------------------------------ OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility ! } // XPropertySet diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index e3e3b76cf0b4..e1556f33fb7a 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -340,7 +340,7 @@ void OEditModel::disposing() //------------------------------------------------------------------------------ OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility ! } // XServiceInfo diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 43798c4dce26..fa580bc1cbe8 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -200,7 +200,7 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) //------------------------------------------------------------------------------ OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index f45efc18dae8..32738f1e20e8 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -93,7 +93,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre //------------------------------------------------------------------------------ OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 2a21dec3c620..db2af5c23e39 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -189,7 +189,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException) { // return the old compatibility name for an EditModel - return FRM_COMPONENT_EDIT; + return OUString(FRM_COMPONENT_EDIT); } //------------------------------------------------------------------ diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index 7a37b4ebec68..f1dfbd688e31 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -46,7 +46,7 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServ //------------------------------------------------------------------------------ OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException) { - return FRM_SUN_FORMS_COLLECTION; + return OUString(FRM_SUN_FORMS_COLLECTION); } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index be0bdbf9c031..cfa4d1bb9364 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -870,7 +870,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO //------------------------------------------------------------------------------ OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 0779522702b9..c97a5e70f5dc 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -97,7 +97,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg //------------------------------------------------------------------------------ OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_GROUPBOX); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 4271482cc7b1..223c0810df18 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -139,7 +139,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su //------------------------------------------------------------------------------ OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_HIDDEN); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 7fa744c50ea3..e5f66eff329a 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -104,7 +104,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) //------------------------------------------------------------------------------ OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 1991e32ef14d..9816599858e5 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -359,7 +359,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ //------------------------------------------------------------------------------ OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 204d8749365f..f26a57469b4a 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -516,7 +516,7 @@ namespace frm //------------------------------------------------------------------------------ OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_LISTBOX); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 679991159dfb..ac4542ec1845 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -152,7 +152,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con //------------------------------------------------------------------------------ OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_NUMERICFIELD); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 8a6af8afb605..67335d0905e3 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -143,7 +143,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con //------------------------------------------------------------------------------ OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_PATTERNFIELD; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_PATTERNFIELD); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 439462adf0f0..b0bcdfb2a880 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -289,7 +289,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) //------------------------------------------------------------------------------ OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_RADIOBUTTON); // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 420a317fcefd..512b3f0b344c 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -159,7 +159,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel ) //------------------------------------------------------------------------------ OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility ! + return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility ! } // XPropertySet diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 3d15e1326e3f..2138caf56b41 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -203,7 +203,7 @@ namespace frm //------------------------------------------------------------------ OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException ) { - return FRM_SUN_COMPONENT_NAVTOOLBAR; + return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR); } //------------------------------------------------------------------ diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 26035bddedfe..fbab6e7ad2e0 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -240,7 +240,7 @@ namespace frm //-------------------------------------------------------------------- OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException ) { - return FRM_SUN_COMPONENT_SCROLLBAR; + return OUString(FRM_SUN_COMPONENT_SCROLLBAR); } //-------------------------------------------------------------------- diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index ced15e1d90ce..1faa874f7bab 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -196,7 +196,7 @@ namespace frm //-------------------------------------------------------------------- OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException ) { - return FRM_SUN_COMPONENT_SPINBUTTON; + return OUString(FRM_SUN_COMPONENT_SPINBUTTON); } //-------------------------------------------------------------------- |