diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-01-21 15:45:43 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-01-21 21:25:22 +0100 |
| commit | f278397787f7b79cee8536e806e8b7113800f2ef (patch) | |
| tree | 1760bce432d466cf9f3ca444c89ec8f44306ab04 /sax | |
| parent | 3780738154b8c3b3f9d85c64cccf621d97574886 (diff) | |
Change _get_implementation()'s not to do initialization directly.
Many of the initalizations (in eg. framework) have to be done on an
acquire()'d object, so instead of doing the initialization directly, return
the initialization member function back to the createInstance() /
createInstanceWithContext() / ... and perform the initialization there.
As a sideeffect, I belive the calling initialize() from servicemanager is not
that much a hack any more - whoever converts the implementation to be
constructor-base has the choice to provide the callback, or still initialize
through XInitialization, where the callback is preferred by servicemanager
when it exists.
Change-Id: I8a87b75c54c1441ca0f184967d31ff4902fc4081
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 2 | ||||
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 2 | ||||
| -rw-r--r-- | sax/source/fastparser/fastparser.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 7d5e36cabf80..3f2adc5b7975 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -1023,7 +1023,7 @@ void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis ) extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + cppu::constructor_InitializationFunc &) { return static_cast<cppu::OWeakObject *>(new SaxExpatParser); } diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 73cb50ff74fe..24819526eeaf 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -1373,7 +1373,7 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_extensions_xml_sax_Writer_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + cppu::constructor_InitializationFunc &) { return static_cast<cppu::OWeakObject *>(new SAXWriter); } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 152c22da376a..a97c786c1299 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1429,7 +1429,7 @@ bool FastSaxParser::hasNamespaceURL( const OUString& rPrefix ) const extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence<css::uno::Any> const &) + cppu::constructor_InitializationFunc &) { return static_cast<cppu::OWeakObject *>(new FastSaxParser); } |