diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-15 15:56:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-15 20:52:01 +0100 |
| commit | 09eabcfd91cdc94228b758c393daa5aaab3de378 (patch) | |
| tree | 2679734541ca42c228d5421955ad3bdf6efd201d /shell | |
| parent | a9da5a0bd3631370dfed0c285440c3252c6daf3a (diff) | |
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.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/all/makefile.mk | 1 | ||||
| -rw-r--r-- | shell/source/unix/sysshell/makefile.mk | 3 | ||||
| -rw-r--r-- | shell/source/unix/sysshell/recently_used_file_handler.cxx | 4 | ||||
| -rwxr-xr-x | shell/source/unix/sysshell/recfile.map | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk index ffab5378fd1c..87312d3b13f9 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 80cca7ccd298..0c9f942d4d6a 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 262cc34eb647..7066aa686a3f 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 7e454f111896..000000000000 --- 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: - *; -}; |