accessibility/inc/extended/AccessibleBrowseBoxBase.hxx | 12 ---
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx | 25 -------
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 10 --
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 35
----------
extensions/source/abpilot/unodialogabp.cxx | 31 --------
extensions/source/abpilot/unodialogabp.hxx | 14 ----
6 files changed, 11 insertions(+), 116 deletions(-)
New commits:
commit ac6b34ed9d21c33bfc9ac89ff74c408f2b008403
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Dec 7 01:38:56 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Dec 7 14:34:58 2024 +0100
Simplify AccessibleBrowseBoxTableBase
Change-Id: I8af6ac72923aa823db356769153790ae9d7752a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178028
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index 422aa177ad48..da7643dd6d7c 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -27,16 +27,14 @@
namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
+typedef cppu::ImplInheritanceHelper<BrowseBoxAccessibleElement,
css::accessibility::XAccessibleTable>
AccessibleBrowseBoxTableImplHelper;
/** The BrowseBox accessible table objects inherit from this base class. It
implements basic functionality for the XAccessibleTable interface.
BrowseBox table objects are: the data table, the column header bar and the
row header bar. */
-class AccessibleBrowseBoxTableBase :
- public BrowseBoxAccessibleElement,
- public AccessibleBrowseBoxTableImplHelper
+class AccessibleBrowseBoxTableBase : public AccessibleBrowseBoxTableImplHelper
{
public:
/** Constructor sets specified name and description. If the constant of a
@@ -121,25 +119,6 @@ public:
- getAccessibleCellAt,
- isAccessibleSelected. */
- // XInterface
-
- /** Queries for a new interface. */
- css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
override;
-
- /** Acquires the object (calls acquire() on base class). */
- virtual void SAL_CALL acquire() noexcept override;
-
- /** Releases the object (calls release() on base class). */
- virtual void SAL_CALL release() noexcept override;
-
- // XTypeProvider
-
- /** @return a sequence of possible types (received from base classes). */
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
- /** @return a unique implementation ID. */
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
-
// XServiceInfo
/* Derived classes have to implement:
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 044a85958e98..bb213c348f3d 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -41,7 +41,7 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
const Reference< XAccessible >& rxParent,
vcl::IAccessibleTableProvider& rBrowseBox,
AccessibleBrowseBoxObjType eObjType ) :
- BrowseBoxAccessibleElement( rxParent, rBrowseBox,nullptr, eObjType )
+ AccessibleBrowseBoxTableImplHelper( rxParent, rBrowseBox, nullptr,
eObjType )
{
}
@@ -132,39 +132,6 @@ sal_Int32 SAL_CALL
AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int64
return implGetColumn( nChildIndex );
}
-// XInterface -----------------------------------------------------------------
-
-Any SAL_CALL AccessibleBrowseBoxTableBase::queryInterface( const uno::Type&
rType )
-{
- Any aAny( BrowseBoxAccessibleElement::queryInterface( rType ) );
- return aAny.hasValue() ?
- aAny : AccessibleBrowseBoxTableImplHelper::queryInterface( rType );
-}
-
-void SAL_CALL AccessibleBrowseBoxTableBase::acquire() noexcept
-{
- BrowseBoxAccessibleElement::acquire();
-}
-
-void SAL_CALL AccessibleBrowseBoxTableBase::release() noexcept
-{
- BrowseBoxAccessibleElement::release();
-}
-
-// XTypeProvider --------------------------------------------------------------
-
-Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes()
-{
- return ::comphelper::concatSequences(
- BrowseBoxAccessibleElement::getTypes(),
- AccessibleBrowseBoxTableImplHelper::getTypes() );
-}
-
-Sequence< sal_Int8 > SAL_CALL
AccessibleBrowseBoxTableBase::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
// internal virtual methods ---------------------------------------------------
sal_Int32 AccessibleBrowseBoxTableBase::implGetRowCount() const
commit ffa47ff780ed737aef3ab988db4f42aee92653a3
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Dec 7 02:19:21 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Dec 7 14:34:51 2024 +0100
Simplify BrowseBoxAccessibleElement
Change-Id: Ic8322090d38d58475c4c946e1f850950bce7421a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178027
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index d4ea1aabc07f..362ff829a6ac 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -309,12 +309,10 @@ private:
// a version of AccessibleBrowseBoxBase which implements not only the
XAccessibleContext,
// but also the XAccessible
-typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
- > BrowseBoxAccessibleElement_Base;
+typedef cppu::ImplInheritanceHelper<AccessibleBrowseBoxBase,
css::accessibility::XAccessible>
+ BrowseBoxAccessibleElement_Base;
-class BrowseBoxAccessibleElement
- :public AccessibleBrowseBoxBase
- ,public BrowseBoxAccessibleElement_Base
+class BrowseBoxAccessibleElement : public BrowseBoxAccessibleElement_Base
{
protected:
/** Constructor sets specified name and description. If the constant of a
@@ -355,10 +353,6 @@ public:
// noncopyable
BrowseBoxAccessibleElement(const BrowseBoxAccessibleElement&) = delete;
const BrowseBoxAccessibleElement& operator=(const
BrowseBoxAccessibleElement&) = delete;
- // XInterface
- DECLARE_XINTERFACE( )
- // XTypeProvider
- DECLARE_XTYPEPROVIDER( )
protected:
virtual ~BrowseBoxAccessibleElement() override;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 6108fa0a1801..466963ca3bda 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -515,12 +515,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(
)
}
-// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( BrowseBoxAccessibleElement,
AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
-
-// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement,
AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
-
// css::accessibility::XAccessible
Reference< css::accessibility::XAccessibleContext > SAL_CALL
BrowseBoxAccessibleElement::getAccessibleContext()
@@ -533,7 +527,7 @@ Reference< css::accessibility::XAccessibleContext >
SAL_CALL BrowseBoxAccessible
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const
css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType eObjType )
- :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
+ : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow,
eObjType)
{
}
@@ -541,7 +535,7 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement(
const css::uno::Referenc
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const
css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType eObjType,
const OUString& rName, const OUString& rDescription )
- :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType,
rName, rDescription )
+ : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow,
eObjType, rName, rDescription)
{
}
commit 259480c5e1a387e01618dcd772e0ecdeead9b88b
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Dec 7 01:34:27 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Dec 7 14:34:46 2024 +0100
Simplify OABSPilotUno
Change-Id: Id722754aadecbb0cdb0a35fd8b3a7ac24e21b546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178026
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/extensions/source/abpilot/unodialogabp.cxx
b/extensions/source/abpilot/unodialogabp.cxx
index 4baafbf7f705..b8d78e81e888 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -35,41 +35,12 @@ namespace abp
using namespace ::com::sun::star::ui::dialogs;
OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB)
- :OGenericUnoDialog(_rxORB)
+ : OABSPilotUno_JBase(_rxORB)
{
registerProperty( u"DataSourceName"_ustr, PROPERTY_ID_DATASOURCENAME,
PropertyAttribute::READONLY ,
&m_sDataSourceName,
cppu::UnoType<decltype(m_sDataSourceName)>::get() );
}
- Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType )
- {
- Any aReturn = svt::OGenericUnoDialog::queryInterface( aType );
- return aReturn.hasValue() ? aReturn :
OABSPilotUno_JBase::queryInterface( aType );
- }
-
- void SAL_CALL OABSPilotUno::acquire( ) noexcept
- {
- svt::OGenericUnoDialog::acquire();
- }
-
- void SAL_CALL OABSPilotUno::release( ) noexcept
- {
- svt::OGenericUnoDialog::release();
- }
-
- Sequence< Type > SAL_CALL OABSPilotUno::getTypes( )
- {
- return ::comphelper::concatSequences(
- svt::OGenericUnoDialog::getTypes(),
- OABSPilotUno_JBase::getTypes()
- );
- }
-
- Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId( )
- {
- return css::uno::Sequence<sal_Int8>();
- }
-
OUString SAL_CALL OABSPilotUno::getImplementationName()
{
return u"org.openoffice.comp.abp.OAddressBookSourcePilot"_ustr;
diff --git a/extensions/source/abpilot/unodialogabp.hxx
b/extensions/source/abpilot/unodialogabp.hxx
index b8bd940afa04..b07f0b2d870b 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -28,12 +28,11 @@
namespace abp
{
class OABSPilotUno;
- typedef ::cppu::ImplHelper1< css::task::XJob > OABSPilotUno_JBase;
+ typedef cppu::ImplInheritanceHelper<svt::OGenericUnoDialog,
css::task::XJob> OABSPilotUno_JBase;
typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno >
OABSPilotUno_PBase;
/// the UNO wrapper for the address book source pilot
class OABSPilotUno
- : public svt::OGenericUnoDialog
- , public OABSPilotUno_JBase
+ : public OABSPilotUno_JBase
, public OABSPilotUno_PBase
{
OUString m_sDataSourceName;
@@ -42,15 +41,6 @@ namespace abp
explicit OABSPilotUno(const css::uno::Reference<
css::uno::XComponentContext >& _rxORB);
private:
- // XInterface (disambiguation)
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type&
aType ) override;
- virtual void SAL_CALL acquire( ) noexcept override;
- virtual void SAL_CALL release( ) noexcept override;
-
- // XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
- virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( )
override;
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() override;
