[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - forms/source forms/util

[Miklos Vajna]

 forms/source/component/DatabaseForm.cxx    |    6 ++++++
 forms/source/component/FormsCollection.cxx |    6 ++++++
 forms/source/misc/services.cxx             |    4 ----
 forms/util/frm.component                   |    6 ++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 8f9deb9af1fdeaec64976d0b401948eb11894aeb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 27 18:01:52 2015 +0100

    forms: use constructor feature for ODatabaseForm
    
    Change-Id: I1f36b28c3d71b90e439c6ba86bba09cf55bc43ae

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 0ef7c003..753fe89 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -4115,5 +4115,11 @@ void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeExcept
 
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_ODatabaseForm_get_implementation(css::uno::XComponentContext* context,
+                                                         css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ODatabaseForm(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 2283418..fe49f0d 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -221,9 +221,6 @@ void SAL_CALL createRegistryInfo_FORMS()
     static bool bInit = false;
     if (!bInit)
     {
-#if HAVE_FEATURE_DBCONNECTIVITY
-        createRegistryInfo_ODatabaseForm();
-#endif
         createRegistryInfo_OFilterControl();
         createRegistryInfo_OScrollBarModel();
         createRegistryInfo_OSpinButtonModel();
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 18900aa..276b7c4 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -33,7 +33,8 @@
   <implementation name="com.sun.star.comp.forms.FormOperations">
     <service name="com.sun.star.form.runtime.FormOperations"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.ODatabaseForm">
+  <implementation name="com.sun.star.comp.forms.ODatabaseForm"
+      constructor="com_sun_star_comp_forms_ODatabaseForm_get_implementation">
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormComponents"/>
     <service name="com.sun.star.form.component.DataForm"/>
commit 5ebdc9889a96d2c1112588acae472d881f54f03a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 27 17:54:08 2015 +0100

    forms: use constructor feature for OFormsCollection
    
    Change-Id: Ifdc031480617ec4d0a50ae5b6cd6a2c838ae076a

diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 1114961..d67c108 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -160,5 +160,11 @@ InterfaceRef  OFormsCollection::getParent() throw( RuntimeException, std::except
 
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_form_OFormsCollection_get_implementation(css::uno::XComponentContext* context,
+                                                      css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFormsCollection(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index d8e5a8e..2283418 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -197,7 +197,6 @@ void ensureClassInfos()
     // = various
     aServices.realloc(1);
     aServices.getArray()[0] = "com.sun.star.form.Forms";
-    REGISTER_CLASS_CORE(OFormsCollection);
 
     REGISTER_CLASS1(ImageProducer, SRV_AWT_IMAGEPRODUCER);
 
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 23833eb..18900aa 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -155,7 +155,8 @@
   <implementation name="com.sun.star.form.OFormattedFieldWrapper">
     <service name="stardiv.one.form.component.Edit"/>
   </implementation>
-  <implementation name="com.sun.star.form.OFormsCollection">
+  <implementation name="com.sun.star.form.OFormsCollection"
+      constructor="com_sun_star_form_OFormsCollection_get_implementation">
     <service name="com.sun.star.form.Forms"/>
   </implementation>
   <implementation name="com.sun.star.form.OGridControlModel">