GNOME.org
 

ooo-build r13755 - in trunk: . patches/dev300

Author: jholesovsky
Date: Tue Sep  2 08:15:40 2008
New Revision: 13755
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13755&view=rev

Log:
2008-09-02  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/size-sal-textenc.diff: Fix for 3-layer OOo, fixes eg.
          Czech spellchecking etc.

        * patches/dev300/apply: IZ number for config_office-msvc-compat.diff.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/size-sal-textenc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Sep  2 08:15:40 2008
@@ -2467,10 +2467,10 @@
 officecfg-bighandles-default.diff, thorsten
 
 [ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-msvc-compat-m28.diff, thorsten
+config_office-msvc-compat-m28.diff, i#93332, thorsten
 
 [ Fixes >= dev300-m29 >= ooo300-m1]
-config_office-msvc-compat.diff, thorsten
+config_office-msvc-compat.diff, i#93332, thorsten
 
 # support msvc 2008 express in oowintool
 buildfix-msvc2008-express.diff, i#93332, jholesov

Modified: trunk/patches/dev300/size-sal-textenc.diff
==============================================================================
--- trunk/patches/dev300/size-sal-textenc.diff	(original)
+++ trunk/patches/dev300/size-sal-textenc.diff	Tue Sep  2 08:15:40 2008
@@ -1,6 +1,8 @@
---- sal/inc/osl/module.h	2007-06-19 18:16:25.000000000 +0200
-+++ sal/inc/osl/module.h	2007-07-27 10:27:30.000000000 +0200
-@@ -92,6 +92,12 @@ typedef void ( SAL_CALL *oslGenericFunct
+diff --git sal/inc/osl/module.h sal/inc/osl/module.h
+index 08888c4..3bc99a8 100644
+--- sal/inc/osl/module.h
++++ sal/inc/osl/module.h
+@@ -77,6 +77,12 @@ typedef void ( SAL_CALL *oslGenericFunction )( void );
  */
  oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode);
  
@@ -13,9 +15,11 @@
  /** Load a module located relative to some other module.
  
      @param baseModule
---- sal/osl/unx/module.c	2007-07-03 14:48:42.000000000 +0200
-+++ sal/osl/unx/module.c	2007-07-27 10:29:39.000000000 +0200
-@@ -92,8 +92,6 @@ int dladdr(void *address, Dl_info *dl)
+diff --git sal/osl/unx/module.c sal/osl/unx/module.c
+index 874eb52..874f52c 100644
+--- sal/osl/unx/module.c
++++ sal/osl/unx/module.c
+@@ -70,8 +70,6 @@ int dladdr(void *address, Dl_info *dl)
  /* implemented in file.c */
  extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
  
@@ -24,7 +28,7 @@
  /*****************************************************************************/
  /* osl_loadModule */
  /*****************************************************************************/
-@@ -116,7 +114,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
+@@ -92,7 +90,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
          char buffer[PATH_MAX];
  
          if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length))
@@ -32,8 +36,8 @@
 +            pModule = osl_loadModuleAscii(buffer, nRtldMode);
          rtl_uString_release(ustrTmp);
      }
-
-@@ -140,21 +138,21 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
+ 
+@@ -100,21 +98,21 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo
  }
  
  /*****************************************************************************/
@@ -59,9 +63,11 @@
  
  #if OSL_DEBUG_LEVEL > 1
  		if (pLib == 0)
---- sal/osl/unx/nlsupport.c	2007-07-03 14:48:57.000000000 +0200
-+++ sal/osl/unx/nlsupport.c	2007-07-27 10:31:51.000000000 +0200
-@@ -848,7 +848,6 @@ rtl_TextEncoding osl_getTextEncodingFrom
+diff --git sal/osl/unx/nlsupport.c sal/osl/unx/nlsupport.c
+index c19a260..e6655bc 100644
+--- sal/osl/unx/nlsupport.c
++++ sal/osl/unx/nlsupport.c
+@@ -843,7 +843,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
  /* OS X locale discovery function */
  int (*pGetOSXLocale)( char *, sal_uInt32 );
  
@@ -69,9 +75,11 @@
  /*****************************************************************************
   return the current process locale
   *****************************************************************************/
---- sal/osl/w32/module.c	2007-06-19 18:17:20.000000000 +0200
-+++ sal/osl/w32/module.c	2007-07-27 10:59:48.000000000 +0200
-@@ -87,6 +87,38 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
+diff --git sal/osl/w32/module.c sal/osl/w32/module.c
+index ba3a3be..b0116c3 100644
+--- sal/osl/w32/module.c
++++ sal/osl/w32/module.c
+@@ -82,6 +82,38 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
  }
  
  /*****************************************************************************/
@@ -110,9 +118,11 @@
  /* osl_getModuleHandle */
  /*****************************************************************************/
  
---- sal/textenc/makefile.mk	2007-07-27 10:17:47.000000000 +0200
-+++ sal/textenc/makefile.mk	2007-07-27 10:20:23.000000000 +0200
-@@ -36,13 +36,19 @@
+diff --git sal/textenc/makefile.mk sal/textenc/makefile.mk
+index b63aea0..32cf619 100644
+--- sal/textenc/makefile.mk
++++ sal/textenc/makefile.mk
+@@ -32,13 +32,19 @@
  PRJ = ..
  PRJNAME = sal
  TARGET = textenc
@@ -133,7 +143,7 @@
      $(SLO)$/context.obj \
      $(SLO)$/convertbig5hkscs.obj \
      $(SLO)$/converter.obj \
-@@ -57,12 +63,19 @@ SLOFILES = \
+@@ -53,12 +59,19 @@ SLOFILES = \
      $(SLO)$/tcvtutf7.obj \
      $(SLO)$/tcvtutf8.obj \
      $(SLO)$/tenchelp.obj \
@@ -157,7 +167,7 @@
      $(OBJ)$/context.obj \
      $(OBJ)$/convertbig5hkscs.obj \
      $(OBJ)$/converter.obj \
-@@ -77,19 +90,36 @@ OBJFILES = \
+@@ -73,19 +86,36 @@ OBJFILES = \
      $(OBJ)$/tcvtutf7.obj \
      $(OBJ)$/tcvtutf8.obj \
      $(OBJ)$/tenchelp.obj \
@@ -190,16 +200,19 @@
 +
 +# be nicer to avoid DLLPRE
 +.IF "$(GUI)" == "WNT"
-+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(UDK_MAJOR)$(DLLPOST)
++CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(UDK_MAJOR)$(DLLPOST)
 +.ELSE
-+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(DLLPOST).$(UDK_MAJOR)
++CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(DLLPOST).$(UDK_MAJOR)
 +.ENDIF
 +LIB2TARGET= $(SLB)$/textenc_tables.lib
 +LIB2OBJFILES= $(SAL_TABLES_OBJECTS) $(SAL_COMMON_OBJECTS)
 +
  .INCLUDE: target.mk
---- sal/textenc/tables.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ sal/textenc/tables.cxx	2007-07-27 10:20:23.000000000 +0200
+diff --git sal/textenc/tables.cxx sal/textenc/tables.cxx
+new file mode 100644
+index 0000000..4816f3a
+--- /dev/null
++++ sal/textenc/tables.cxx
 @@ -0,0 +1,240 @@
 +/*************************************************************************
 + *
@@ -441,8 +454,10 @@
 +        nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
 +	return NULL;
 +}
---- sal/textenc/textenc.cxx	2007-07-27 10:17:47.000000000 +0200
-+++ sal/textenc/textenc.cxx	2007-07-27 10:36:15.000000000 +0200
+diff --git sal/textenc/textenc.cxx sal/textenc/textenc.cxx
+index ef58446..8d9734a 100644
+--- sal/textenc/textenc.cxx
++++ sal/textenc/textenc.cxx
 @@ -37,6 +37,8 @@
  #include "gettextencodingdata.h"
  #include "tenchelp.h"
@@ -452,7 +467,7 @@
  
  #ifndef INCLUDED_STDDEF_H
  #include <stddef.h>
-@@ -103,140 +112,69 @@ static sal_uChar const aImplA0FFSameToCh
+@@ -89,140 +91,69 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
  
  static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
  
@@ -650,15 +665,17 @@
 +	}
 +	return NULL;
  }
---- sal/util/makefile.mk	2007-07-27 10:17:47.000000000 +0200
-+++ sal/util/makefile.mk	2007-07-27 10:20:23.000000000 +0200
-@@ -223,6 +223,15 @@ SHL1STDLIBS+=-lgcc
+diff --git sal/util/makefile.mk sal/util/makefile.mk
+index a8212fc..9a7ca6e 100644
+--- sal/util/makefile.mk
++++ sal/util/makefile.mk
+@@ -215,6 +215,15 @@ SHL1STDLIBS+=-lgcc
  .ENDIF
  .ENDIF
  
 +SHL4DEPN+=$(SHL1TARGETN)
 +SHL4LIBS=$(SLB)$/textenc_tables.lib
-+SHL4TARGET=sal_textenc
++SHL4TARGET=uno_sal_textenc
 +SHL4STDLIBS=$(SALLIB)
 +SHL4VERSIONMAP=saltextenc.map
 +
@@ -668,8 +685,10 @@
  # --- Targets ------------------------------------------------------
  
  .ENDIF # $(header) != ""
---- sal/util/sal.map	2007-06-27 15:32:32.000000000 +0200
-+++ sal/util/sal.map	2007-07-27 10:33:33.000000000 +0200
+diff --git sal/util/sal.map sal/util/sal.map
+index e5487a1..9fb2d08 100755
+--- sal/util/sal.map
++++ sal/util/sal.map
 @@ -553,6 +553,7 @@ UDK_3.5 {
  
  UDK_3.6 { # OOo 2.3
@@ -678,8 +697,11 @@
          osl_getAsciiFunctionSymbol;
          osl_getModuleHandle;
          rtl_uString_intern;
---- sal/util/saltextenc.map	1970-01-01 01:00:00.000000000 +0100
-+++ sal/util/saltextenc.map	2007-07-27 10:20:23.000000000 +0200
+diff --git sal/util/saltextenc.map sal/util/saltextenc.map
+new file mode 100644
+index 0000000..8ce46c4
+--- /dev/null
++++ sal/util/saltextenc.map
 @@ -0,0 +1,6 @@
 +UDK_3_0_0 {
 +    global:
@@ -687,23 +709,21 @@
 +    local:
 +        *;
 +};
---- scp2/source/ooo/file_library_ooo.scp	2007-07-27 10:17:53.000000000 +0200
-+++ scp2/source/ooo/file_library_ooo.scp	2007-07-27 10:20:23.000000000 +0200
-@@ -1820,6 +1820,17 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gi
- SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
- #endif
+diff --git scp2/source/ooo/ure.scp scp2/source/ooo/ure.scp
+index fe77e2a..7bbec84 100755
+--- scp2/source/ooo/ure.scp
++++ scp2/source/ooo/ure.scp
+@@ -273,6 +273,13 @@ File gid_File_Dl_Sal
+     // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
+ End
  
-+File gid_File_Lib_Sal_TextEnc
++File gid_File_Dl_Sal_TextEnc
 +    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);
++    Dir = SCP2_URE_DL_DIR;
++    Name = SCP2_URE_DL_UNO_VER("sal_textenc", "3");
++    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 +End
 +
- #ifdef MACOSX
- SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
- #endif
+ File gid_File_Dl_Salhelper
+     TXT_FILE_BODY;
+     Dir = SCP2_URE_DL_DIR;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]