[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sal/util tail_build/prj

[Matus Kukan]

 Module_tail_build.mk     |    1 +
 sal/util/sal.map         |   10 +++++-----
 tail_build/prj/build.lst |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit f40fe7f1676c14a1bed48046b2b9d5f1e4c94c31
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Jan 7 01:14:26 2012 +0100

    add fpicker to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 4902f75..e7a8aeb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     filter \
     forms \
     formula \
+    fpicker \
     framework \
     hwpfilter \
     idl \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2d6feca..e62d677 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit c1ac62c0eb4df3cf1fff20c41eb7683472e9e25f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Jan 7 01:12:19 2012 +0100

    sal.map: allow different name mangling

diff --git a/sal/util/sal.map b/sal/util/sal.map
index fcbed28..a22661c 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -638,11 +638,11 @@ PRIVATE_1.2 { # LibreOffice 3.5
 
 PRIVATE_textenc.1 { # LibreOffice 3.6
     global:
-        _ZN3sal6detail7textenc20convertCharToUnicodeEPKvPvPKcmPtmjPjPm;
-        _ZN3sal6detail7textenc20convertUnicodeToCharEPKvPvPKtmPcmjPjPm;
-        _ZN3sal6detail7textenc32handleUndefinedUnicodeToTextCharEPPKtS3_PPcPKcjPj;
-        _ZN3sal6detail7textenc37handleBadInputTextToUnicodeConversionEbbcjPPtS2_Pj;
-        _ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversionEbjjPPcS2_PjPKcmPb;
+        _ZN3sal6detail7textenc20convertCharToUnicode*;
+        _ZN3sal6detail7textenc20convertUnicodeToChar*;
+        _ZN3sal6detail7textenc32handleUndefinedUnicodeToTextChar*;
+        _ZN3sal6detail7textenc37handleBadInputTextToUnicodeConversion*;
+        _ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversion*;
 };
 
 # Unique libstdc++ symbols: