diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 10:39:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 10:39:28 +0100 |
| commit | cc360f0a483e7c68ece7a30424f204d660d74b1c (patch) | |
| tree | 0e81c30bf1805cebdd7d3b8097085bf44f0a8528 /vcl/unx/gtk/fpicker | |
| parent | 41f08d42696fdb1f38baaafdde63088febdfd06d (diff) | |
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
Diffstat (limited to 'vcl/unx/gtk/fpicker')
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 7 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 5 |
3 files changed, 5 insertions, 11 deletions
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 <list> #include <memory> #include <rtl/ustring.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase1.hxx> #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 <osl/mutex.hxx> #include <cppuhelper/compbase2.hxx> -#include <com/sun/star/ui/dialogs/XFilePicker.hpp> -#include <com/sun/star/ui/dialogs/XFilePicker2.hpp> -#include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/awt/XTopWindowListener.hpp> #include <com/sun/star/awt/XExtendedToolkit.hpp> |