From cc360f0a483e7c68ece7a30424f204d660d74b1c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Nov 2012 10:39:28 +0100 Subject: fdo#46808: Missing adaptions to XFolderPicker2 c988da288ec473a28f61ebb53aa3ff82bab11ef4 "fdo#46808, Adapt ui::dialogs::FolderPicker UNO service to new style" had left some FolderPicker implementations at XFolderPicker, so creating them caused DeploymentExceptions. Change-Id: I3463161f9bb87a69a2777c331eb5b93d487790b0 --- vcl/inc/salinst.hxx | 6 +++--- vcl/inc/unx/gtk/gtkinst.hxx | 2 +- vcl/inc/vcl/svapp.hxx | 4 ++-- vcl/source/app/svapp.cxx | 2 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 4 ++-- vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 7 +++---- vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 5 ----- 7 files changed, 12 insertions(+), 18 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 81d0b66cd398..afa9e27cd3e2 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -23,7 +23,7 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/ui/dialogs/XFilePicker2.hpp" -#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" +#include "com/sun/star/ui/dialogs/XFolderPicker2.hpp" #include "tools/solar.h" #include "vcl/displayconnectiondispatch.hxx" @@ -168,10 +168,10 @@ public: createFilePicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& ) { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >(); } - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker > + virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 > createFolderPicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& ) - { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >(); } + { return com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >(); } // callbacks for printer updates virtual void updatePrinterUpdate() {} diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 1785591ea7e6..4ad13a60e1db 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -126,7 +126,7 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > createFilePicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& ); - virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker > + virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 > createFolderPicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& ); diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index c5ef39731c00..d95e44b65cdb 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -63,7 +63,7 @@ namespace uno { namespace ui { namespace dialogs { class XFilePicker2; - class XFolderPicker; + class XFolderPicker2; } } namespace awt { @@ -404,7 +404,7 @@ public: /** Create a platform specific folder picker, if one is available, otherwise return an empty reference */ - static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker > + static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 > createFolderPicker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rServiceManager ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 45147d1d6105..6a799cd20c8c 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1808,7 +1808,7 @@ Application::createFilePicker( const Reference< uno::XComponentContext >& xSM ) return pSVData->mpDefInst->createFilePicker( xSM ); } -Reference< ui::dialogs::XFolderPicker > +Reference< ui::dialogs::XFolderPicker2 > Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 02a0e2962765..931f197a9242 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -176,10 +176,10 @@ void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException ) // TODO m_pImpl->cancel(); } -uno::Reference< ui::dialogs::XFolderPicker > +uno::Reference< ui::dialogs::XFolderPicker2 > GtkInstance::createFolderPicker( const uno::Reference< uno::XComponentContext > &xMSF ) { - return uno::Reference< ui::dialogs::XFolderPicker >( + return uno::Reference< ui::dialogs::XFolderPicker2 >( new SalGtkFolderPicker( xMSF ) ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index e70d5ab15a84..ca0746288b85 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -23,15 +23,14 @@ #include #include #include -#include +#include #include "gtk/fpicker/SalGtkPicker.hxx" class SalGtkFolderPicker : public SalGtkPicker, - public cppu::WeakImplHelper2< - ::com::sun::star::ui::dialogs::XFolderPicker, - ::com::sun::star::util::XCancellable > + public cppu::WeakImplHelper1< + ::com::sun::star::ui::dialogs::XFolderPicker2 > { public: diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 11a1603d68ab..64f37b6345bf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -22,11 +22,6 @@ #include #include -#include -#include -#include -#include -#include #include #include -- cgit