diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-03 15:06:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-03 15:33:39 +0200 |
| commit | 3505f0e46c2e0a743ab5de9adfbec3044a4573a6 (patch) | |
| tree | 82e95afbc3b938e98fdfb022ecff8590f6688b4e /sd | |
| parent | 8400e2294e1145427bd9eda7a36a76b0ae75e577 (diff) | |
Revert "fdo#46808, Convert oox::PowerPointExport service to new style"
This reverts commit 02021163dbbcc8904da0b2138c8b53684dcc8ab4. The filter
appears to be split in two (com.sun.star.comp.oox.ppt.PowerPointImport
implementation oox::ppt::PowerPointImport from include/oox/ppt/pptimport.hxx for
im-/export, for export calling com.sun.star.comp.Impress.oox.PowerPointExport
implementation PowerPointExport from sd/source/filter/eppt/epptooxml.hxx) for no
good reason, so the com.sun.star.oox.PowerPointExport new-style service is
supporting a hack that should rather be cleaned up.
Conflicts:
offapi/UnoApi_offapi.mk
Change-Id: I875192a68a8e3458dbfd74b4981a6a2e86ce44d7
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 5 | ||||
| -rw-r--r-- | sd/util/sdfilt.component | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 084fa7873216..ba04809775e1 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2141,9 +2141,8 @@ OUString SAL_CALL PowerPointExport_getImplementationName() throw() uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() throw() { - Sequence< OUString > aSeq( 2 ); - aSeq[0] = "com.sun.star.comp.ooxpptx"; - aSeq[1] = "com.sun.star.oox.PowerPointExport"; + const OUString aServiceName( "com.sun.star.comp.ooxpptx" ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component index 349ea8b87194..3b1d3b0fb62b 100644 --- a/sd/util/sdfilt.component +++ b/sd/util/sdfilt.component @@ -11,6 +11,5 @@ xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"> <service name="com.sun.star.comp.ooxpptx"/> - <service name="com.sun.star.oox.PowerPointExport"/> </implementation> </component> |