[Libreoffice] linking problem after sal cleanup

Hi Stephan,

nice cleanup in sal:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=01690f571db071781a2358bcc15581a6fa9dd86c

But I had problem with linking those new symbols.
My gcc (Ubuntu/Linaro 4.5.1-7ubuntu2) 4.5.1 seems to be mangling names
differently.

Attached diff helped me solve problems. If it's ok I can commit but
there may be also better solution, so I'm asking here.

Best,

Matus

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: