Skip to content

C
core
Kaydet (Commit) 6cc508ae authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Remove comphelper::ComponentContext 

Change-Id: Idc5974e5a2ec68e8f1b2312a88fab15092c82788
üst b13c8de2
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 386 deletions
comphelper/Library_comphelper.mk
Dosyayı görüntüle @ 6cc508ae
......@@ -76,7 +76,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/comphelper_module \
comphelper/source/misc/comphelper_services \
comphelper/source/misc/componentbase \
comphelper/source/misc/componentcontext \
comphelper/source/misc/componentmodule \
comphelper/source/misc/configuration \
comphelper/source/misc/configurationhelper \
......
comphelper/source/misc/componentcontext.cxx deleted 100644 → 0
Dosyayı görüntüle @ b13c8de2
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
//........................................................................
namespace comphelper
{
//........................................................................
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::lang::NullPointerException;
using ::com::sun::star::lang::ServiceNotRegisteredException;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Sequence;
//====================================================================
//= ComponentContext
//====================================================================
//--------------------------------------------------------------------
ComponentContext::ComponentContext( const Reference< XComponentContext >& _rxContext )
:m_xContext( _rxContext )
{
if ( m_xContext.is() )
m_xORB = m_xContext->getServiceManager();
}
//------------------------------------------------------------------------
ComponentContext::ComponentContext( const Reference< XMultiServiceFactory >& _rxLegacyFactory )
{
if ( !_rxLegacyFactory.is() )
throw NullPointerException();
m_xContext = comphelper::getComponentContext( _rxLegacyFactory );
m_xORB = m_xContext->getServiceManager();
}
//------------------------------------------------------------------------
Any ComponentContext::getContextValueByName( const OUString& _rName ) const
{
Any aReturn;
try
{
aReturn = m_xContext->getValueByName( _rName );
}
catch( const Exception& )
{
OSL_FAIL( "ComponentContext::getContextValueByName: caught an exception!" );
}
return aReturn;
}
//------------------------------------------------------------------------
Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const
{
Reference< XInterface > xComponent(
m_xORB->createInstanceWithContext( _rServiceName, m_xContext )
);
if ( !xComponent.is() )
throw ServiceNotRegisteredException( _rServiceName, NULL );
return xComponent;
}
//------------------------------------------------------------------------
Reference< XInterface > ComponentContext::createComponentWithArguments( const OUString& _rServiceName, const Sequence< Any >& _rArguments ) const
{
Reference< XInterface > xComponent(
m_xORB->createInstanceWithArgumentsAndContext( _rServiceName, _rArguments, m_xContext )
);
if ( !xComponent.is() )
throw ServiceNotRegisteredException( _rServiceName, NULL );
return xComponent;
}
//------------------------------------------------------------------------
Reference< XInterface > ComponentContext::getSingleton( const OUString& _rInstanceName ) const
{
OUString sKey( "/singletons/" );
sKey += _rInstanceName;
return Reference< XInterface >( getContextValueByName( sKey ), UNO_QUERY );
}
//........................................................................
} // namespace comphelper
//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/comphelper/componentcontext.hxx deleted 100644 → 0
Dosyayı görüntüle @ b13c8de2
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef COMPHELPER_COMPONENTCONTEXT_HXX
#define COMPHELPER_COMPONENTCONTEXT_HXX
#include <comphelper/comphelperdllapi.h>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
//........................................................................
namespace comphelper
{
//........................................................................
//====================================================================
//= ComponentContext
//====================================================================
/** a helper class for working with a component context
*/
class COMPHELPER_DLLPUBLIC ComponentContext
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > m_xORB;
public:
/** constructs an instance
@param _rxContext
the component context to manage
@throws ::com::sun::star::lang::NullPointerException
if the given context, or its component factory, are <NULL/>
*/
ComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext );
/** constructs an instance
@param _rxLegacyFactory
the legacy service factor to obtain the com::sun::star::uno::XComponentContext from
@throws ::com::sun::star::uno::RuntimeException
if the given factory or does not have a DefaultContext property to obtain
a component context
@throws ::com::sun::star::lang::NullPointerException
if the given factory is <NULL/>, or provides a component context being <NULL/>, or provides
a component context whose component factory is <NULL/>
*/
ComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxLegacyFactory );
/** returns the ->XComponentContext interface
*/
inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
getUNOContext() const { return m_xContext; }
/** determines whether the context is not <NULL/>
*/
inline sal_Bool is() const
{
return m_xContext.is();
}
/** creates a component using our component factory/context
@throws ::com::sun::star::uno::Exception
@return
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
_out_rxComponent.clear();
_out_rxComponent = _out_rxComponent.query(
m_xORB->createInstanceWithContext( _rServiceName, m_xContext )
);
return _out_rxComponent.is();
}
/** creates a component using our component factory/context
@throws ::com::sun::star::uno::Exception
@return
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent );
}
/** creates a component using our component factory/context, passing creation arguments
@throws ::com::sun::star::uno::Exception
@return
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
bool createComponentWithArguments( const OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
_out_rxComponent.clear();
_out_rxComponent = _out_rxComponent.query(
m_xORB->createInstanceWithArgumentsAndContext( _rServiceName, _rArguments, m_xContext )
);
return _out_rxComponent.is();
}
/** creates a component using our component factory/context, passing creation arguments
@throws ::com::sun::star::uno::Exception
@return
<TRUE/> if and only if the component could be successfully created
*/
template < typename INTERFACE >
bool createComponentWithArguments( const sal_Char* _pAsciiServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
{
return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent );
}
/** creates a component using our component factory/context
@throws ::com::sun::star::lang::ServiceNotRegisteredException
if the given service is not registered
@throws Exception
if an exception occurred during creating the component
@return
the newly created component. Is never <NULL/>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const;
/** creates a component using our component factory/context
@throws ::com::sun::star::lang::ServiceNotRegisteredException
if the given service is not registered
@throws Exception
if an exception occurred during creating the component
@return
the newly created component. Is never <NULL/>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const
{
return createComponent( OUString::createFromAscii( _pAsciiServiceName ) );
}
/** creates a component using our component factory/context, passing creation arguments
@throws ::com::sun::star::lang::ServiceNotRegisteredException
if the given service is not registered
@throws Exception
if an exception occurred during creating the component
@return
the newly created component. Is never <NULL/>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponentWithArguments(
const OUString& _rServiceName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
) const;
/** creates a component using our component factory/context, passing creation arguments
@throws ::com::sun::star::lang::ServiceNotRegisteredException
if the given service is not registered
@throws Exception
if an exception occurred during creating the component
@return
the newly created component. Is never <NULL/>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponentWithArguments(
const sal_Char* _pAsciiServiceName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
) const
{
return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments );
}
/** retrieves a singleton instance from the context
Singletons are collected below the <code>/singletons</code> key in a component context,
so accessing them means retrieving the value under <code>/singletons/&lt;instance_name&gt;</code>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const OUString& _rInstanceName ) const;
/** retrieves a singleton instance from the context
Singletons are collected below the <code>/singletons</code> key in a component context,
so accessing them means retrieving the value under <code>/singletons/&lt;instance_name&gt;</code>.
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const sal_Char* _pAsciiInstanceName ) const
{
return getSingleton( OUString::createFromAscii( _pAsciiInstanceName ) );
}
/** retrieves a value from our component context
@param _rName
the name of the value to retrieve
@return
the context value with the given name
@seealso XComponentContext::getValueByName
@seealso getContextValueByAsciiName
*/
::com::sun::star::uno::Any
getContextValueByName( const OUString& _rName ) const;
/** retrieves a value from our component context, specified by 8-bit ASCII string
@param _rName
the name of the value to retrieve, as ASCII character string
@return
the context value with the given name
@seealso XComponentContext::getValueByName
@seealso getContextValueByName
*/
inline ::com::sun::star::uno::Any
getContextValueByAsciiName( const sal_Char* _pAsciiName ) const
{
return getContextValueByName( OUString::createFromAscii( _pAsciiName ) );
}
};
//........................................................................
} // namespace comphelper
//........................................................................
#endif // COMPHELPER_COMPONENTCONTEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sax/qa/cppunit/parser.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -15,7 +15,6 @@
#include <com/sun/star/xml/sax/XFastParser.hpp>
#include <test/bootstrapfixture.hxx>
#include <comphelper/componentcontext.hxx>
using namespace css;
using namespace css::xml::sax;
......@@ -45,8 +44,10 @@ private:
void ParserTest::setUp()
{
test::BootstrapFixture::setUp();
mxParser.set( comphelper::ComponentContext(m_xContext).createComponent(
"com.sun.star.xml.sax.FastParser"), uno::UNO_QUERY );
mxParser.set(
m_xContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.xml.sax.FastParser", m_xContext),
uno::UNO_QUERY );
CPPUNIT_ASSERT_MESSAGE("No FastParser!", mxParser.is());
mxParser->setTokenHandler(
css::xml::sax::FastTokenHandler::create(m_xContext));
......
sfx2/source/sidebar/SidebarPanel.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -26,7 +26,6 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <svl/smplhint.hxx>
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/awt/XWindowPeer.hpp>
......@@ -103,11 +102,11 @@ cssu::Reference<css::rendering::XCanvas> SAL_CALL SidebarPanel::getCanvas (void)
aArg[3] = makeAny(sal_False);
aArg[4] = makeAny(mpPanel->GetComponentInterface());
const ::comphelper::ComponentContext aComponentContext (::comphelper::getProcessServiceFactory());
css::uno::Reference<css::uno::XComponentContext> context(
comphelper::getProcessComponentContext());
mxCanvas = Reference<rendering::XCanvas>(
aComponentContext.createComponentWithArguments(
"com.sun.star.rendering.Canvas.VCL",
aArg),
context->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.rendering.Canvas.VCL", aArg, context),
UNO_QUERY);
}
......
svx/source/form/fmundo.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -53,7 +53,6 @@
#include <comphelper/property.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/componentcontext.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
......@@ -114,8 +113,12 @@ private:
try
{
::comphelper::ComponentContext const aContext( ::comphelper::getProcessComponentContext() );
Reference< XScriptListener > const xScriptListener( aContext.createComponent( "ooo.vba.EventListener" ), UNO_QUERY_THROW );
css::uno::Reference<css::uno::XComponentContext> context(
comphelper::getProcessComponentContext());
Reference< XScriptListener > const xScriptListener(
context->getServiceManager()->createInstanceWithContext(
"ooo.vba.EventListener", context),
UNO_QUERY_THROW);
Reference< XPropertySet > const xListenerProps( xScriptListener, UNO_QUERY_THROW );
// SfxObjectShellRef is good here since the model controls the lifetime of the shell
SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell();
......
writerperfect/source/draw/CDRImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -22,7 +22,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <libcdr/libcdr.h>
......@@ -73,8 +72,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Draw.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/draw/CMXImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -22,7 +22,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <libcdr/libcdr.h>
......@@ -73,8 +72,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Draw.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/draw/MSPUBImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -18,7 +18,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <libmspub/libmspub.h>
......@@ -69,8 +68,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Draw.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/draw/VisioImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -18,7 +18,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <libvisio/libvisio.h>
......@@ -69,8 +68,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Draw.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/draw/WPGImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -24,7 +24,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <libodfgen/libodfgen.hxx>
......@@ -75,8 +74,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Draw.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/writer/MSWorksImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -20,7 +20,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <ucbhelper/content.hxx>
......@@ -75,8 +74,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Writer.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/writer/MWAWImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -20,7 +20,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <ucbhelper/content.hxx>
......@@ -847,8 +846,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Writer.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
writerperfect/source/writer/WordPerfectImportFilter.cxx
Dosyayı görüntüle @ 6cc508ae
......@@ -20,7 +20,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
#include <sfx2/passwd.hxx>
#include <ucbhelper/content.hxx>
......@@ -128,8 +127,10 @@ throw (RuntimeException)
}
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
Reference < XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Writer.XMLOasisImporter", mxContext),
css::uno::UNO_QUERY_THROW);
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
......
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