diff options
32 files changed, 79 insertions, 29 deletions
diff --git a/basctl/source/accessibility/makefile.mk b/basctl/source/accessibility/makefile.mk index 97310b4fee31..7871bcb7ff19 100644 --- a/basctl/source/accessibility/makefile.mk +++ b/basctl/source/accessibility/makefile.mk @@ -34,6 +34,7 @@ PRJ=..$/.. PRJNAME=basctl TARGET=accessibility ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 6f80721d5e39..4d0ccca05581 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; //---------------------------------------------------------------------------- extern "C" { - rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, BOOL bChooseOnly, rtl_uString* pMacroDesc ) + SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, BOOL bChooseOnly, rtl_uString* pMacroDesc ) { ::rtl::OUString aMacroDesc( pMacroDesc ); Reference< frame::XModel > aDocument( static_cast< frame::XModel* >( pOnlyInDocument_AsXModel ) ); @@ -69,7 +69,7 @@ extern "C" { return pScriptURL; } - void basicide_macro_organizer( INT16 nTabId ) + SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer( INT16 nTabId ) { OSL_TRACE("in basicide_macro_organizer"); BasicIDE::Organize( nTabId ); diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 11b47178be23..8ef06af7dc25 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::container; //---------------------------------------------------------------------------- extern "C" { - long basicide_handle_basic_error( void* pPtr ) + SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void* pPtr ) { return BasicIDE::HandleBasicError( (StarBASIC*)pPtr ); } diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk index 765be5607610..8766473d8157 100644 --- a/basctl/source/basicide/makefile.mk +++ b/basctl/source/basicide/makefile.mk @@ -33,6 +33,7 @@ PRJ=..$/.. PRJNAME=basctl TARGET=basicide +VISIBILITY_HIDDEN=TRUE PROJECTPCH4DLL=TRUE PROJECTPCH=ide_pch diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 9d030fc30224..4204765ab704 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName, uno_Environment** ppEnvironment ) { @@ -55,6 +55,7 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKey ) { @@ -76,6 +77,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , return sal_True; } +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) diff --git a/basctl/source/dlged/makefile.mk b/basctl/source/dlged/makefile.mk index 235abca7f78b..cdd85e583b8c 100644 --- a/basctl/source/dlged/makefile.mk +++ b/basctl/source/dlged/makefile.mk @@ -34,6 +34,7 @@ PRJ=..$/.. PRJNAME=basctl TARGET=dlged AUTOSEG=true +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index 5ac4d608856c..a243d64af39a 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -52,16 +52,6 @@ class SfxBindings; class Window; struct BasicIDE_Impl; -extern "C" { - rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, BOOL bChooseOnly, rtl_uString* pMacroDesc ); - void basicide_macro_organizer( INT16 nTabId ); -} - -extern "C" { - long basicide_handle_basic_error( void* pPtr ); -} - - namespace BasicIDE { SfxMacro* CreateMacro(); diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 784872f8e854..80b3efd4325d 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -36,6 +36,7 @@ TARGET=basctl #svx.hid generieren GEN_HID=TRUE GEN_HID_OTHER=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index aa7d8716384b..ac7222fcb1d1 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -58,7 +58,8 @@ extern "C" void SAL_CALL abp_initializeModule() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -68,7 +69,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -89,7 +90,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index e272a699b742..85a19ade9996 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -34,6 +34,7 @@ PRJINC=..$/inc PRJNAME=extensions TARGET=abp USE_DEFFILE=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 717dc27f9738..29bcc33a080b 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -62,7 +62,8 @@ extern "C" void SAL_CALL dbp_initializeModule() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -72,7 +73,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -93,7 +94,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk index 13d90bedb16a..5591a11b9d36 100644 --- a/extensions/source/dbpilots/makefile.mk +++ b/extensions/source/dbpilots/makefile.mk @@ -34,6 +34,7 @@ PRJINC=..$/inc PRJNAME=extensions TARGET=dbp ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk index 2c0f2b42712a..54de572a875d 100644 --- a/extensions/source/preload/makefile.mk +++ b/extensions/source/preload/makefile.mk @@ -34,6 +34,7 @@ PRJINC=..$/inc PRJNAME=extensions TARGET=preload ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE USE_DEFFILE=TRUE # --- Settings ----------------------------------------------------- diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx index 002ed1caa1ec..8b51393d0ba7 100644 --- a/extensions/source/preload/services.cxx +++ b/extensions/source/preload/services.cxx @@ -58,7 +58,8 @@ extern "C" void SAL_CALL preload_initializeModule() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -68,7 +69,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -89,7 +90,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk index 78ccf211d8de..62ca941f3751 100644 --- a/extensions/source/propctrlr/makefile.mk +++ b/extensions/source/propctrlr/makefile.mk @@ -36,6 +36,7 @@ TARGET=pcr USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index cde6bcfbeee9..0673c9ff5f3c 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -94,7 +94,8 @@ extern "C" void SAL_CALL pcr_initializeModule() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -104,7 +105,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey ) @@ -125,7 +126,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/forms/inc/makefile.mk b/forms/inc/makefile.mk index a98c07a0d29a..a9f6f6419be4 100644 --- a/forms/inc/makefile.mk +++ b/forms/inc/makefile.mk @@ -36,6 +36,7 @@ TARGET=inc # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Files -------------------------------------------------------- # --- Targets ------------------------------------------------------- diff --git a/forms/makefile.pmk b/forms/makefile.pmk new file mode 100644 index 000000000000..0ef67b43696b --- /dev/null +++ b/forms/makefile.pmk @@ -0,0 +1,32 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# 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. +# +#************************************************************************* + +VISIBILITY_HIDDEN = TRUE diff --git a/forms/source/component/makefile.mk b/forms/source/component/makefile.mk index 54a02cdb751d..71979c2ede48 100644 --- a/forms/source/component/makefile.mk +++ b/forms/source/component/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/cppugen/makefile.mk b/forms/source/cppugen/makefile.mk index e1f7b2c43f1d..aa65a7122a33 100644 --- a/forms/source/cppugen/makefile.mk +++ b/forms/source/cppugen/makefile.mk @@ -37,6 +37,7 @@ TARGET=fm_cppugen # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/helper/makefile.mk b/forms/source/helper/makefile.mk index ede7b1dacf1e..4c2d68fd639e 100644 --- a/forms/source/helper/makefile.mk +++ b/forms/source/helper/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/misc/makefile.mk b/forms/source/misc/makefile.mk index 7e4cb475dd6e..b03109ba64d5 100644 --- a/forms/source/misc/makefile.mk +++ b/forms/source/misc/makefile.mk @@ -40,6 +40,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index b31b326a835c..92c0ef90946b 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -339,13 +339,13 @@ void SAL_CALL createRegistryInfo_FORMS() } //--------------------------------------------------------------------------------------- -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; } //--------------------------------------------------------------------------------------- -sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRegistryKey) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRegistryKey) { if (_pRegistryKey) { @@ -396,7 +396,7 @@ sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRe } //--------------------------------------------------------------------------------------- -void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { if (!_pServiceManager || !_pImplName) return NULL; diff --git a/forms/source/resource/makefile.mk b/forms/source/resource/makefile.mk index 9e5da73d86f9..866291d309dd 100644 --- a/forms/source/resource/makefile.mk +++ b/forms/source/resource/makefile.mk @@ -37,6 +37,7 @@ TARGET=resource # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/forms/source/richtext/makefile.mk b/forms/source/richtext/makefile.mk index 7faba41d24f5..3bb163f2ee24 100644 --- a/forms/source/richtext/makefile.mk +++ b/forms/source/richtext/makefile.mk @@ -37,6 +37,7 @@ TARGET=richtext # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/forms/source/runtime/makefile.mk b/forms/source/runtime/makefile.mk index a735c20ab936..162a22b9b171 100644 --- a/forms/source/runtime/makefile.mk +++ b/forms/source/runtime/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/forms/source/solar/component/makefile.mk b/forms/source/solar/component/makefile.mk index 9e9f4cc8d32a..57c6625285f9 100644 --- a/forms/source/solar/component/makefile.mk +++ b/forms/source/solar/component/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/solar/control/makefile.mk b/forms/source/solar/control/makefile.mk index 299a256e1d36..66b314131f14 100644 --- a/forms/source/solar/control/makefile.mk +++ b/forms/source/solar/control/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Types ------------------------------------- diff --git a/forms/source/xforms/makefile.mk b/forms/source/xforms/makefile.mk index 3e34490b3975..db4d73333212 100644 --- a/forms/source/xforms/makefile.mk +++ b/forms/source/xforms/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/forms/source/xforms/submission/makefile.mk b/forms/source/xforms/submission/makefile.mk index 55331b943784..74a33f17d8dd 100644 --- a/forms/source/xforms/submission/makefile.mk +++ b/forms/source/xforms/submission/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk .IF "$(SYSTEM_LIBXML)" == "YES" CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) diff --git a/forms/source/xforms/xpathlib/makefile.mk b/forms/source/xforms/xpathlib/makefile.mk index d8f1092d1c32..6231e1f4f072 100644 --- a/forms/source/xforms/xpathlib/makefile.mk +++ b/forms/source/xforms/xpathlib/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk INCPRE+=$(PRJ)$/source$/inc diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk index 13aae9a8adde..1e99e6446f47 100644 --- a/forms/util/makefile.mk +++ b/forms/util/makefile.mk @@ -37,6 +37,7 @@ USE_DEFFILE=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE: $(PRJ)$/makefile.pmk # --- Library ----------------------------------- # --- frm --------------------------------------- |