diff options
author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-05-04 23:41:10 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-06 07:23:20 +0200 |
commit | 953d9ab43b38a5d181d64a4c87255a6182248897 (patch) | |
tree | c3b11c4e424bd07b88f3d3b270d064fb42ec2aab /registry/source | |
parent | c2003c73d71001fcb66fb86a15cde82e60aa242a (diff) |
gbuild conversion: registry module
Change-Id: I I9dbd2a05602e7d415ca76850458129f68583c83f
Diffstat (limited to 'registry/source')
-rw-r--r-- | registry/source/makefile.mk | 53 | ||||
-rw-r--r-- | registry/source/reflwrit.cxx | 18 | ||||
-rw-r--r-- | registry/source/registry.cxx | 25 |
3 files changed, 22 insertions, 74 deletions
diff --git a/registry/source/makefile.mk b/registry/source/makefile.mk deleted file mode 100644 index 9b9cb5ca4fee..000000000000 --- a/registry/source/makefile.mk +++ /dev/null @@ -1,53 +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=registry -TARGET=regcpp - -ENABLE_EXCEPTIONS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : ..$/version.mk - -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/regimpl.obj \ - $(SLO)$/regkey.obj \ - $(SLO)$/registry.obj \ - $(SLO)$/keyimpl.obj \ - $(SLO)$/reflread.obj \ - $(SLO)$/reflwrit.obj - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 791a6e4b68c1..4ee8b9611b90 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName); } -sal_Bool typereg_writer_setFieldData( +REG_DLLPUBLIC sal_Bool typereg_writer_setFieldData( void * handle, sal_uInt16 index, rtl_uString const * documentation, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * typeName, RTValueType valueType, @@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry, constValue); } -sal_Bool typereg_writer_setMethodData( +REG_DLLPUBLIC sal_Bool typereg_writer_setMethodData( void * handle, sal_uInt16 index, rtl_uString const * documentation, RTMethodMode flags, rtl_uString const * name, rtl_uString const * returnTypeName, sal_uInt16 parameterCount, @@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry, hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount); } -sal_Bool typereg_writer_setMethodParameterData( +REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData( void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry, hEntry, index, paramIndex, mode, name, type); } -sal_Bool typereg_writer_setMethodExceptionTypeName( +REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName( void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry, typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type); } -void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size) +REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size) SAL_THROW_EXTERN_C() { TypeWriter * writer = static_cast< TypeWriter * >(handle); @@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry) return size; } -sal_Bool typereg_writer_setReferenceData( +REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData( void * handle, sal_uInt16 index, rtl_uString const * documentation, RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry, typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name); } -void * typereg_writer_create( +REG_DLLPUBLIC void * typereg_writer_create( typereg_Version version, rtl_uString const * documentation, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * typeName, sal_uInt16 superTypeCount, @@ -1424,11 +1424,11 @@ void * typereg_writer_create( } } -void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { +REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { delete static_cast< TypeWriter * >(handle); } -sal_Bool typereg_writer_setSuperTypeName( +REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName( void * handle, sal_uInt16 index, rtl_uString const * typeName) SAL_THROW_EXTERN_C() { diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 61764e80a37c..d6251da27895 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -29,6 +29,7 @@ #include <registry/registry.h> #include <registry/registry.hxx> + #include <osl/process.h> #include "keyimpl.hxx" @@ -410,7 +411,7 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg, //********************************************************************* // initRegistry_Api // -Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) +REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) { static Registry_Api aApi= {&acquire, &release, @@ -461,7 +462,7 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) //********************************************************************* // reg_loadRegKey // -RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName) { @@ -478,7 +479,7 @@ RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, //********************************************************************* // reg_saveKey // -RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName) { @@ -495,7 +496,7 @@ RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, //********************************************************************* // reg_mergeKey // -RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName, sal_Bool bWarnings, @@ -514,7 +515,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, //********************************************************************* // reg_createRegistry // -RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, RegHandle* phRegistry) { RegError ret; @@ -534,7 +535,7 @@ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, //********************************************************************* // reg_openRootKey // -RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, RegKeyHandle* phRootKey) { return openRootKey(hRegistry, phRootKey); @@ -544,7 +545,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, //********************************************************************* // reg_getName // -RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) { return getName(hRegistry, pName); } @@ -553,7 +554,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) //********************************************************************* // reg_isReadOnly // -sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) +REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) { return isReadOnly(hRegistry); } @@ -562,7 +563,7 @@ sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) //********************************************************************* // reg_openRegistry // -RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, RegHandle* phRegistry, RegAccessMode accessMode) { @@ -583,7 +584,7 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, //********************************************************************* // reg_closeRegistry // -RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) { ORegistry* pReg; @@ -602,7 +603,7 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) //********************************************************************* // reg_destroyRegistry // -RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, rtl_uString* registryName) { return destroyRegistry(hRegistry, registryName); @@ -612,7 +613,7 @@ RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, //********************************************************************* // reg_dumpRegistry // -RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) +REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) { ORegKey *pKey; |