Kaydet (Commit) a74854cb authored tarafından Noel Grandin's avatar Noel Grandin

fdo#46808, script::DocumentDialogLibraryContainer needed a new constructor

Change-Id: I44184dc45150e9b3b8ca4b838ea88ad260578b93
üst b0e7466f
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
#include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/script/XLibraryContainerExport.hpp> #include <com/sun/star/script/XLibraryContainerExport.hpp>
#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/InteractionHandler.hpp>
...@@ -781,7 +782,6 @@ void LibPage::NewLib() ...@@ -781,7 +782,6 @@ void LibPage::NewLib()
void LibPage::InsertLib() void LibPage::InsertLib()
{ {
Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
// file open dialog // file open dialog
Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILEOPEN_SIMPLE); Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILEOPEN_SIMPLE);
...@@ -858,10 +858,8 @@ void LibPage::InsertLib() ...@@ -858,10 +858,8 @@ void LibPage::InsertLib()
OUString aDlgURL( aDlgURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); OUString aDlgURL( aDlgURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
if ( xSFA->exists( aDlgURL ) ) if ( xSFA->exists( aDlgURL ) )
{ {
Sequence <Any> aSeqDlgURL(1); xDlgLibContImport = Reference< script::XLibraryContainer2 >(
aSeqDlgURL[0] <<= aDlgURL; script::DocumentDialogLibraryContainer::createWithURL(xContext, aDlgURL), UNO_QUERY );
xDlgLibContImport = Reference< script::XLibraryContainer2 >( xMSF->createInstanceWithArguments(
"com.sun.star.script.DocumentDialogLibraryContainer", aSeqDlgURL ), UNO_QUERY );
} }
if ( xModLibContImport.is() || xDlgLibContImport.is() ) if ( xModLibContImport.is() || xDlgLibContImport.is() )
......
...@@ -54,6 +54,8 @@ service DocumentDialogLibraryContainer : XStorageBasedLibraryContainer ...@@ -54,6 +54,8 @@ service DocumentDialogLibraryContainer : XStorageBasedLibraryContainer
*/ */
create( [in] ::com::sun::star::document::XStorageBasedDocument Document ) create( [in] ::com::sun::star::document::XStorageBasedDocument Document )
raises( ::com::sun::star::lang::IllegalArgumentException ); raises( ::com::sun::star::lang::IllegalArgumentException );
createWithURL( [in] string URL );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment