diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-12 09:23:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:45 +0200 |
| commit | 4b51374a7021d52f7f1be1861e2ee6a011b30ecd (patch) | |
| tree | 77a0121f0eda201befd57a5848bd08aa906473f0 /vcl/unx/kde | |
| parent | 53ec703c14470cb18845fc4483ec36c13b0d744e (diff) | |
fdo#46808, Adapt ui::dialogs::FilePicker UNO service to new style
Change-Id: I1cafbfc53994e5d74241042dbd1d292ddbda67d5
Diffstat (limited to 'vcl/unx/kde')
| -rw-r--r-- | vcl/unx/kde/UnxFilePicker.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/kde/UnxFilePicker.hxx | 22 |
2 files changed, 8 insertions, 24 deletions
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 19c9e5fe81fe..16925551d348 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -87,16 +87,10 @@ namespace ////////////////////////////////////////////////////////////////////////// UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& ) - : cppu::WeakComponentImplHelper9< - XFilterManager, - XFilterGroupManager, - XFilePickerControlAccess, - XFilePickerNotifier, + : cppu::WeakComponentImplHelper3< // TODO XFilePreview, XFilePicker2, - lang::XInitialization, - util::XCancellable, - lang::XEventListener, + XFilePicker3, lang::XServiceInfo>( m_rbHelperMtx ), m_nFilePickerPid( -1 ), m_nFilePickerWrite( -1 ), diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index 8f11bf35c655..4eab1833f23a 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -20,21 +20,16 @@ #ifndef _UNXFILEPICKER_HXX_ #define _UNXFILEPICKER_HXX_ -#include <cppuhelper/compbase9.hxx> +#include <cppuhelper/compbase4.hxx> #include <osl/conditn.hxx> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> -#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> -#include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> +#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XCancellable.hpp> #include <list> @@ -51,16 +46,11 @@ protected: class UnxFilePicker : public UnxFilePickerDummy, - public cppu::WeakComponentImplHelper9< - ::com::sun::star::ui::dialogs::XFilterManager, - ::com::sun::star::ui::dialogs::XFilterGroupManager, - ::com::sun::star::ui::dialogs::XFilePickerControlAccess, - ::com::sun::star::ui::dialogs::XFilePickerNotifier, + public cppu::WeakComponentImplHelper4< ::com::sun::star::ui::dialogs::XFilePicker2, + ::com::sun::star::ui::dialogs::XFilePicker3, + ::com::sun::star::ui::dialogs::XFilePickerControlAccess, // TODO ::com::sun::star::ui::dialogs::XFilePreview, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::util::XCancellable, - ::com::sun::star::lang::XEventListener, ::com::sun::star::lang::XServiceInfo > { protected: |