strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for fdo#61187

Browse source 
... "CRASH when click 'Add' in EXTENSIONS Manager to open LibO File Dialog"

This one must have been broken for a long while, because it didn't
even implement XFilePicker before.

Change-Id: I7c5d4e4c3ba14f4c6dffa91a25a745e6ca51ec37
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Noel Grandin 2013-02-21 15:41:36 +02:00 committed by Stephan Bergmann
parent 616c6924f1
commit c04c959580
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fpicker/source/office/OfficeFilePicker.hxx
View file

@ -19,12 +19,10 @@
#ifndef INCLUDED_SVT_FILEPICKER_HXX
#define INCLUDED_SVT_FILEPICKER_HXX
#include <cppuhelper/implbase7.hxx>
#include <cppuhelper/implbase5.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -52,11 +50,9 @@ typedef ::com::sun::star::uno::Sequence< OUString > OUStringList; // can be t
// class SvtFilePicker ---------------------------------------------------
typedef ::cppu::ImplHelper7 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess
, ::com::sun::star::ui::dialogs::XFilePickerNotifier
typedef ::cppu::ImplHelper5 < ::com::sun::star::ui::dialogs::XFilePicker3
, ::com::sun::star::ui::dialogs::XFilePickerControlAccess
, ::com::sun::star::ui::dialogs::XFilePreview
, ::com::sun::star::ui::dialogs::XFilterManager
, ::com::sun::star::ui::dialogs::XFilterGroupManager
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
> SvtFilePicker_Base;
@ -164,6 +160,19 @@ public:
//------------------------------------------------------------------------------------
virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
//------------------------------------------------------------------------------------
// these methods are here because they're ambiguous
//------------------------------------------------------------------------------------
virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException )
{ ::svt::OCommonPicker::cancel(); }
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException )
{ ::svt::OCommonPicker::dispose(); }
virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException )
{ ::svt::OCommonPicker::addEventListener(l); }
virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException )
{ ::svt::OCommonPicker::removeEventListener(l); }
//------------------------------------------------------------------------------------
// XInitialization functions
//------------------------------------------------------------------------------------