mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an InteractionHandler new-style service use

Browse Source 
Change-Id: I593467dce8f1e70e1f5068d722dfa0654d3346b7
This commit is contained in:
Stephan Bergmann 2012-10-04 18:05:46 +02:00
parent 8e753f8446
commit 31713fee3c
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
embedserv/source/embed/docholder.cxx
View File

@ -59,6 +59,7 @@
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
#include <rtl/process.h>
@ -113,9 +114,8 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
m_xFrame,uno::UNO_QUERY);
if( xComponentLoader.is() && m_xDocument.is() )
{
uno::Reference< task::XInteractionHandler > xHandler(
task::InteractionHandler::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< task::XInteractionHandler2 > xHandler(
task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_xFactory), 0) );
uno::Any aAny;
sal_Int32 nLen = 3;
@ -158,25 +158,22 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
beans::PropertyState_DIRECT_VALUE);
}
if ( xHandler.is() )
{
aSeq.realloc( nLen+=2 );
aAny <<= xHandler;
aSeq[nLen-2] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
aSeq.realloc( nLen+=2 );
aAny <<= xHandler;
aSeq[nLen-2] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= m_nMacroExecMode;
aSeq[nLen-1] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
}
aAny <<= m_nMacroExecMode;
aSeq[nLen-1] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
xComponentLoader->loadComponentFromURL(
rtl::OUString(