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

fdo#46808, convert some code to use getProcessComponentContext

Browse Source 
these VBA services should be left alone, according to Noel Power.

Change-Id: Iee394f73fa99c18d6b70892bff9b0e2122f67d69
This commit is contained in:
Noel Grandin
2013-01-10 09:49:22 +02:00
parent 614e31aa24
commit 4ce614f50b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vbahelper/source/vbahelper/vbashape.cxx
View File

@@ -329,11 +329,11 @@ ScVbaShape::TextFrame() throw (uno::RuntimeException)
uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
if( xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) if( xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
{ {
uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
uno::Sequence< uno::Any > aArgs(2); uno::Sequence< uno::Any > aArgs(2);
aArgs[0] = uno::makeAny( getParent() ); aArgs[0] = uno::makeAny( getParent() );
aArgs[1] <<= m_xShape; aArgs[1] <<= m_xShape;
uno::Reference< uno::XInterface > xTextFrame( xSF->createInstanceWithArguments( "ooo.vba.excel.TextFrame" , aArgs ) , uno::UNO_QUERY_THROW ); uno::Reference< uno::XInterface > xTextFrame = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.excel.TextFrame" , aArgs, xContext );
return uno::makeAny( xTextFrame ); return uno::makeAny( xTextFrame );
} }
@@ -666,11 +666,11 @@ ScVbaShape::WrapFormat() throw (uno::RuntimeException)
uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" )) if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" ))
{ {
uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
uno::Sequence< uno::Any > aArgs(2); uno::Sequence< uno::Any > aArgs(2);
aArgs[0] = uno::makeAny( getParent() ); aArgs[0] = uno::makeAny( getParent() );
aArgs[1] <<= m_xShape; aArgs[1] <<= m_xShape;
uno::Reference< uno::XInterface > xWrapFormat( xSF->createInstanceWithArguments( "ooo.vba.word.WrapFormat" , aArgs ) , uno::UNO_QUERY_THROW ); uno::Reference< uno::XInterface > xWrapFormat = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.word.WrapFormat" , aArgs, xContext );
return uno::makeAny( xWrapFormat ); return uno::makeAny( xWrapFormat );
} }
throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() );