[Libreoffice-commits] core.git: dbaccess/source extensions/source
Matúš Kukan
matus.kukan at gmail.com
Sat Dec 12 11:55:10 PST 2015
dbaccess/source/inc/registrationhelper.hxx | 36 -------------------------
extensions/source/inc/componentmodule.hxx | 41 -----------------------------
2 files changed, 77 deletions(-)
New commits:
commit e32dcddaa5b74b3d163413c685d7c088cef1cbd9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Dec 12 18:59:32 2015 +0100
OOneInstanceAutoRegistration is not used
Change-Id: I6928dec92655e4655af6c519405712892bf7d870
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index 4703147..b49b40f 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -87,7 +87,6 @@ public:
Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code><BR>
the instantiation of this object will automatically register the class via <code>OModuleRegistration::registerComponent</code>.
The factory creation function used is <code>::cppu::createSingleFactory</code>.<BR>
- @see OOneInstanceAutoRegistration
*/
OMultiInstanceAutoRegistration();
~OMultiInstanceAutoRegistration();
@@ -110,39 +109,4 @@ OMultiInstanceAutoRegistration<TYPE>::~OMultiInstanceAutoRegistration()
OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
}
-template <class TYPE>
-class OOneInstanceAutoRegistration
-{
-public:
- /** provided that the template argument has three methods<BR>
- <code>static OUString getImplementationName_Static()</code><BR>
- <code>static css::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR>
- and<BR>
- <code>static css::uno::Reference< css::uno::XInterface >
- Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code><BR>
- the instantiation of this object will automatically register the class via <code>OModuleRegistration::registerComponent</code>.
- The factory creation function used is <code>::cppu::createSingleFactory</code>.<BR>
- @see OMultiInstanceAutoRegistration
- */
- OOneInstanceAutoRegistration();
- ~OOneInstanceAutoRegistration();
-};
-
-template <class TYPE>
-OOneInstanceAutoRegistration<TYPE>::OOneInstanceAutoRegistration()
-{
- OModuleRegistration::registerComponent(
- TYPE::getImplementationName_Static(),
- TYPE::getSupportedServiceNames_Static(),
- TYPE::Create,
- ::cppu::createOneInstanceFactory
- );
-}
-
-template <class TYPE>
-OOneInstanceAutoRegistration<TYPE>::~OOneInstanceAutoRegistration()
-{
- OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 79a6ebf..58f80ba 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -170,7 +170,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto
the instantiation of this object will automatically register the class via <method>OModule::registerComponent</method>.
<p/>
The factory creation function used is <code>::cppu::createSingleFactory</code>.
- @see OOneInstanceAutoRegistration
*/
OMultiInstanceAutoRegistration();
~OMultiInstanceAutoRegistration();
@@ -193,46 +192,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto
OModule::revokeComponent(TYPE::getImplementationName_Static());
}
- template <class TYPE>
- class OOneInstanceAutoRegistration
- {
- public:
- /** automatically registeres a single instance component
- <p>Assumed that the template argument has the three methods
- <ul>
- <li><code>static OUString getImplementationName_Static()</code><li/>
- <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
- <li><code>static css::uno::Reference< css::uno::XInterface >
- Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code>
- </li>
- <ul/>
- the instantiation of this object will automatically register the class via <method>OModule::registerComponent</method>.
- <p/>
- The factory creation function used is <code>::cppu::createOneInstanceFactory</code>.
- @see OOneInstanceAutoRegistration
- */
- OOneInstanceAutoRegistration();
- ~OOneInstanceAutoRegistration();
- };
-
- template <class TYPE>
- OOneInstanceAutoRegistration<TYPE>::OOneInstanceAutoRegistration()
- {
- OModule::registerComponent(
- TYPE::getImplementationName_Static(),
- TYPE::getSupportedServiceNames_Static(),
- TYPE::Create,
- ::cppu::createOneInstanceFactory
- );
- }
-
- template <class TYPE>
- OOneInstanceAutoRegistration<TYPE>::~OOneInstanceAutoRegistration()
- {
- OModule::revokeComponent(TYPE::getImplementationName_Static());
- }
-
-
} // namespace COMPMOD_NAMESPACE
More information about the Libreoffice-commits
mailing list