[Libreoffice-commits] .: filter/Library_PptImporter.mk filter/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 2 02:07:13 PDT 2012


 filter/Library_PptImporter.mk                        |    1 
 filter/source/msfilter/powerpoint/pptimporteruno.cxx |   63 +++++++++++++++++++
 2 files changed, 64 insertions(+)

New commits:
commit 1a28e705322463f2ed25acace19c8edc33466eeb
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 2 12:04:00 2012 +0300

    Revert "As far as I can see the PptImporter library is not a UNO component"
    
    I don't trust myself.
    
    This reverts commit 2726f7f4ca5cde91565203ef055561558ea66e7d.

diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index 8fee1bd..f1d172a 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\
 
 $(eval $(call gb_Library_add_exception_objects,PptImporter,\
 	filter/source/msfilter/powerpoint/pptimporter \
+	filter/source/msfilter/powerpoint/pptimporteruno \
 	filter/source/msfilter/powerpoint/ppttoxml \
 ))
 
diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
new file mode 100644
index 0000000..be0b49e
--- /dev/null
+++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#include "pptimporter.hxx"
+
+#include <cppuhelper/factory.hxx>
+#include <uno/mapping.hxx>
+
+static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxFact )
+{
+    return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+    REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, "com.sun.star.presentation.PptImporter" ) == 0 )
+    {
+        const NMSP_RTL::OUString aServiceName( B2UCONST( "com.sun.star.presentation.PptImporter" ) );
+
+        xFactory = REF( NMSP_LANG::XSingleServiceFactory )( NMSP_CPPU::createSingleFactory(
+            reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >( pServiceManager ),
+                B2UCONST( "com.sun.star.presentation.PptImporter" ),
+                        create_PptImporter, SEQ( NMSP_RTL::OUString )( &aServiceName, 1 ) ) );
+    }
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list