summaryrefslogtreecommitdiff
path: root/xmlscript/source/misc
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-03-02 11:54:18 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 00:59:06 +0200
commitb0fe6086c3a0d6a4b4927e79ca06833f3ead24df (patch)
tree3fa905f5795f10b0f55eda70f850d50605e3497a /xmlscript/source/misc
parent270dd44c43555643a08bde21cb792e105a86ce72 (diff)
CWS gnumake4: convert xmlscript to new build system [hg:d4df54d61f2a]
Diffstat (limited to 'xmlscript/source/misc')
-rw-r--r--xmlscript/source/misc/makefile.mk48
-rw-r--r--xmlscript/source/misc/unoservices.cxx4
2 files changed, 2 insertions, 50 deletions
diff --git a/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk
deleted file mode 100644
index dfac81bfa6aa..000000000000
--- a/xmlscript/source/misc/makefile.mk
+++ /dev/null
@@ -1,48 +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=xmlscript
-TARGET=misc
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/unoservices.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.ENDIF # L10N_framework
-.INCLUDE : target.mk
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 0d4d8db169ac..6bcaf49c1f72 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -107,7 +107,7 @@ namespace xmlscript
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -115,7 +115,7 @@ extern "C"
// -----------------------------------------------------------------------------
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(