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
---
 basctl/source/basicide/moduldl2.cxx | 38 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'basctl/source/basicide/moduldl2.cxx')

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a972bf5c5fa2..baef4799806a 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -45,7 +45,7 @@
 #include <sot/storage.hxx>
 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/script/XLibraryContainer2.hpp>
@@ -1386,30 +1386,26 @@ void LibPage::ExportAsBasic( const String& aLibName )
     // Folder picker
     Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
-    Reference< XFolderPicker > xFolderPicker( xMSF->createInstance(
-                "com.sun.star.ui.dialogs.FolderPicker" ), UNO_QUERY );
+    Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);
     Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) );
 
-    if( xFolderPicker.is() )
-    {
-        xFolderPicker->setTitle( String( IDEResId( RID_STR_EXPORTBASIC ) ) );
-
-        // set display directory and filter
-        String aPath =GetExtraData()->GetAddLibPath();
-        if( !aPath.Len() )
-            aPath = SvtPathOptions().GetWorkPath();
+    xFolderPicker->setTitle( String( IDEResId( RID_STR_EXPORTBASIC ) ) );
 
-        // INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
-        xFolderPicker->setDisplayDirectory( aPath );
-        short nRet = xFolderPicker->execute();
-        if( nRet == RET_OK )
-        {
-            String aTargetURL = xFolderPicker->getDirectory();
-            GetExtraData()->SetAddLibPath(aTargetURL);
+    // set display directory and filter
+    String aPath =GetExtraData()->GetAddLibPath();
+    if( !aPath.Len() )
+        aPath = SvtPathOptions().GetWorkPath();
+
+    // INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
+    xFolderPicker->setDisplayDirectory( aPath );
+    short nRet = xFolderPicker->execute();
+    if( nRet == RET_OK )
+    {
+        String aTargetURL = xFolderPicker->getDirectory();
+        GetExtraData()->SetAddLibPath(aTargetURL);
 
-            Reference< task::XInteractionHandler > xDummyHandler( new DummyInteractionHandler( xHandler ) );
-            implExportLib( aLibName, aTargetURL, xDummyHandler );
-        }
+        Reference< task::XInteractionHandler > xDummyHandler( new DummyInteractionHandler( xHandler ) );
+        implExportLib( aLibName, aTargetURL, xDummyHandler );
     }
 }
 
-- 
cgit