From c988da288ec473a28f61ebb53aa3ff82bab11ef4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 11 Oct 2012 15:43:08 +0200
Subject: fdo#46808, Adapt ui::dialogs::FolderPicker UNO service to new style

Create a merged XFolderPicker2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: I4a2c2a8d491a8d5633c19ddcea547f0efe75b91d
---
 fpicker/source/win32/folderpicker/FolderPicker.hxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'fpicker/source')

diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index a795f5fbfd71..ec95c267e97e 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -20,7 +20,7 @@
 #ifndef _FOLDERPICKER_HXX_
 #define _FOLDERPICKER_HXX_
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -36,10 +36,9 @@
 //----------------------------------------------------------
 
 class CFolderPicker :
-    public  cppu::WeakImplHelper3<
-                com::sun::star::ui::dialogs::XFolderPicker,
-                com::sun::star::lang::XServiceInfo,
-                com::sun::star::util::XCancellable >
+    public  cppu::WeakImplHelper2<
+                com::sun::star::ui::dialogs::XFolderPicker2,
+                com::sun::star::lang::XServiceInfo >
 {
 public:
 
-- 
cgit