[Libreoffice-commits] .: Branch 'feature/gnumake4' - starmath/Library_smd.mk starmath/Library_sm.mk starmath/source

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Thu Jul 21 03:52:27 PDT 2011


 starmath/Library_sm.mk       |    2 
 starmath/Library_smd.mk      |    3 
 starmath/source/detreg.cxx   |   84 +++++++++++++++
 starmath/source/register.cxx |  228 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 315 insertions(+), 2 deletions(-)

New commits:
commit 32288027fcb5acdbbc1c69183db9a140d149dd3e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 21 12:47:51 2011 +0200

    Add missing-files to starmath libraries

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 20e797d..7e5162f 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/dialog \
         starmath/source/document \
         starmath/source/edit \
-        starmath/source/eqnolefilehdr \
         starmath/source/format \
         starmath/source/mathmlexport \
         starmath/source/mathmlimport \
@@ -74,6 +73,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/node \
         starmath/source/parse \
         starmath/source/rect \
+		starmath/source/register \
 		starmath/source/smdll \
         starmath/source/smmod \
         starmath/source/symbol \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index d1596e7..5653614 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
 	cppuhelper \
 	sal \
 	sfx \
-	sm \
 	sot \
 	svl \
 	svt \
@@ -54,7 +53,9 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,smd,\
+	starmath/source/detreg \
 	starmath/source/smdetect \
+	starmath/source/eqnolefilehdr \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
new file mode 100644
index 0000000..73dec83
--- /dev/null
+++ b/starmath/source/detreg.cxx
@@ -0,0 +1,84 @@
+/* -*- 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ustring.hxx>
+
+#include "smdetect.hxx"
+
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+
+extern "C" {
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+                                     void* pServiceManager,
+                                     void* /*pRegistryKey*/ )
+{
+    // Set default return value for this operation - if it failed.
+    void* pReturn = NULL ;
+
+    if	(
+            ( pImplementationName	!=	NULL ) &&
+            ( pServiceManager		!=	NULL )
+        )
+    {
+        // Define variables which are used in following macros.
+        Reference< XSingleServiceFactory >   xFactory                                                                                                ;
+        Reference< XMultiServiceFactory >    xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+        if( SmFilterDetect::impl_getStaticImplementationName().equalsAscii( pImplementationName ) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmFilterDetect::impl_getStaticImplementationName(),
+            SmFilterDetect::impl_createInstance,
+            SmFilterDetect::impl_getStaticSupportedServiceNames() );
+        }
+
+        // Factory is valid - service was found.
+        if ( xFactory.is() )
+        {
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+    }
+
+    // Return with result of this operation.
+    return pReturn ;
+}
+} // extern "C"
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
new file mode 100644
index 0000000..39ff91a
--- /dev/null
+++ b/starmath/source/register.cxx
@@ -0,0 +1,228 @@
+/* -*- 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ustring.hxx>
+
+#include <sfx2/sfxmodelfactory.hxx>
+
+#include "smdll.hxx"
+#include "document.hxx"
+#include "unomodel.hxx"
+
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+
+//Math document
+extern Sequence< OUString > SAL_CALL
+        SmDocument_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmDocument_getImplementationName() throw();
+extern Reference< XInterface >SAL_CALL
+        SmDocument_createInstance(const Reference< XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags) throw( Exception );
+
+//MathML import
+extern Sequence< OUString > SAL_CALL
+        SmXMLImport_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLImport_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLImportMeta_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLImportMeta_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLImportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLImportSettings_getSupportedServiceNames() throw();
+extern OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLImportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+
+//MathML export
+extern Sequence< OUString > SAL_CALL
+        SmXMLExport_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExport_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLExportMetaOOO_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExportMetaOOO_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExportMetaOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLExportMeta_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExportMeta_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLExportSettingsOOO_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExportSettingsOOO_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExportSettingsOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLExportSettings_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExportSettings_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+        SmXMLExportContent_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+        SmXMLExportContent_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+        SmXMLExportContent_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+
+
+extern "C" {
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+                                     void* pServiceManager,
+                                     void* /*pRegistryKey*/ )
+{
+    // Set default return value for this operation - if it failed.
+    void* pReturn = NULL ;
+
+    if	(
+            ( pImplementationName	!=	NULL ) &&
+            ( pServiceManager		!=	NULL )
+        )
+    {
+        // Define variables which are used in following macros.
+        Reference< XSingleServiceFactory >   xFactory                                                                                                ;
+        Reference< XMultiServiceFactory >    xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+        if( SmXMLImport_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLImport_getImplementationName(),
+            SmXMLImport_createInstance,
+            SmXMLImport_getSupportedServiceNames() );
+        }
+        else if( SmXMLExport_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExport_getImplementationName(),
+            SmXMLExport_createInstance,
+            SmXMLExport_getSupportedServiceNames() );
+        }
+        else if( SmXMLImportMeta_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLImportMeta_getImplementationName(),
+            SmXMLImportMeta_createInstance,
+            SmXMLImportMeta_getSupportedServiceNames() );
+        }
+        else if( SmXMLExportMetaOOO_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExportMetaOOO_getImplementationName(),
+            SmXMLExportMetaOOO_createInstance,
+            SmXMLExportMetaOOO_getSupportedServiceNames() );
+        }
+        else if( SmXMLExportMeta_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExportMeta_getImplementationName(),
+            SmXMLExportMeta_createInstance,
+            SmXMLExportMeta_getSupportedServiceNames() );
+        }
+        else if( SmXMLImportSettings_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLImportSettings_getImplementationName(),
+            SmXMLImportSettings_createInstance,
+            SmXMLImportSettings_getSupportedServiceNames() );
+        }
+        else if( SmXMLExportSettingsOOO_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExportSettingsOOO_getImplementationName(),
+            SmXMLExportSettingsOOO_createInstance,
+            SmXMLExportSettingsOOO_getSupportedServiceNames() );
+        }
+        else if( SmXMLExportSettings_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExportSettings_getImplementationName(),
+            SmXMLExportSettings_createInstance,
+            SmXMLExportSettings_getSupportedServiceNames() );
+        }
+        else if( SmXMLExportContent_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::cppu::createSingleFactory( xServiceManager,
+            SmXMLExportContent_getImplementationName(),
+            SmXMLExportContent_createInstance,
+            SmXMLExportContent_getSupportedServiceNames() );
+        }
+        else if( SmDocument_getImplementationName().equalsAsciiL(
+            pImplementationName, strlen(pImplementationName)) )
+        {
+            xFactory = ::sfx2::createSfxModelFactory( xServiceManager,
+            SmDocument_getImplementationName(),
+            SmDocument_createInstance,
+            SmDocument_getSupportedServiceNames() );
+        }
+
+
+        // Factory is valid - service was found.
+        if ( xFactory.is() )
+        {
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+    }
+
+    // Return with result of this operation.
+    return pReturn ;
+}
+} // extern "C"
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list