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

Related fdo#46808: Fix UUIInteractionHandler::initialize argument handling

Browse Source 
This was a regression introduced with c25cb8a641
"fdo#46808, Adapt task::InteractionHandler UNO service to new style."

Change-Id: I52e36c4aabbf4b2b4552ed0e8ea164db15071980
This commit is contained in:
Stephan Bergmann
2012-10-26 11:16:50 +02:00
parent 489a0032f4
commit 402eaced75
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
uui/source/interactionhandler.cxx
View File

@@ -70,18 +70,26 @@ UUIInteractionHandler::initialize(
{
delete m_pImpl;
// The old-style InteractionHandler service supported a sequence of
// PropertyValue, while the new-style service now uses constructors to pass
// in Parent and Context values; for backwards compatibility, keep support
// for a PropertyValue sequence, too:
uno::Reference< awt::XWindow > xWindow;
rtl::OUString aContext;
::comphelper::NamedValueCollection aProperties( rArguments );
if ( aProperties.has( "Parent" ) )
if (!((rArguments.getLength() == 1 && (rArguments[0] >>= xWindow)) ||
(rArguments.getLength() == 2 && (rArguments[0] >>= xWindow) &&
(rArguments[1] >>= aContext))))
{
OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow );
::comphelper::NamedValueCollection aProperties( rArguments );
if ( aProperties.has( "Parent" ) )
{
OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow );
}
if ( aProperties.has( "Context" ) )
{
OSL_VERIFY( aProperties.get( "Context" ) >>= aContext );
}
}
if ( aProperties.has( "Context" ) )
{
OSL_VERIFY( aProperties.get( "Context" ) >>= aContext );
}
m_pImpl = new UUIInteractionHelper(m_xServiceFactory, xWindow, aContext);
}