forms: Convert also com.sun.star.form.XForms.

Plus some associated cleanup.

Change-Id: I0a923198c23e2e4ecbc91e5b56cfac31b7f71256

1 files changed, 2 insertions, 24 deletions

diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index d67c10861032..daa1b0cf3672 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "FormsCollection.hxx"
 #include "services.hxx"
 #include <comphelper/sequence.hxx>
@@ -25,42 +24,28 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/form/XForm.hpp>
 
-
-namespace frm
-{
-
+using namespace frm;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 
-
-
-InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OFormsCollection( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException, std::exception)
 {
     return OUString("com.sun.star.form.Forms");
 }
 
-
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  ) throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-
 Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException, std::exception)
 {
     return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes());
 }
 
-
 OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
@@ -68,7 +53,6 @@ OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactor
 {
 }
 
-
 OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
@@ -76,7 +60,6 @@ OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
 {
 }
 
-
 OFormsCollection::~OFormsCollection()
 {
     if (!FormsCollectionComponentBase::rBHelper.bDisposed)
@@ -86,7 +69,6 @@ OFormsCollection::~OFormsCollection()
     }
 }
 
-
 Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
 {
     Any aReturn = OFormsCollection_BASE::queryInterface(_rType);
@@ -151,18 +133,14 @@ void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportExc
     m_xParent = Parent;
 }
 
-
 InterfaceRef  OFormsCollection::getParent() throw( RuntimeException, std::exception )
 {
     return m_xParent;
 }
 
-
-}   // 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 &)
+        css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new frm::OFormsCollection(context));
 }