diff options
Diffstat (limited to 'starmath/source')
| -rw-r--r-- | starmath/source/detreg.cxx | 89 | ||||
| -rw-r--r-- | starmath/source/eqnolefilehdr.hxx | 2 | ||||
| -rwxr-xr-x | starmath/source/makefile.mk | 112 | ||||
| -rw-r--r-- | starmath/source/register.cxx | 233 | ||||
| -rw-r--r-- | starmath/source/smdetect.cxx | 10 |
5 files changed, 2 insertions, 444 deletions
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx deleted file mode 100644 index ef4b261ce0b3..000000000000 --- a/starmath/source/detreg.cxx +++ /dev/null @@ -1,89 +0,0 @@ -/************************************************************************* - * - * 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" { - -void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, - uno_Environment** /*ppEnvironment*/ ) -{ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; -} - -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" - - - diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx index 330f5767384c..bfb6f5e159d7 100644 --- a/starmath/source/eqnolefilehdr.hxx +++ b/starmath/source/eqnolefilehdr.hxx @@ -57,7 +57,7 @@ public: void Write(SvStorageStream *pS); }; -sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); +SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); #endif diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk deleted file mode 100755 index c9f0226c8df4..000000000000 --- a/starmath/source/makefile.mk +++ /dev/null @@ -1,112 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -#MKDEPENDSOLVER=YES - -PRJ=.. - -PRJNAME=starmath -TARGET=starmath - -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SMDLL=TRUE - -SRS2NAME =smres -SRC2FILES = smres.src \ - symbol.src \ - toolbox.src \ - commands.src - -SLO1FILES = \ - $(SLO)$/accessibility.obj \ - $(SLO)$/action.obj \ - $(SLO)$/cfgitem.obj \ - $(SLO)$/config.obj \ - $(SLO)$/dialog.obj \ - $(SLO)$/document.obj \ - $(SLO)$/edit.obj \ - $(SLO)$/eqnolefilehdr.obj \ - $(SLO)$/format.obj \ - $(SLO)$/mathmlexport.obj \ - $(SLO)$/mathmlimport.obj \ - $(SLO)$/mathtype.obj \ - $(SLO)$/node.obj \ - $(SLO)$/parse.obj \ - $(SLO)$/rect.obj \ - $(SLO)$/register.obj \ - $(SLO)$/smdll.obj \ - $(SLO)$/smmod.obj \ - $(SLO)$/symbol.obj \ - $(SLO)$/toolbox.obj \ - $(SLO)$/typemap.obj \ - $(SLO)$/types.obj \ - $(SLO)$/unodoc.obj \ - $(SLO)$/utility.obj \ - $(SLO)$/view.obj \ - $(SLO)$/unomodel.obj - -SLO2FILES = \ - $(SLO)$/register.obj \ - $(SLO)$/detreg.obj - -SLOFILES = \ - $(SLO)$/smdetect.obj \ - $(SLO1FILES) \ - $(SLO2FILES) - -LIB1TARGET = \ - $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO1FILES) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(INCCOM)$/dllname.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo $(EMQ)#define DLL_NAME $(EMQ)"$(DLLPRE)sm$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - - -$(SRS)$/$(SRS2NAME).srs : $(LOCALIZE_ME_DEST) - diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx deleted file mode 100644 index a7e7ea2110a6..000000000000 --- a/starmath/source/register.cxx +++ /dev/null @@ -1,233 +0,0 @@ -/************************************************************************* - * - * 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" { - -void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, - uno_Environment** /*ppEnvironment*/ ) -{ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; -} - -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" - - - diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index aba7432cc6ed..7da3838557b3 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -29,17 +29,13 @@ #include "precompiled_starmath.hxx" #include "smdetect.hxx" - -//#include <framework/interaction.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -49,12 +45,8 @@ #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <framework/interaction.hxx> - -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <ucbhelper/simpleinteractionrequest.hxx> - #include <rtl/ustring.h> #include <rtl/logfile.hxx> #include <svl/itemset.hxx> @@ -76,8 +68,8 @@ #include <sfx2/brokenpackageint.hxx> #include "document.hxx" -#include "eqnolefilehdr.hxx" +extern sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ); using namespace ::com::sun::star; using namespace ::com::sun::star::uno; |