dbaccess/source/ui/browser/formadapter.cxx | 27 ---------------------------
dbaccess/source/ui/inc/formadapter.hxx | 20 ++++----------------
2 files changed, 4 insertions(+), 43 deletions(-)
New commits:
commit 525b293a98a0086ab0fb785acb94f6b750e56410
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Aug 12 13:06:33 2025 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Aug 12 15:35:35 2025 +0200
No need in ImplHelperN together with variadic WeakImplHelper
A leftover from commit 7fa29ecc727c04159cee92aebc14fc5b1037a965
(tdf#88206 replace cppu::WeakImplHelper* etc., 2015-07-17).
Before that, it had to use several impls, because the number of
interfaces was too great.
Change-Id: I40f9e84cae5f7b47e5d510c6f3839adb2ac23d02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189422
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/dbaccess/source/ui/browser/formadapter.cxx
b/dbaccess/source/ui/browser/formadapter.cxx
index e0288c51dc38..cd1271f5d438 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -59,33 +59,6 @@ SbaXFormAdapter::~SbaXFormAdapter()
}
-Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes( )
-{
- return ::comphelper::concatSequences(
- SbaXFormAdapter_BASE1::getTypes(),
- SbaXFormAdapter_BASE2::getTypes(),
- SbaXFormAdapter_BASE3::getTypes()
- );
-}
-
-Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId( )
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
-Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType)
-{
- Any aReturn = SbaXFormAdapter_BASE1::queryInterface( _rType );
-
- if (!aReturn.hasValue())
- aReturn = SbaXFormAdapter_BASE2::queryInterface( _rType );
-
- if (!aReturn.hasValue())
- aReturn = SbaXFormAdapter_BASE3::queryInterface( _rType );
-
- return aReturn;
-}
-
void SbaXFormAdapter::StopListening()
{
// log off all our multiplexers
diff --git a/dbaccess/source/ui/inc/formadapter.hxx
b/dbaccess/source/ui/inc/formadapter.hxx
index c6d565896215..ca3394db5b56 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -76,8 +76,7 @@ namespace dbaui
// ---
stardiv::one::form::component::DatabaseForm ---
, css::sdbc::XParameters
, css::sdbcx::XDeleteRows
- > SbaXFormAdapter_BASE1;
- typedef ::cppu::ImplHelper12 < css::sdbc::XWarningsSupplier
+ , css::sdbc::XWarningsSupplier
, css::sdbc::XCloseable
, css::form::XLoadable
, css::sdb::XSQLErrorBroadcaster
@@ -92,8 +91,7 @@ namespace dbaui
// already present :
css::form::XFormComponent (base of css::form::XForm)
, css::beans::XMultiPropertySet
, css::container::XNamed
- > SbaXFormAdapter_BASE2;
- typedef ::cppu::ImplHelper10 < css::io::XPersistObject
+ , css::io::XPersistObject
, css::beans::XPropertySet
// ---
stardiv::one::data::DatabaseCursor ---
, css::util::XCancellable
@@ -111,12 +109,10 @@ namespace dbaui
, css::container::XEnumerationAccess
// interfaces we need because of other
reasons
, css::beans::XPropertyChangeListener
- > SbaXFormAdapter_BASE3;
+ > SbaXFormAdapter_BASE;
class SbaXFormAdapter final
- :public SbaXFormAdapter_BASE1
- ,public SbaXFormAdapter_BASE2
- ,public SbaXFormAdapter_BASE3
+ :public SbaXFormAdapter_BASE
{
private:
css::uno::Reference< css::sdbc::XRowSet >
m_xMainForm;
@@ -158,14 +154,6 @@ namespace dbaui
void AttachForm(const css::uno::Reference< css::sdbc::XRowSet >&
xNewMaster);
- // UNO
- DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1)
- virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type&
_rType) override;
-
- // XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(
) override;
-
// css::sdbc::XCloseable
virtual void SAL_CALL close() override;
