[Libreoffice-commits] core.git: 2 commits - comphelper/Library_comphelper.mk comphelper/source include/comphelper offapi/com sax/qa sax/source sfx2/source svx/source writerperfect/source
Stephan Bergmann
sbergman at redhat.com
Mon Oct 21 14:55:47 PDT 2013
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/componentcontext.cxx | 115 -------
include/comphelper/componentcontext.hxx | 235 ----------------
offapi/com/sun/star/xml/sax/FastTokenHandler.idl | 4
sax/qa/cppunit/parser.cxx | 16 -
sax/source/tools/fshelper.cxx | 5
sfx2/source/sidebar/SidebarPanel.cxx | 9
svx/source/form/fmundo.cxx | 9
writerperfect/source/draw/CDRImportFilter.cxx | 7
writerperfect/source/draw/CMXImportFilter.cxx | 7
writerperfect/source/draw/MSPUBImportFilter.cxx | 7
writerperfect/source/draw/VisioImportFilter.cxx | 7
writerperfect/source/draw/WPGImportFilter.cxx | 7
writerperfect/source/writer/MSWorksImportFilter.cxx | 7
writerperfect/source/writer/MWAWImportFilter.cxx | 7
writerperfect/source/writer/WordPerfectImportFilter.cxx | 7
16 files changed, 52 insertions(+), 398 deletions(-)
New commits:
commit 6cc508aec4e30c72c00eac9e77fb6dd10cc093e9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 21 22:56:59 2013 +0200
Remove comphelper::ComponentContext
Change-Id: Idc5974e5a2ec68e8f1b2312a88fab15092c82788
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 4b30338..4fdada8 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -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 \
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
deleted file mode 100644
index ac9194c..0000000
--- a/comphelper/source/misc/componentcontext.cxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- 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: */
diff --git a/include/comphelper/componentcontext.hxx b/include/comphelper/componentcontext.hxx
deleted file mode 100644
index f99fb56..0000000
--- a/include/comphelper/componentcontext.hxx
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- 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/<instance_name></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/<instance_name></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: */
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index 52da2a6..52f6677 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -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));
diff --git a/sfx2/source/sidebar/SidebarPanel.cxx b/sfx2/source/sidebar/SidebarPanel.cxx
index 75f059a..ef9958c 100644
--- a/sfx2/source/sidebar/SidebarPanel.cxx
+++ b/sfx2/source/sidebar/SidebarPanel.cxx
@@ -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);
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index f8b17f1..3137572 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -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();
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 110e922..650a773 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index bf91f54..d73b505 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 088058c..6076888 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index e7f85d7..5565dd3 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index f52d425..0772915 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 4a4500e..f37b808 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 8e33dff..50f5e11 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -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);
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index a79e1aa..3141b45 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -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);
commit b13c8de265a6454c4677f52fd9a3440ac3279c51
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 21 22:43:18 2013 +0200
FastTokenHandler service should apparently have a default constructor
Change-Id: Iad5c4e05832128b5f41860cc4ae96f0472c37491
diff --git a/offapi/com/sun/star/xml/sax/FastTokenHandler.idl b/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
index 72d9bf3..eccca85 100644
--- a/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastTokenHandler.idl
@@ -24,9 +24,7 @@
module com { module sun { module star { module xml { module sax {
-service FastTokenHandler : XFastTokenHandler
-{
-};
+service FastTokenHandler : XFastTokenHandler;
}; }; }; }; };
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index ac4ac53..52da2a6 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -10,9 +10,9 @@
#include <sal/config.h>
#include <com/sun/star/io/Pipe.hpp>
+#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <test/bootstrapfixture.hxx>
#include <comphelper/componentcontext.hxx>
@@ -26,7 +26,6 @@ class ParserTest: public test::BootstrapFixture
{
InputSource maInput;
uno::Reference< XFastParser > mxParser;
- uno::Reference< XFastTokenHandler > mxTokenHandler;
uno::Reference< XFastDocumentHandler > mxDocumentHandler;
public:
@@ -49,10 +48,8 @@ void ParserTest::setUp()
mxParser.set( comphelper::ComponentContext(m_xContext).createComponent(
"com.sun.star.xml.sax.FastParser"), uno::UNO_QUERY );
CPPUNIT_ASSERT_MESSAGE("No FastParser!", mxParser.is());
- mxTokenHandler.set( comphelper::ComponentContext(m_xContext).createComponent(
- "com.sun.star.xml.sax.FastTokenHandler"), uno::UNO_QUERY );
- CPPUNIT_ASSERT_MESSAGE("No TokenHandler!", mxTokenHandler.is());
- mxParser->setTokenHandler( mxTokenHandler );
+ mxParser->setTokenHandler(
+ css::xml::sax::FastTokenHandler::create(m_xContext));
}
void ParserTest::tearDown()
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index f4b8ddd..c39cbea 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -19,7 +19,7 @@
#include <sax/fshelper.hxx>
#include "fastserializer.hxx"
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
+#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
@@ -32,8 +32,7 @@ FastSerializerHelper::FastSerializerHelper(const Reference< io::XOutputStream >&
mpSerializer(new FastSaxSerializer())
{
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext(), UNO_SET_THROW );
- Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), UNO_SET_THROW );
- mxTokenHandler.set( xFactory->createInstanceWithContext("com.sun.star.xml.sax.FastTokenHandler", xContext ), UNO_QUERY_THROW );
+ mxTokenHandler = css::xml::sax::FastTokenHandler::create(xContext);
mpSerializer->setFastTokenHandler( mxTokenHandler );
mpSerializer->setOutputStream( xOutputStream );
More information about the Libreoffice-commits
mailing list