gtk: move the file-picker into vcl/ and add Application:: factory hooks

drop un-necessary uno service related fluff, and component instantiation.
nominal move to XMultiComponentFactory from XMultiServiceFactory
Include fpicker in compilation for gtk3, but more work required here
Simplify setting up transient parents for picker dialogs

1 files changed, 6 insertions, 35 deletions

diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index 5110ea86a0f6..57cd0e05cabe 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -29,35 +29,23 @@
 #ifndef _SALGTKFOLDERPICKER_HXX_
 #define _SALGTKFOLDERPICKER_HXX_
 
-//_______________________________________________________________________________________________________________________
-//  includes of other projects
-//_______________________________________________________________________________________________________________________
-
-#include <cppuhelper/implbase3.hxx>
-
-#include "SalGtkPicker.hxx"
-
+#include <list>
 #include <memory>
-
 #include <rtl/ustring.hxx>
+#include <cppuhelper/implbase3.hxx>
 
-#include <list>
-
-//----------------------------------------------------------
-// class declaration
-//----------------------------------------------------------
+#include "gtk/fpicker/SalGtkPicker.hxx"
 
 class SalGtkFolderPicker :
         public SalGtkPicker,
-    public cppu::WeakImplHelper3<
-    ::com::sun::star::ui::dialogs::XFolderPicker,
-    ::com::sun::star::lang::XServiceInfo,
+    public cppu::WeakImplHelper2<
+        ::com::sun::star::ui::dialogs::XFolderPicker,
         ::com::sun::star::util::XCancellable >
 {
     public:
 
         // constructor
-        SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
+        SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr );
 
         //------------------------------------------------------------------------------------
         // XExecutableDialog functions
@@ -85,20 +73,6 @@ class SalGtkFolderPicker :
         virtual void SAL_CALL setDescription( const rtl::OUString& rDescription )
             throw( com::sun::star::uno::RuntimeException );
 
-
-        //------------------------------------------------
-        // XServiceInfo
-        //------------------------------------------------
-
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
-            throw(::com::sun::star::uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
-            throw(::com::sun::star::uno::RuntimeException);
-
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
-            throw(::com::sun::star::uno::RuntimeException);
-
         //------------------------------------------------
         // XCancellable
         //------------------------------------------------
@@ -117,9 +91,6 @@ class SalGtkFolderPicker :
         // prevent copy and assignment
         SalGtkFolderPicker( const SalGtkFolderPicker& );
         SalGtkFolderPicker& operator=( const SalGtkFolderPicker& );
-    private:
-        // to instanciate own services
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
 };
 
 #endif // _SALGTKFOLDERPICKER_HXX_