diff options
Diffstat (limited to 'fpicker/source/office')
| -rw-r--r-- | fpicker/source/office/fps_office.component | 2 | ||||
| -rw-r--r-- | fpicker/source/office/fps_office.cxx | 2 | ||||
| -rw-r--r-- | fpicker/source/office/fpsmartcontent.cxx | 13 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 13 |
4 files changed, 13 insertions, 17 deletions
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component index ebce7f2e13b5..335a63a6f7a9 100644 --- a/fpicker/source/office/fps_office.component +++ b/fpicker/source/office/fps_office.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_office" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.svtools.OfficeFilePicker"> <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/> diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index 77a9e207e047..e38d25f06322 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -44,7 +44,7 @@ static cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper ( diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 5de4395ed362..9a68aaecb086 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -20,6 +20,7 @@ #include "fpsmartcontent.hxx" #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> #include <com/sun/star/ucb/XContent.hpp> @@ -79,9 +80,9 @@ namespace svt //-------------------------------------------------------------------- void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions) { - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_pOwnInteraction = new ::svt::OFilePickerInteractionHandler(xGlobalInteractionHandler); m_pOwnInteraction->enableInterceptions(eInterceptions); @@ -98,9 +99,9 @@ namespace svt m_pOwnInteraction = NULL; m_xOwnInteraction = Reference< XInteractionHandler >(); - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY ); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 46e2b708f506..f44c4c3f34ce 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -72,7 +72,7 @@ #include <osl/file.h> #include <vcl/waitobj.hxx> -#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" #include "fpinteraction.hxx" #include <osl/process.h> @@ -2000,14 +2000,9 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode new ::comphelper::OInteractionRequest( makeAny( aException ) ); pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) ); - Reference< XInteractionHandler > xHandler( - ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) - ), - UNO_QUERY - ); - if ( xHandler.is() ) - xHandler->handle( xRequest ); + Reference< XInteractionHandler2 > xHandler( + InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ) ); + xHandler->handle( xRequest ); } catch( const Exception& ) { |