fpicker/source/office/OfficeFilePicker.cxx | 15 --------------- fpicker/source/office/OfficeFilePicker.hxx | 8 -------- 2 files changed, 23 deletions(-)
New commits: commit c91edf5e57a7441fbac399c7a44f26a57878e5be Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Sun Dec 8 11:13:22 2024 +0500 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sun Dec 8 08:23:20 2024 +0100 SvtRemoteFilePicker doesn't extend SvtFilePicker's interface list Change-Id: Iad25fa30a550494ba5a27d30f703ee6748fd338c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178071 Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> Tested-by: Jenkins diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index cdb28d34364c..956915e6cebc 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -458,21 +458,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base ) -IMPLEMENT_FORWARD_XINTERFACE3( SvtRemoteFilePicker, SvtFilePicker, OCommonPicker, SvtFilePicker_Base ) - - -// disambiguate XTypeProvider - -css::uno::Sequence< css::uno::Type > SAL_CALL SvtRemoteFilePicker::getTypes( ) -{ - return ::comphelper::concatSequences( - SvtFilePicker::getTypes(), - OCommonPicker::getTypes(), - SvtFilePicker_Base::getTypes() - ); -} -IMPLEMENT_GET_IMPLEMENTATION_ID( SvtRemoteFilePicker ) - // XExecutableDialog functions diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index b75a3f6368db..48f2ef076625 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -221,14 +221,6 @@ public: virtual std::shared_ptr<SvtFileDialog_Base> implCreateDialog( weld::Window* pParent ) override; - // disambiguate XInterface - - DECLARE_XINTERFACE( ) - - // disambiguate XTypeProvider - - DECLARE_XTYPEPROVIDER( ) - /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override;