diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 559b8d821c8b..e12bd2661e55 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_sdk_api,abp))
$(eval $(call gb_Library_add_exception_objects,abp,\
extensions/source/abpilot/abpfinalpage \
- extensions/source/abpilot/abpservices \
extensions/source/abpilot/abspage \
extensions/source/abpilot/abspilot \
extensions/source/abpilot/admininvokationimpl \
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
index 6c1580abf854..91b9638c4251 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -18,8 +18,9 @@
-->
-
+ xmlns="http://openoffice.org/2010/uno-components">
+
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
deleted file mode 100644
index 16be0a05ddad..000000000000
--- a/extensions/source/abpilot/abpservices.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "componentmodule.hxx"
-#include "unodialogabp.hxx"
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C" void SAL_CALL abp_initializeModule()
-{
- static bool s_bInit = false;
- if (!s_bInit)
- {
- createRegistryInfo_OABSPilotUno();
- ::abp::OModule::setResourceFilePrefix("abp");
- s_bInit = true;
- }
-}
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
- const sal_Char* pImplementationName,
- void* pServiceManager,
- void* /*pRegistryKey*/)
-{
- abp_initializeModule();
-
- Reference< XInterface > xRet;
- if (pServiceManager && pImplementationName)
- {
- xRet = ::abp::OModule::getComponentFactory(
- OUString::createFromAscii(pImplementationName),
- static_cast< XMultiServiceFactory* >(pServiceManager));
- }
-
- if (xRet.is())
- xRet->acquire();
- return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 3f01533ac49b..af54ed9eb082 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -24,17 +24,10 @@
#include
#include
-void SAL_CALL createRegistryInfo_OABSPilotUno()
-{
- static ::abp::OMultiInstanceAutoRegistration< ::abp::OABSPilotUno > aAutoRegistration;
-}
-
#define PROPERTY_ID_DATASOURCENAME 3
namespace abp
{
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -48,72 +41,45 @@ namespace abp
&m_sDataSourceName, cppu::UnoType::get() );
}
-
Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
{
- Any aReturn = OABSPilotUno_DBase::queryInterface( aType );
+ Any aReturn = svt::OGenericUnoDialog::queryInterface( aType );
return aReturn.hasValue() ? aReturn : OABSPilotUno_JBase::queryInterface( aType );
}
-
void SAL_CALL OABSPilotUno::acquire( ) throw ()
{
- OABSPilotUno_DBase::acquire();
+ svt::OGenericUnoDialog::acquire();
}
-
void SAL_CALL OABSPilotUno::release( ) throw ()
{
- OABSPilotUno_DBase::release();
+ svt::OGenericUnoDialog::release();
}
-
Sequence< Type > SAL_CALL OABSPilotUno::getTypes( ) throw (RuntimeException, std::exception)
{
return ::comphelper::concatSequences(
- OABSPilotUno_DBase::getTypes(),
+ svt::OGenericUnoDialog::getTypes(),
OABSPilotUno_JBase::getTypes()
);
}
-
Sequence SAL_CALL OABSPilotUno::getImplementationId( ) throw(RuntimeException, std::exception)
{
return css::uno::Sequence();
}
-
- Reference< XInterface > SAL_CALL OABSPilotUno::Create(const Reference< XMultiServiceFactory >& _rxFactory)
- {
- return *(new OABSPilotUno( comphelper::getComponentContext(_rxFactory) ));
- }
-
-
OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException, std::exception)
- {
- return getImplementationName_Static();
- }
-
-
- OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
{
return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
}
-
css::uno::Sequence SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
{
- return getSupportedServiceNames_Static();
+ return { "com.sun.star.ui.dialogs.AddressBookSourcePilot" };
}
-
- css::uno::Sequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
- {
- css::uno::Sequence aSupported { "com.sun.star.ui.dialogs.AddressBookSourcePilot" };
- return aSupported;
- }
-
-
Reference SAL_CALL OABSPilotUno::getPropertySetInfo() throw(RuntimeException, std::exception)
{
Reference xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -146,7 +112,6 @@ namespace abp
}
}
-
VclPtr