summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-12-30 13:32:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-12-30 13:32:01 +0000
commit8fc7fb343dd6232fe2970ccf69b246019b9f767f (patch)
tree27e545fa35ee8bee14e6d802b50d5dbf564129f7 /forms
parentd6e3b882a480dd809e5ff4f496c8b2e4a6174c9e (diff)
CWS-TOOLING: integrate CWS sb102
2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work 2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT 2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer 2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms 2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC 2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab 2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME 2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath) 2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory) 2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X 2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS 2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file 2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut 2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories 2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does 2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all) 2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning 2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often 2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564 2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers 2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np) 2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE 2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties
Diffstat (limited to 'forms')
-rw-r--r--forms/inc/makefile.mk1
-rw-r--r--forms/makefile.pmk32
-rw-r--r--forms/source/component/makefile.mk1
-rw-r--r--forms/source/cppugen/makefile.mk1
-rw-r--r--forms/source/helper/makefile.mk1
-rw-r--r--forms/source/misc/makefile.mk1
-rw-r--r--forms/source/misc/services.cxx6
-rw-r--r--forms/source/resource/makefile.mk1
-rw-r--r--forms/source/richtext/makefile.mk1
-rw-r--r--forms/source/runtime/makefile.mk1
-rw-r--r--forms/source/solar/component/makefile.mk1
-rw-r--r--forms/source/solar/control/makefile.mk1
-rw-r--r--forms/source/xforms/makefile.mk1
-rw-r--r--forms/source/xforms/submission/makefile.mk1
-rw-r--r--forms/source/xforms/xpathlib/makefile.mk1
-rw-r--r--forms/util/makefile.mk1
16 files changed, 49 insertions, 3 deletions
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 ---------------------------------------
generated by cgit (git 2.34.1) at 2024-06-02 09:42:05 +0000