actualizacion-master-2024-12-09 #6

Merged
iapz merged 134 commits from actualizacion-master-2024-12-09 into master 2024-12-09 19:36:03 -06:00
2 changed files with 2 additions and 22 deletions
Showing only changes of commit c4dee829f3 - Show all commits

View file

@ -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

View file

@ -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;