diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-02 13:10:20 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 15:18:28 +0200 |
| commit | a4ed76cda44d7589625876451a953c2210716084 (patch) | |
| tree | 5a339fa6cffefd2edd384d859840b7699b2914d9 /writerfilter/source/filter | |
| parent | a80169f2d97341c320d54bab5c26122b3c9ee28d (diff) | |
writerfilter10: convert writerfilter to gbuild [hg:1013d9bf5d0a]
Diffstat (limited to 'writerfilter/source/filter')
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/filter/makefile.mk | 52 |
2 files changed, 4 insertions, 54 deletions
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index deede335d9af..97d5b3a74895 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -61,12 +61,14 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = { 0, 0, 0, 0, 0, 0 } // terminate with NULL }; -void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL +component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry ) { return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries ); } diff --git a/writerfilter/source/filter/makefile.mk b/writerfilter/source/filter/makefile.mk deleted file mode 100644 index 6b11fd4ff1f3..000000000000 --- a/writerfilter/source/filter/makefile.mk +++ /dev/null @@ -1,52 +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. -# -# ***********************************************************************/ -PRJ=..$/.. -PRJNAME=writerfilter -TARGET=filter -GEN_HID=TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/writerfilter.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/WriterFilter.obj \ - $(SLO)$/WriterFilterDetection.obj \ - $(SLO)$/ImportFilter.obj \ - $(SLO)$/RtfFilter.obj - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - - |