From 5837402fb1daa437d9a1a37edc9ede57319944f1 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 Nov 2012 17:46:30 +0200
Subject: fdo#46808, use service constructor for ucb::SimpleFileAccess

I upgraded the service to return XSimpleFileAccess3, since it
already implemented that interface, and it's backwards
compatible.

Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b
---
 basctl/source/basicide/baside3.cxx  | 5 ++---
 basctl/source/basicide/moduldl2.cxx | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'basctl/source/basicide')

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 27bdba100164..959fa8c70717 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -37,7 +37,6 @@
 #include <basic/basmgr.hxx>
 #include <com/sun/star/resource/StringResourceWithLocation.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
@@ -728,7 +727,7 @@ bool DialogWindow::SaveDialog()
         Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
         Reference< XInputStream > xInput( xISP->createInputStream() );
 
-        Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
+        Reference< XSimpleFileAccess3 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
 
         Reference< XOutputStream > xOutput;
         try
@@ -993,7 +992,7 @@ bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocum
             Reference< container::XNameContainer > xDialogModel( xMSF->createInstance
                 ( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
 
-            Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
+            Reference< XSimpleFileAccess3 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
 
             Reference< XInputStream > xInput;
             if( xSFI->exists( aCurPath ) )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 05f5c1051d8c..c0eebbe0774b 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -53,7 +53,6 @@
 #include <com/sun/star/script/XLibraryContainerExport.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include "com/sun/star/ucb/XCommandEnvironment.hpp"
 #include <com/sun/star/ucb/NameClash.hpp>
 #include "com/sun/star/packages/manifest/ManifestWriter.hpp"
@@ -855,7 +854,7 @@ void LibPage::InsertLib()
 
         if ( xMSF.is() )
         {
-            Reference< XSimpleFileAccess2 > xSFA( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
+            Reference< XSimpleFileAccess3 > xSFA( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
 
             OUString aModURL( aModURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
             if ( xSFA->exists( aModURL ) )
@@ -1257,7 +1256,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
     Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) );
-    Reference< XSimpleFileAccess2 > xSFA = SimpleFileAccess::create(xContext);
+    Reference< XSimpleFileAccess3 > xSFA = SimpleFileAccess::create(xContext);
 
     Reference < XFilePicker > xFP;
     Sequence <Any> aServiceType(1);
-- 
cgit