diff options
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/FormattedFieldWrapper.cxx | 2 | ||||
| -rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 13 | ||||
| -rw-r--r-- | forms/source/xforms/model.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/xpathlib/extension.cxx | 4 | ||||
| -rw-r--r-- | forms/util/frm.component | 12 |
5 files changed, 16 insertions, 17 deletions
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 178f1939c9bd..57c3c04a02bf 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -349,7 +349,7 @@ com_sun_star_form_OFormattedFieldWrapper_get_implementation(::com::sun::star::un } extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_form_OFormattedFieldWrapper_ForcedFormatted_get_implementation(::com::sun::star::uno::XComponentContext* component, +com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(::com::sun::star::uno::XComponentContext* component, ::com::sun::star::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OFormattedFieldWrapper(component)); diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 29f316b02cf8..e40ec1fdf155 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -40,13 +40,6 @@ #include <svl/itempool.hxx> #include <sfx2/msgpool.hxx> -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ORichTextControl_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) -{ - return cppu::acquire(new frm::ORichTextControl()); -} - namespace frm { @@ -720,5 +713,11 @@ namespace frm } // namespace frm +extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +com_sun_star_comp_form_ORichTextControl_get_implementation(::com::sun::star::uno::XComponentContext*, + ::com::sun::star::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new frm::ORichTextControl()); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 2e56e10143a6..e428d451fcd0 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -682,7 +682,7 @@ Sequence<sal_Int8> Model::getImplementationId() extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_xform_Model_get_implementation(::com::sun::star::uno::XComponentContext*, +com_sun_star_form_Model_get_implementation(::com::sun::star::uno::XComponentContext*, ::com::sun::star::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new xforms::Model()); diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 0404022ffa4b..b7bb1f5156c9 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -85,8 +85,8 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -CLibxlm2XFormsExtension_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +com_sun_star_comp_xml_xpath_XFormsExtension_get_implementation(::com::sun::star::uno::XComponentContext*, + ::com::sun::star::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new CLibxml2XFormsExtension()); } diff --git a/forms/util/frm.component b/forms/util/frm.component index 7fac98389fc9..962aec037d0b 100644 --- a/forms/util/frm.component +++ b/forms/util/frm.component @@ -30,7 +30,7 @@ <service name="com.sun.star.form.component.NavigationToolBar"/> </implementation> <implementation name="com.sun.star.comp.form.ORichTextControl" - constructor="com_sun_star_form_ORichTextControl_get_implementation"> + constructor="com_sun_star_comp_form_ORichTextControl_get_implementation"> <service name="com.sun.star.form.control.RichTextControl"/> </implementation> <implementation name="com.sun.star.comp.forms.FormOperations" @@ -52,7 +52,7 @@ <service name="com.sun.star.form.control.FilterControl"/> </implementation> <implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted" - constructor="com_sun_star_comp_form_OFormattedFieldWrapper_ForcedFormatted_get_implementation"> + constructor="com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation"> <service name="com.sun.star.form.binding.BindableDatabaseFormattedField"/> <service name="com.sun.star.form.component.DatabaseFormattedField"/> <service name="com.sun.star.form.component.FormattedField"/> @@ -85,7 +85,7 @@ <service name="com.sun.star.form.component.SpinButton"/> </implementation> <implementation name="com.sun.star.comp.xml.xpath.XFormsExtension" - constructor="CLibxlm2XFormsExtension_get_implementation"> + constructor="com_sun_star_comp_xml_xpath_XFormsExtension_get_implementation"> <service name="com.sun.star.xml.xpath.XPathExtension"/> </implementation> <implementation name="com.sun.star.form.ImageProducer" @@ -93,7 +93,7 @@ <service name="com.sun.star.awt.ImageProducer"/> </implementation> <implementation name="com.sun.star.form.Model" - constructor="com_sun_star_xform_Model_get_implementation"> + constructor="com_sun_star_form_Model_get_implementation"> <service name="com.sun.star.xforms.Model"/> </implementation> <implementation name="com.sun.star.form.OButtonControl" @@ -195,7 +195,7 @@ <service name="stardiv.one.form.component.GridControl"/> </implementation> <implementation name="com.sun.star.form.OGroupBoxControl" - constructor="com_sun_star_form_OGroupBoxModel_get_implementation"> + constructor="com_sun_star_form_OGroupBoxControl_get_implementation"> <service name="com.sun.star.form.control.GroupBox"/> <service name="stardiv.one.form.control.GroupBox"/> </implementation> @@ -266,7 +266,7 @@ <service name="stardiv.one.form.component.PatternField"/> </implementation> <implementation name="com.sun.star.form.ORadioButtonControl" - constructor="com_sun_star_form_ORadioButtonModel_get_implementation"> + constructor="com_sun_star_form_ORadioButtonControl_get_implementation"> <service name="com.sun.star.form.control.RadioButton"/> <service name="stardiv.one.form.control.RadioButton"/> </implementation> |