[Libreoffice-commits] .: 8 commits - .gitignore connectivity/source cppu/qa cppuhelper/qa libcmis/libcmis-0.1.0.patch libexttextcat/libexttextcat-3.2.0-visibility.patch libexttextcat/makefile.mk lingucomponent/source sdext/source shell/source testtools/source ucb/source
Michael Stahl
mst at kemper.freedesktop.org
Tue Nov 15 11:59:52 PST 2011
.gitignore | 1
connectivity/source/drivers/mozab/makefile.mk | 4 -
connectivity/source/drivers/mozab/mozabdrv.map | 8 ---
connectivity/source/drivers/odbcbase/OConnection.cxx | 1
cppu/qa/cppumaker/makefile.mk | 3 -
cppu/qa/cppumaker/version.map | 34 --------------
cppu/qa/makefile.mk | 9 ++-
cppu/qa/version.map | 34 --------------
cppuhelper/qa/ifcontainer/export.map | 7 --
cppuhelper/qa/ifcontainer/makefile.mk | 3 -
cppuhelper/qa/unourl/export.map | 7 --
cppuhelper/qa/unourl/makefile.mk | 3 -
libcmis/libcmis-0.1.0.patch | 3 -
libexttextcat/libexttextcat-3.2.0-visibility.patch | 10 ++++
libexttextcat/makefile.mk | 4 +
lingucomponent/source/languageguessing/makefile.mk | 5 --
sdext/source/pdfimport/makefile.mk | 3 -
sdext/source/pdfimport/services.cxx | 3 -
sdext/source/presenter/PresenterComponent.cxx | 5 --
sdext/source/presenter/makefile.mk | 3 -
shell/source/all/makefile.mk | 1
shell/source/unix/sysshell/makefile.mk | 3 -
shell/source/unix/sysshell/recently_used_file_handler.cxx | 4 +
shell/source/unix/sysshell/recfile.map | 6 --
testtools/source/bridgetest/makefile.mk | 5 +-
ucb/source/ucp/cmis/makefile.mk | 3 -
26 files changed, 50 insertions(+), 122 deletions(-)
New commits:
commit 1fb5eb2162d79a44f5bb90627c1ca340d1322129
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 16:00:49 2011 +0100
fdo#42865: sdext: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in PresenterScreen.uno.so and pdfimport.uno.so,
build them with hidden visibility.
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 8e0dfa0..64fc1af 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..$/..
PRJNAME=sdext
TARGET=pdfimport
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@ -90,7 +91,7 @@ SHL1STDLIBS=\
SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+SHL1USE_EXPORTS = name
SHL1RPATH=OXT
DEF1NAME=$(SHL1TARGET)
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index b158e44..c2c0270 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -121,7 +121,8 @@ namespace
}
}
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >( pRegistryKey ) );
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index d59a5b5..f40052b 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -119,15 +119,12 @@ extern "C"
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
- sal_Bool SAL_CALL component_writeInfo(
+ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries);
}
-
-
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 9ced62e..a085439 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -32,6 +32,7 @@ GEN_HID=FALSE
EXTNAME=PresenterScreen
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# survive zip dependencies
MAXLINELENGTH:=100000
@@ -108,7 +109,7 @@ SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+SHL1USE_EXPORTS = name
SHL1RPATH= OXT
DEF1NAME= $(SHL1TARGET)
commit 48dbaa517f1a72a9bf11fa4db7425510c86c677b
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:58:10 2011 +0100
fdo#42865: connectivity: mozab: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in libmozabdrv.so, build it with hidden visibility.
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index cefb6f9..07e6dcc 100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -85,7 +85,7 @@ SLOFILES=\
# --- MOZAB BASE Library -----------------------------------
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+SHL1USE_EXPORTS = name
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -145,7 +145,7 @@ DEPOBJFILES=$(SLO2FILES)
# --- MOZAB BASE Library -----------------------------------
-SHL2VERSIONMAP= $(TARGET2).map
+SHL2USE_EXPORTS = name
SHL2NOCHECK=TRUE
SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
SHL2OBJS=$(SLO2FILES)
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
deleted file mode 100755
index a431a07..0000000
--- a/connectivity/source/drivers/mozab/mozabdrv.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
- global:
- OMozabConnection_CreateInstance;
- OMozillaBootstrap_CreateInstance;
- setMozabServiceFactory;
- local:
- *;
-};
commit 09eabcfd91cdc94228b758c393daa5aaab3de378
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:56:44 2011 +0100
fdo#42865: shell: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in librecentfile.so, build it with hidden visibility.
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index ffab537..87312d3 100644
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..$/..
PRJNAME=shell
TARGET=xmlparser
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN = TRUE
# --- Settings -----------------------------------------------------
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 80cca7c..0c9f942 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -31,6 +31,7 @@ PRJNAME=shell
TARGET=sysshell
LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN = TRUE
# --- Settings -----------------------------------------------------
@@ -52,9 +53,9 @@ SHL1TARGET=recentfile
SHL1STDLIBS=$(EXPATASCII3RDLIB)\
$(SALLIB)
+SHL1USE_EXPORTS = name
SHL1LIBS=$(SLB)$/xmlparser.lib
SHL1OBJS=$(SLOFILES)
-SHL1VERSIONMAP=recfile.map
.ELSE
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 262cc34..7066aa6 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -495,7 +495,9 @@ namespace /* private */ {
</RecentFiles>
*/
-extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& mime_type)
+extern "C" SAL_DLLPUBLIC_EXPORT
+void add_to_recently_used_file_list(const rtl::OUString& file_url,
+ const rtl::OUString& mime_type)
{
try
{
diff --git a/shell/source/unix/sysshell/recfile.map b/shell/source/unix/sysshell/recfile.map
deleted file mode 100755
index 7e454f1..0000000
--- a/shell/source/unix/sysshell/recfile.map
+++ /dev/null
@@ -1,6 +0,0 @@
-UDK_3_0_0 {
- global:
- add_to_recently_used_file_list;
- local:
- *;
-};
commit a9da5a0bd3631370dfed0c285440c3252c6daf3a
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:54:13 2011 +0100
fdo#42865: libcmis,ucpcmis: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in ucpcmis1.uno.so, build it and statically linked libcmis
with hidden visibility.
diff --git a/libcmis/libcmis-0.1.0.patch b/libcmis/libcmis-0.1.0.patch
index 48c2482..d81520b 100644
--- a/libcmis/libcmis-0.1.0.patch
+++ b/libcmis/libcmis-0.1.0.patch
@@ -1,6 +1,6 @@
--- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 +0200
+++ misc/build/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:54:58.290853952 +0200
-@@ -1 +1,38 @@
+@@ -1 +1,39 @@
-dummy
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+
@@ -9,6 +9,7 @@
+PRJNAME=libcmis
+TARGET=cmislib
+ENABLE_EXCEPTIONS=TRUE
++VISIBILITY_HIDDEN=TRUE
+LIBTARGET=NO
+
+.INCLUDE : settings.mk
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 4f43c29..be4a36c 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME = ucb
UCPCMIS_MAJOR = 1
TARGET = ucpcmis$(UCPCMIS_MAJOR).uno
ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN=TRUE
NO_BSYMBOLIC = TRUE
.INCLUDE : settings.mk
@@ -68,9 +69,9 @@ SHL1STDLIBS = \
$(CURLLIB) \
$(LIBXML2LIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1TARGET = $(TARGET)
+SHL1USE_EXPORTS = name
SHL1DEPN =
SHL1IMPLIB = i$(TARGET)
SHL1LIBS = $(SLB)$/$(TARGET).lib
commit 5f1799f57978bb9accfe59fb5bc38d01686441b6
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:51:10 2011 +0100
fdo#42865: libexttextcat,lingucomponent: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in libguesslanglo.so, build both it and libexttextcat
with hidden visibility.
diff --git a/libexttextcat/libexttextcat-3.2.0-visibility.patch b/libexttextcat/libexttextcat-3.2.0-visibility.patch
new file mode 100644
index 0000000..a4104b7
--- /dev/null
+++ b/libexttextcat/libexttextcat-3.2.0-visibility.patch
@@ -0,0 +1,10 @@
+--- misc/libexttextcat-3.2.0/src/makefile.mk 2011-10-07 00:09:38.000000000 +0200
++++ misc/build/libexttextcat-3.2.0/src/makefile.mk 2011-11-15 13:57:19.742958488 +0100
+@@ -33,6 +33,7 @@
+
+ USE_DEFFILE=TRUE
+ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++VISIBILITY_HIDDEN=TRUE
+ UWINAPILIB=
+
+ .INCLUDE : settings.mk
diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
index e4b8fc5..b90a4d7 100644
--- a/libexttextcat/makefile.mk
+++ b/libexttextcat/makefile.mk
@@ -47,8 +47,12 @@ all:
TARFILE_NAME=libexttextcat-3.2.0
TARFILE_MD5=e1c178b18f130b40494561f02bc1a948
TARFILE_ROOTDIR=libexttextcat-3.2.0
+PATCH_FILES=libexttextcat-3.2.0-visibility.patch
.IF "$(GUI)"=="UNX"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+EXTRA_CFLAGS+=-fvisibility=hidden
+.ENDIF
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index 40d3157..5fe1945 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -31,6 +31,7 @@ PRJNAME=lingucomponent
TARGET=guesslang
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
#----- Settings ---------------------------------------------------------
@@ -71,13 +72,11 @@ SHL1STDLIBS= \
$(UNOTOOLSLIB)
# build DLL
+SHL1USE_EXPORTS = name
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB= i$(TARGET)
SHL1DEPN= $(SHL1LIBS)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-.IF "$(OS)"!="MACOSX"
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ENDIF
# build DEF file
DEF1NAME =$(SHL1TARGET)
commit c506e1852af6605c97b2194df95a0810fd42b3aa
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:48:44 2011 +0100
fdo#42865: cppu,cppuhelper,testtools: no mapfile
Instead, build with VISIBILITY_HIDDEN.
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
index b0e6f8e..e8f7d7d 100644
--- a/cppu/qa/cppumaker/makefile.mk
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME := cppu
TARGET := test_cppumaker
ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN=TRUE
.INCLUDE: settings.mk
@@ -47,7 +48,7 @@ INCPRE += $(MISC)/$(TARGET)/inc
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)/test_cppumaker.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/cppu/qa/cppumaker/version.map b/cppu/qa/cppumaker/version.map
deleted file mode 100644
index 3308588..0000000
--- a/cppu/qa/cppumaker/version.map
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 2dee991..d671846 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME := cppu
TARGET := qa
ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN=TRUE
.INCLUDE: settings.mk
@@ -46,28 +47,28 @@ INCPRE+=$(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_any
SHL1OBJS = $(SLO)$/test_any.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SHL2TARGET = $(TARGET)_unotype
SHL2OBJS = $(SLO)$/test_unotype.obj
SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL2VERSIONMAP = version.map
+SHL2USE_EXPORTS = name
SHL2IMPLIB = i$(SHL2TARGET)
DEF2NAME = $(SHL2TARGET)
SHL3TARGET = $(TARGET)_reference
SHL3OBJS = $(SLO)$/test_reference.obj
SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL3VERSIONMAP = version.map
+SHL3USE_EXPORTS = name
SHL3IMPLIB = i$(SHL3TARGET)
DEF3NAME = $(SHL3TARGET)
SHL4TARGET = $(TARGET)_recursion
SHL4OBJS = $(SLO)$/test_recursion.obj
SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL4VERSIONMAP = version.map
+SHL4USE_EXPORTS = name
SHL4IMPLIB = i$(SHL4TARGET)
DEF4NAME = $(SHL4TARGET)
diff --git a/cppu/qa/version.map b/cppu/qa/version.map
deleted file mode 100644
index 3308588..0000000
--- a/cppu/qa/version.map
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppuhelper/qa/ifcontainer/export.map b/cppuhelper/qa/ifcontainer/export.map
deleted file mode 100644
index 117caf4..0000000
--- a/cppuhelper/qa/ifcontainer/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index d4d67a4..7d01f53 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME=cppuhelper
TARGET=cppu_ifcontainer
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@ -51,7 +52,7 @@ SHL1STDLIBS=\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
+SHL1USE_EXPORTS = name
SLOFILES = $(SHL1OBJS)
diff --git a/cppuhelper/qa/unourl/export.map b/cppuhelper/qa/unourl/export.map
deleted file mode 100644
index 117caf4..0000000
--- a/cppuhelper/qa/unourl/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 35d6e0b..1db7e11 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME=cppuhelper
TARGET=cppu_unourl
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@ -51,7 +52,7 @@ SHL1STDLIBS=\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
+SHL1USE_EXPORTS = name
SLOFILES = $(SHL1OBJS)
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 3932d04..cc3661a 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -31,6 +31,7 @@ PRJNAME=testtools
TARGET=bridgetest
USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
LIBTARGET=NO
.INCLUDE: settings.mk
@@ -87,7 +88,7 @@ SHL1STDLIBS= \
SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1USE_EXPORTS = name
# ---- test object ----
@@ -106,7 +107,7 @@ SHL2STDLIBS= \
SHL2LIBS= $(LIB2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
+SHL2USE_EXPORTS = name
SHL3TARGET = constructors.uno
SHL3OBJS = $(SLO)$/constructors.obj
commit d5f0b174d6f85f861d3f0791688ca76c83723234
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 15:05:26 2011 +0100
.gitignore: do not ignore *.patch
diff --git a/.gitignore b/.gitignore
index a97b2d3..1886dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,5 @@ test/user-template/user/psprint/pspfontcache
.~lock.*#
# Everyone loves patching
-*.patch
*.orig
*.rej
commit d3b66b4d56d06c4f713eb2164d75a03261475bf9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Nov 15 10:48:36 2011 +0100
OConnection: WaE unused variable
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 0ea6448..828f680 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -86,6 +86,7 @@ OConnection::~OConnection()
rc = N3SQLFreeHandle( SQL_HANDLE_DBC, m_aConnectionHandle );
OSL_ENSURE( rc == SQL_SUCCESS , "Failure from SQLFreeHandle for connection");
+ (void) rc;
m_aConnectionHandle = SQL_NULL_HANDLE;
}
More information about the Libreoffice-commits
mailing list