toolkit/source/controls/grid/sortablegriddatamodel.cxx | 48 -----------------
1 file changed, 1 insertion(+), 47 deletions(-)
New commits:
commit 4178b34521227e726bd1f393d384c17c63909c3d
Author: prrvchr <prrv...@gmail.com>
AuthorDate: Mon Nov 25 11:52:29 2024 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 25 19:41:51 2024 +0100
tdf#164040 Expose XGridDataListener type in SortableGridDataModel
It had been introduced in commit de9dba9275aff2863978f7f665685d54ef82b0ad
(gridsort: introduce XSortableGridDataModel::removeColumnSort, 2011-01-18),
but in getTypes, an explicit exclusion for it had been made.
Change-Id: I4915949b26ef15905ec810aa54e69d0e62100b90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177256
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index d74a496ad1ec..1c614b324c93 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -53,13 +53,11 @@ namespace {
class SortableGridDataModel;
typedef ::comphelper::WeakComponentImplHelper <
css::awt::grid::XSortableMutableGridDataModel
+ ,
css::awt::grid::XGridDataListener
, css::lang::XServiceInfo
, css::lang::XInitialization
> SortableGridDataModel_Base;
-typedef ::cppu::ImplHelper1 < css::awt::grid::XGridDataListener
- > SortableGridDataModel_PrivateBase;
class SortableGridDataModel :public SortableGridDataModel_Base
- ,public SortableGridDataModel_PrivateBase
{
public:
explicit SortableGridDataModel( const css::uno::Reference<
css::uno::XComponentContext > & rxContext );
@@ -122,15 +120,6 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& i_event )
override;
- // XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) override;
- virtual void SAL_CALL acquire( ) noexcept final 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;
-
private:
/** translates the given public index into one to be passed to our
delegator
@throws css::lang::IndexOutOfBoundsException
@@ -221,7 +210,6 @@ void lcl_clear( STLCONTAINER& i_container )
{
}
-
SortableGridDataModel::SortableGridDataModel( SortableGridDataModel const
& i_copySource )
:m_xContext( i_copySource.m_xContext )
,m_isInitialized( true )
@@ -244,40 +232,6 @@ void lcl_clear( STLCONTAINER& i_container )
dispose();
}
-
- Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType )
- {
- Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) );
- if ( !aReturn.hasValue() )
- aReturn = SortableGridDataModel_PrivateBase::queryInterface( aType
);
- return aReturn;
- }
-
-
- void SAL_CALL SortableGridDataModel::acquire( ) noexcept
- {
- SortableGridDataModel_Base::acquire();
- }
-
-
- void SAL_CALL SortableGridDataModel::release( ) noexcept
- {
- SortableGridDataModel_Base::release();
- }
-
-
- Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( )
- {
- return SortableGridDataModel_Base::getTypes();
- // don't expose the types got via SortableGridDataModel_PrivateBase -
they're private, after all
- }
-
-
- Sequence< ::sal_Int8 > SAL_CALL
SortableGridDataModel::getImplementationId( )
- {
- return css::uno::Sequence<sal_Int8>();
- }
-
Reference< XCollator > lcl_loadDefaultCollator_throw( const
Reference<XComponentContext> & rxContext )
{
Reference< XCollator > const xCollator = Collator::create( rxContext );
