diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-08 11:41:03 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-08 10:12:42 +0100 |
| commit | c4dee829f397a7ad1fe195e8f3a6f849dac459d7 (patch) | |
| tree | d23bd756e8b5da24bcf282b3de71054fa15f25e2 /fpicker | |
| parent | 495e38c85396f9116d8f2831fc925404bf933905 (diff) | |
Simplify SvtFilePicker
Change-Id: I2b6d1589c25cb1fa4711f088641afe1bfe1d7411
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178072
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 10 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 14 |
2 files changed, 2 insertions, 22 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 956915e6cebc..6d845f3fd0c3 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -449,16 +449,6 @@ std::shared_ptr<SvtFileDialog_Base> SvtFilePicker::implCreateDialog( weld::Windo } -// disambiguate XInterface - -IMPLEMENT_FORWARD_XINTERFACE2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base ) - - -// disambiguate XTypeProvider - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base ) - - // XExecutableDialog functions diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 48f2ef076625..33e2b6d16e7c 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -46,7 +46,8 @@ typedef css::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transpo // class SvtFilePicker --------------------------------------------------- -typedef ::cppu::ImplHelper5 < css::ui::dialogs::XFilePicker3 +typedef cppu::ImplInheritanceHelper <svt::OCommonPicker + , css::ui::dialogs::XFilePicker3 , css::ui::dialogs::XFilePickerControlAccess , css::ui::dialogs::XFilePreview , css::lang::XServiceInfo @@ -54,7 +55,6 @@ typedef ::cppu::ImplHelper5 < css::ui::dialogs::XFilePicker3 > SvtFilePicker_Base; class SvtFilePicker :public SvtFilePicker_Base - ,public ::svt::OCommonPicker ,public ::svt::IFilePickerListener { protected: @@ -85,16 +85,6 @@ public: virtual ~SvtFilePicker() override; - // disambiguate XInterface - - DECLARE_XINTERFACE( ) - - - // disambiguate XTypeProvider - - DECLARE_XTYPEPROVIDER( ) - - // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& _rTitle ) override; |