[Libreoffice-commits] core.git: 2 commits - oox/source sd/source sd/util

[Stephan Bergmann]

 oox/source/core/services.cxx             |    5 +++++
 sd/source/filter/eppt/pptx-epptooxml.cxx |    4 +---
 sd/util/sdfilt.component                 |    4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 547217ecf2348cf511b1f058ecbab6f15f2bceff
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 3 16:23:10 2013 +0200

    Document seemingly dead QuickDiagrammingImport, QuickDiagrammingLayout
    
    Change-Id: I9662671d8dbce87993ba67cf8e4fd993ad1eb27a

diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 6873e4d..d62f159 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -48,6 +48,11 @@ namespace {
 #define IMPLEMENTATION_ENTRY( className ) \
     { &className##_createInstance, &className##_getImplementationName, &className##_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 }
 
+//TODO: QuickDiagrammingImport and QuickDiagrammingLayout are not listed in
+// oox/util/oox.component (and not directly referenced from anywhere in the code
+// either); it is unclear whether they are dead code or whether
+// a81327ff2faaf21c22f1a902bea170942d5207e6 "Import SmartArt graphics to
+// Impress" would actually want to make use of them:
 static ::cppu::ImplementationEntry const spServices[] =
 {
     IMPLEMENTATION_ENTRY( ::oox::core::FastTokenHandler ),
commit 9d0fcedaecc84c147f19c88bac1469b359eab16e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 3 15:53:08 2013 +0200

    Remove odd, unused com.sun.star.comp.ooxpptx service name
    
    Change-Id: I746e1fa25137db786f82dda50bfa4b497e94cefd

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ba04809..2535689 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2141,9 +2141,7 @@ OUString SAL_CALL PowerPointExport_getImplementationName() throw()
 
 uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() throw()
 {
-    const OUString aServiceName( "com.sun.star.comp.ooxpptx" );
-    const Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return Sequence< OUString >();
 }
 
 uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt ) throw( uno::Exception )
diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component
index 3b1d3b0..83a3ad1 100644
--- a/sd/util/sdfilt.component
+++ b/sd/util/sdfilt.component
@@ -9,7 +9,5 @@
 -->
 <component loader="com.sun.star.loader.SharedLibrary" prefix="sdfilt"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport">
-    <service name="com.sun.star.comp.ooxpptx"/>
-  </implementation>
+  <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport"/>
 </component>