diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 10:07:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 10:07:06 +0000 |
| commit | f6acf736ecd2405c3e4a52ec3b3697c8e4ccb22e (patch) | |
| tree | 6398b6397c00455fc8f7a95ec4645b843236c83d /sal | |
| parent | fd0124a9051c1f3a27df2823a5a19535cc6472a3 (diff) | |
INTEGRATION: CWS crashreport01 (1.44.6); FILE MERGED
2004/03/17 13:34:54 hro 1.44.6.3: #110526# Resolved conflict
2004/03/15 09:39:13 hro 1.44.6.2: RESYNC: (1.44-1.45); FILE MERGED
2004/02/17 07:34:37 tra 1.44.6.1: #115441#moved 3 functions from UDK_3.2 section to UDK_3.3 section where they belong
Diffstat (limited to 'sal')
| -rwxr-xr-x | sal/util/sal.map | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sal/util/sal.map b/sal/util/sal.map index 1331399ec..89c7930c0 100755 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -510,14 +510,15 @@ UDK_3.1 { UDK_3.2 { global: - osl_syncFile; - osl_createDirectoryPath; - osl_getFunctionSymbol; - osl_getModuleURLFromFunctionAddress; + osl_syncFile; } UDK_3.1; -UDK_3.3 { # OOo 2.0 +UDK_3.3 { global: + osl_createDirectoryPath; + osl_getFunctionSymbol; + osl_getModuleURLFromFunctionAddress; rtl_uStringbuffer_insertUtf32; rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths; } UDK_3.2; + |