diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-08 09:08:08 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-08 14:59:30 +0100 |
commit | 194bdbde25dd70988c94ff5e1af43b530d47d94b (patch) | |
tree | 285dcce9c2f74c727e0dd727e3ad9acf238ae70e /vcl/source/app/svapp.cxx | |
parent | daa654fb44772009017b0c918903093147df1620 (diff) |
Revert "make FilePicker::createWithMode not crash"
This reverts commit 58ea27124af27bfac21a796b0d13d72354bd0dd3.
It's probably better to fix it another way.
Diffstat (limited to 'vcl/source/app/svapp.cxx')
-rw-r--r-- | vcl/source/app/svapp.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 945229c24b67..5e573d065c90 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -62,7 +62,6 @@ #include "com/sun/star/uno/Reference.h" #include "com/sun/star/awt/XToolkit.hpp" #include "com/sun/star/uno/XNamingService.hpp" -#include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "comphelper/solarmutex.hxx" #include "osl/process.h" @@ -1648,17 +1647,10 @@ bool Application::hasNativeFileSelection() } Reference< ui::dialogs::XFilePicker2 > -Application::createFilePicker(const uno::Sequence<uno::Any>& rArguments, - const Reference< uno::XComponentContext >& xSM) +Application::createFilePicker( const Reference< uno::XComponentContext >& xSM ) { ImplSVData* pSVData = ImplGetSVData(); - Reference< ui::dialogs::XFilePicker2 > xRet(pSVData->mpDefInst->createFilePicker(xSM)); - if (xRet.is() && rArguments.getLength()) - { - uno::Reference<lang::XInitialization> xInit(xRet, uno::UNO_QUERY_THROW); - xInit->initialize(rArguments); - } - return xRet; + return pSVData->mpDefInst->createFilePicker( xSM ); } Reference< ui::dialogs::XFolderPicker2 > |