diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2006-10-07 16:54:55 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2006-10-07 16:54:55 +0000 |
| commit | d4d0410a96991d12d1ba2c156fbfd56225f97215 (patch) | |
| tree | 93575d18b950eaca408098ce13b6811a8a493185 | |
| parent | 1dc0affeda623793830dd42f7bd52d61fd203100 (diff) | |
Add scp2 section, add map-file & update makefile to use it.
* patches/src680/size-sal-textenc.diff: add scp2 section,
add map-file & update makefile to use it.
| -rw-r--r-- | patches/src680/size-sal-textenc.diff | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/patches/src680/size-sal-textenc.diff b/patches/src680/size-sal-textenc.diff index 7ee0dde6e..58bd5b4ce 100644 --- a/patches/src680/size-sal-textenc.diff +++ b/patches/src680/size-sal-textenc.diff @@ -310,16 +310,18 @@ diff -x '*~' -u -r -x 'unxlng*' sal/textenc/textenc.cxx sal/textenc/textenc.cxx + } + return NULL; } + diff -x '*~' -u -r -x 'unxlng*' sal/util/makefile.mk sal/util/makefile.mk --- sal/util/makefile.mk 2006-04-07 09:07:35.000000000 +0100 +++ sal/util/makefile.mk 2006-10-06 23:15:42.000000000 +0100 -@@ -226,6 +227,10 @@ +@@ -226,7 +227,12 @@ .ENDIF .ENDIF +SHL3LIBS=$(SLB)$/textenc_tables.lib +SHL3TARGET=sal_textenc +SHL3STDLIBS=$(SALLIB) ++SHL2VERSIONMAP=saltextenc.map + # --- Targets ------------------------------------------------------ @@ -577,3 +579,34 @@ diff -x '*~' -u -r -x 'unxlng*' sal/util/makefile.mk sal/util/makefile.mk + nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL; + return NULL; +} + +--- scp2/source/ooo/file_library_ooo.scp ++++ scp2/source/ooo/file_library_ooo.scp +@@ -1791,6 +1791,17 @@ + Styles = (PACKED, PATCH); + End + ++File gid_File_Lib_Sal ++ TXT_FILE_BODY; ++ #ifdef UNX ++ Name = STRING(CONCAT4(libsal_textenc,UNXSUFFIX,.,UDK_MAJOR)); ++ #else ++ Name = STRING(CONCAT3(sal_textenc,UDK_MAJOR,.dll)); ++ #endif ++ Dir = gid_Dir_Program; ++ Styles = (PACKED, PATCH); ++End ++ + #ifdef MACOSX + + File gid_File_Lib_Salextra + +--- /dev/null 2006-06-16 14:07:58.000000000 +0100 ++++ sal/util/saltextenc.map 2006-10-07 18:54:25.000000000 +0100 +@@ -0,0 +1,6 @@ ++UDK_3_0_0 { ++ global: ++ Impl_getTextEncodingData; ++ local: ++ *; ++}; |