[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel workspace.gslpatches4.patch,1.1,1.2



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27837

Modified Files:
	workspace.gslpatches4.patch 
Log Message:
patch needs to be modified

workspace.gslpatches4.patch:
 config_office/configure.in                     |   10 +++++++++-
 config_office/set_soenv.in                     |    1 +
 package/inc/ZipPackageFolder.hxx               |    2 +-
 package/source/zippackage/ZipPackageFolder.cxx |    2 +-
 package/source/zippackage/ZipPackageStream.cxx |    2 +-
 psprint/source/printer/printerinfomanager.cxx  |    3 +--
 psprint/source/printergfx/printerjob.cxx       |    6 +++++-
 sfx2/source/view/prnmon.cxx                    |    9 +++++++++
 solenv/config/ssolar.cmn                       |    1 +
 solenv/config/ssrc680.ini                      |    6 ++++++
 vcl/inc/impprn.hxx                             |    5 ++++-
 vcl/source/gdi/impprn.cxx                      |    5 ++++-
 vcl/source/gdi/print.cxx                       |   20 ++++++++++++--------
 vcl/source/gdi/sallayout.cxx                   |    7 +++++--
 vcl/unx/source/app/makefile.mk                 |   12 +++++++++---
 vcl/unx/source/app/vsound.hxx                  |    4 ----
 vcl/util/makefile.mk                           |    9 +++++++--
 17 files changed, 76 insertions(+), 28 deletions(-)

Index: workspace.gslpatches4.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.gslpatches4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.gslpatches4.patch	26 Jul 2005 11:55:13 -0000	1.1
+++ workspace.gslpatches4.patch	8 Aug 2005 15:49:52 -0000	1.2
@@ -1,12 +1,11 @@
 Index: configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.128
-retrieving revision 1.127.2.2
-diff -u -p -u -r1.128 -r1.127.2.2
---- openoffice.org.orig/config_office/configure.in	14 Jul 2005 13:45:35 -0000	1.128
-+++ openoffice.org/config_office/configure.in	19 Jul 2005 11:21:55 -0000	1.127.2.2
-@@ -176,6 +176,9 @@ AC_ARG_WITH(myspell-dicts,
+retrieving revision 1.129
+diff -u -p -r1.129 configure.in
+--- openoffice.org.orig/config_office/configure.in	5 Aug 2005 15:05:56 -0000	1.129
++++ openoffice.org/config_office/configure.in	8 Aug 2005 15:48:54 -0000
+@@ -179,6 +179,9 @@ AC_ARG_WITH(myspell-dicts,
                            distributions where the myspell dictionaries are
                            installed from other sources
  ],,)
@@ -16,7 +15,7 @@
  AC_ARG_WITH(system-libs,
  [  --with-system-libs      Use libs already on system -- enables all
                            --with-system-* flags except mozilla, python and
-@@ -2997,7 +3000,9 @@ dnl ====================================
+@@ -2990,7 +2993,9 @@ dnl ====================================
  dnl Check for system nas
  dnl ===================================================================
  AC_MSG_CHECKING([which nas to use])
@@ -27,7 +26,7 @@
  	test "$with_system_nas" != "no"; then
      AC_MSG_RESULT([external])
      SYSTEM_NAS=YES
-@@ -3012,13 +3017,16 @@ if test -n "$with_system_nas" -o -n "$wi
+@@ -3005,9 +3010,11 @@ if test -n "$with_system_nas" -o -n "$wi
      )
      AC_CHECK_LIB(audio, AuOpenServer, [],
          [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
@@ -37,6 +36,9 @@
      SYSTEM_NAS=NO
 +    ENABLE_NAS=YES
      BUILD_TYPE="$BUILD_TYPE NAS"
+     dnl ===================================================================
+     dnl Check whether xmkmf program can be used, x systems only
+@@ -3021,6 +3028,7 @@ else
  fi
  AC_SUBST(SYSTEM_NAS)
  AC_SUBST(NAS_INCLUDES)
@@ -60,939 +62,6 @@
  ToFile( "ENABLE_PASF",       "@ENABLE_PASF@",      "e" );
  ToFile( "SYSTEM_SNDFILE",    "@SYSTEM_SNDFILE@",   "e" );
  ToFile( "SYSTEM_PORTAUDIO",  "@SYSTEM_PORTAUDIO@", "e" );
-Index: icu-2.6.patch
-===================================================================
-RCS file: /cvs/external/icu/icu-2.6.patch,v
-retrieving revision 1.11
-retrieving revision 1.11.2.2
-diff -u -p -u -r1.11 -r1.11.2.2
---- openoffice.org.orig/icu/icu-2.6.patch	9 Jun 2005 14:29:36 -0000	1.11
-+++ openoffice.org/icu/icu-2.6.patch	18 Jul 2005 12:00:04 -0000	1.11.2.2
-@@ -1,5 +1,5 @@
--*** misc/icu/source/common/unicode/rbbi.h	Tue Jun 10 20:04:02 2003
----- misc/build/icu/source/common/unicode/rbbi.h	Fri Mar 18 21:38:28 2005
-+*** misc/icu/source/common/unicode/rbbi.h	2003-06-10 20:04:02.000000000 +0200
-+--- misc/build/icu/source/common/unicode/rbbi.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 106,119 ****
-       //=======================================================================
-@@ -46,8 +46,8 @@
-       /** Default constructor.  Creates an empty shell of an iterator, with no
-        *  rules or text to iterate over.   Object can subsequently be assigned to.
-        *  @draft ICU 2.2
--*** misc/icu/source/config/mh-darwin	Tue Jun  3 22:52:56 2003
----- misc/build/icu/source/config/mh-darwin	Fri Mar 18 21:38:28 2005
-+*** misc/icu/source/config/mh-darwin	2003-06-03 22:52:56.000000000 +0200
-+--- misc/build/icu/source/config/mh-darwin	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 15,30 ****
-   LD_FLAGS += -headerpad_max_install_names
-@@ -123,8 +123,8 @@
- ! 	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
-   
-   ## End Darwin-specific setup
--*** misc/icu/source/config/mh-irix	Thu Jan 10 03:41:40 2002
----- misc/build/icu/source/config/mh-irix	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/config/mh-irix	2002-01-10 03:41:40.000000000 +0100
-+--- misc/build/icu/source/config/mh-irix	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 10,15 ****
- --- 10,19 ----
-@@ -138,8 +138,8 @@
-   ## Commands to generate dependency files
-   GEN_DEPS.c=	$(CC) -E -M $(DEFS) $(CPPFLAGS)
-   GEN_DEPS.cc=	$(CXX) -E -M $(DEFS) $(CPPFLAGS)
--*** misc/icu/source/config/mh-linux	Thu Jan 24 18:35:04 2002
----- misc/build/icu/source/config/mh-linux	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/config/mh-linux	2002-01-24 18:35:04.000000000 +0100
-+--- misc/build/icu/source/config/mh-linux	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 10,15 ****
- --- 10,18 ----
-@@ -168,8 +168,8 @@
-   ## Compiler switch to embed a library name
-   LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)
-   
--*** misc/icu/source/config/mh-solaris	Tue Jul 30 04:46:10 2002
----- misc/build/icu/source/config/mh-solaris	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/config/mh-solaris	2002-07-30 04:46:10.000000000 +0200
-+--- misc/build/icu/source/config/mh-solaris	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 23,39 ****
-   
-@@ -215,8 +215,8 @@
-   ## Compiler switch to embed a library name
-   LD_SONAME = -h $(MIDDLE_SO_TARGET)
-   
--*** misc/icu/source/data/icupkg.inc.in	Fri Apr 19 04:19:16 2002
----- misc/build/icu/source/data/icupkg.inc.in	Fri Mar 18 21:38:36 2005
-+*** misc/icu/source/data/icupkg.inc.in	2002-04-19 04:19:16.000000000 +0200
-+--- misc/build/icu/source/data/icupkg.inc.in	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 16,22 ****
-   include $(top_builddir)/icudefs.mk
-@@ -227,8 +227,8 @@
-   LIBS= LIBS@ 
-   ICULIBS=$(LIBS) -licu-uc -licu-i18n
- --- 16,21 ----
--*** misc/icu/source/data/makedata.mak	Tue Jun  3 22:52:56 2003
----- misc/build/icu/source/data/makedata.mak	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/data/makedata.mak	2003-06-03 22:52:56.000000000 +0200
-+--- misc/build/icu/source/data/makedata.mak	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 27,32 ****
- --- 27,33 ----
-@@ -290,8 +290,8 @@
-   
-   $(INDEX_RES_FILES):
-   	@echo Generating <<res_index.txt
--*** misc/icu/source/data/mappings/ucmcore.mk	Tue Jun  3 22:53:00 2003
----- misc/build/icu/source/data/mappings/ucmcore.mk	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/data/mappings/ucmcore.mk	2003-06-03 22:53:00.000000000 +0200
-+--- misc/build/icu/source/data/mappings/ucmcore.mk	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 15,28 ****
-   # SJIS (Windows cp932), EUC-JP
-@@ -323,8 +323,8 @@
- ! #ibm-1373_P100-2002.ucm\
- ! #ibm-943_P14A-1999.ucm ibm-33722_P12A-1999.ucm\
- ! #ibm-970_P110-1995.ucm ibm-949_P11A-1999.ucm ibm-1363_P11B-1998.ucm
--*** misc/icu/source/data/mappings/ucmebcdic.mk	Tue Jun  3 22:53:00 2003
----- misc/build/icu/source/data/mappings/ucmebcdic.mk	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/data/mappings/ucmebcdic.mk	2003-06-03 22:53:00.000000000 +0200
-+--- misc/build/icu/source/data/mappings/ucmebcdic.mk	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 3,27 ****
-   # A list of EBCDIC UCM's to build
-@@ -378,8 +378,8 @@
- ! #ibm-4899_P100-1998.ucm ibm-4971_P100-1999.ucm ibm-500_P100-1995.ucm\
- ! #ibm-5123_P100-1999.ucm ibm-803_P100-1999.ucm ibm-8482.ucm\
- ! #ibm-16684_P100-1999.ucm
--*** misc/icu/source/data/mappings/ucmfiles.mk	Tue Jun  3 22:53:00 2003
----- misc/build/icu/source/data/mappings/ucmfiles.mk	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/data/mappings/ucmfiles.mk	2003-06-03 22:53:00.000000000 +0200
-+--- misc/build/icu/source/data/mappings/ucmfiles.mk	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 25,92 ****
-   # ucmebcdic.mk from the <icu>/source/data directory
-@@ -519,8 +519,8 @@
- ! #ibm-5478_P100-1995.ucm\
- ! #icu-internal-25546.ucm lmb-excp.ucm
-   
--*** misc/icu/source/extra/uconv/uconv.dsp	Wed Jul 31 19:43:14 2002
----- misc/build/icu/source/extra/uconv/uconv.dsp	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/extra/uconv/uconv.dsp	2002-07-31 19:43:14.000000000 +0200
-+--- misc/build/icu/source/extra/uconv/uconv.dsp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 219,225 ****
-   InputName=makedata
-@@ -555,8 +555,8 @@
-   
-   # End Custom Build
-   
--*** misc/icu/source/i18n/tblcoll.cpp	Fri Jun  6 07:05:22 2003
----- misc/build/icu/source/i18n/tblcoll.cpp	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/i18n/tblcoll.cpp	2003-06-06 07:05:22.000000000 +0200
-+--- misc/build/icu/source/i18n/tblcoll.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 84,89 ****
- --- 84,101 ----
-@@ -578,8 +578,8 @@
-   RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules,
-                                              UErrorCode& status) :
-                                              dataIsOwned(FALSE)
--*** misc/icu/source/i18n/ucol.cpp	Wed Jun 11 01:05:58 2003
----- misc/build/icu/source/i18n/ucol.cpp	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/i18n/ucol.cpp	2003-06-11 01:05:58.000000000 +0200
-+--- misc/build/icu/source/i18n/ucol.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 512,517 ****
- --- 512,570 ----
-@@ -642,8 +642,8 @@
-   ucol_openRules( const UChar        *rules,
-                   int32_t            rulesLength,
-                   UColAttributeValue normalizationMode,
--*** misc/icu/source/i18n/ucol_imp.h	Wed Jun 11 23:50:54 2003
----- misc/build/icu/source/i18n/ucol_imp.h	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/i18n/ucol_imp.h	2003-06-11 23:50:54.000000000 +0200
-+--- misc/build/icu/source/i18n/ucol_imp.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 457,462 ****
- --- 457,473 ----
-@@ -664,8 +664,8 @@
-    * Used to set requested and valid locales on a collator returned by the collator
-    * service.
-    */
--*** misc/icu/source/i18n/unicode/tblcoll.h	Mon Jun  9 08:13:14 2003
----- misc/build/icu/source/i18n/unicode/tblcoll.h	Fri Mar 18 21:38:30 2005
-+*** misc/icu/source/i18n/unicode/tblcoll.h	2003-06-09 08:13:14.000000000 +0200
-+--- misc/build/icu/source/i18n/unicode/tblcoll.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 119,124 ****
- --- 119,126 ----
-@@ -677,8 +677,8 @@
-     /**
-      * RuleBasedCollator constructor. This takes the table rules and builds a
-      * collation table out of them. Please see RuleBasedCollator class
--*** misc/icu/source/icudefs.mk.in	Tue Jun  3 08:44:40 2003
----- misc/build/icu/source/icudefs.mk.in	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/icudefs.mk.in	2003-06-03 08:44:40.000000000 +0200
-+--- misc/build/icu/source/icudefs.mk.in	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 136,142 ****
- --- 136,146 ----
-@@ -693,8 +693,8 @@
-   
-   # Versioned target for a shared library.
-   FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
--*** misc/icu/source/layout/ArabicLayoutEngine.cpp	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/ArabicLayoutEngine.cpp	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/ArabicLayoutEngine.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/ArabicLayoutEngine.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 3,8 ****
- --- 3,9 ----
-@@ -757,8 +757,61 @@
-       GDEFMarkFilter filter(fGDEFTable);
-   
-       // FIXME: we could avoid the memory allocation and copying here by
--*** misc/icu/source/layout/GXLayoutEngine.cpp	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/GXLayoutEngine.cpp	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/GlyphIterator.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/GlyphIterator.cpp	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 297,302 ****
-+--- 297,321 ----
-+      glyphPositionAdjustments[position].adjustYAdvance(yAdvanceAdjust);
-+  }
-+  
-++ void GlyphIterator::setCurrGlyphPositionAdjustment(float xPlacementAdjust, float yPlacementAdjust,
-++                                                       float xAdvanceAdjust, float yAdvanceAdjust)
-++ {
-++     if (direction < 0) {
-++         if (position <= nextLimit || position >= prevLimit) {
-++             return;
-++         }
-++     } else {
-++         if (position <= prevLimit || position >= nextLimit) {
-++             return;
-++         }
-++     }
-++ 
-++     glyphPositionAdjustments[position].setXPlacement(xPlacementAdjust);
-++     glyphPositionAdjustments[position].setYPlacement(yPlacementAdjust);
-++     glyphPositionAdjustments[position].setXAdvance(xAdvanceAdjust);
-++     glyphPositionAdjustments[position].setYAdvance(yAdvanceAdjust);
-++ }
-++ 
-+  void GlyphIterator::setCursiveFirstExitPoint()
-+  {
-+      if (direction < 0) {
-+*** misc/icu/source/layout/GlyphIterator.h	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/GlyphIterator.h	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 61,68 ****
-+      void setCurrStreamPosition(le_int32 position);
-+      void setCurrGlyphPositionAdjustment(const GlyphPositionAdjustment *adjustment);
-+      void setCurrGlyphBaseOffset(le_int32 baseOffset);
-+!     void adjustCurrGlyphPositionAdjustment(float xPlacmentAdjust, float yPlacementAdjust,
-+                                             float xAdvanceAdjust, float yAdvanceAdjust);
-+  
-+      void setCursiveFirstExitPoint();
-+      void resetCursiveLastExitPoint();
-+--- 61,70 ----
-+      void setCurrStreamPosition(le_int32 position);
-+      void setCurrGlyphPositionAdjustment(const GlyphPositionAdjustment *adjustment);
-+      void setCurrGlyphBaseOffset(le_int32 baseOffset);
-+!     void adjustCurrGlyphPositionAdjustment(float xPlacementAdjust, float yPlacementAdjust,
-+                                             float xAdvanceAdjust, float yAdvanceAdjust);
-++     void setCurrGlyphPositionAdjustment(float xPlacementAdjust, float yPlacementAdjust,
-++                                         float xAdvanceAdjust, float yAdvanceAdjust);
-+  
-+      void setCursiveFirstExitPoint();
-+      void resetCursiveLastExitPoint();
-+*** misc/icu/source/layout/GXLayoutEngine.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/GXLayoutEngine.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 39,45 ****
-           return 0;
-@@ -776,8 +829,38 @@
-   
-       if (LE_FAILURE(success)) {
-           return 0;
--*** misc/icu/source/layout/KhmerLayoutEngine.cpp	Wed Apr 20 14:07:25 2005
----- misc/build/icu/source/layout/KhmerLayoutEngine.cpp	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/HebrewShaping.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/HebrewShaping.cpp	2005-07-18 12:45:25.000000000 +0200
-+***************
-+*** 12,22 ****
-+  U_NAMESPACE_BEGIN
-+  
-+  const LETag ligaFeatureTag  = 0x6C696761; // 'liga'
-+  const LETag emptyTag        = 0x00000000; // ''
-+  
-+  const LETag hebrewTags[] =
-+  {
-+!     ligaFeatureTag, emptyTag
-+  };
-+  
-+  void HebrewShaping::shape(const LEUnicode * /*chars*/, le_int32 /*offset*/, le_int32 charCount, le_int32 /*charMax*/,
-+--- 12,25 ----
-+  U_NAMESPACE_BEGIN
-+  
-+  const LETag ligaFeatureTag  = 0x6C696761; // 'liga'
-++ const LETag ccmpFeatureTag  = 0x63636d70; // 'ccmp'
-++ const LETag kernFeatureTag  = 0x6b65726e; // 'kern'
-++ const LETag markFeatureTag  = 0x6d61726b; // 'mark'
-+  const LETag emptyTag        = 0x00000000; // ''
-+  
-+  const LETag hebrewTags[] =
-+  {
-+!     ccmpFeatureTag, kernFeatureTag, markFeatureTag, emptyTag
-+  };
-+  
-+  void HebrewShaping::shape(const LEUnicode * /*chars*/, le_int32 /*offset*/, le_int32 charCount, le_int32 /*charMax*/,
-+*** misc/icu/source/layout/KhmerLayoutEngine.cpp	2005-07-18 13:52:48.000000000 +0200
-+--- misc/build/icu/source/layout/KhmerLayoutEngine.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 1 ****
- ! dummy
-@@ -866,8 +949,8 @@
- ! }
- ! 
- ! U_NAMESPACE_END
--*** misc/icu/source/layout/KhmerLayoutEngine.h	Wed Apr 20 14:07:25 2005
----- misc/build/icu/source/layout/KhmerLayoutEngine.h	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/KhmerLayoutEngine.h	2005-07-18 13:52:48.000000000 +0200
-+--- misc/build/icu/source/layout/KhmerLayoutEngine.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 1 ****
- ! dummy
-@@ -1007,8 +1090,8 @@
- ! U_NAMESPACE_END
- ! #endif
- ! 
--*** misc/icu/source/layout/KhmerReordering.cpp	Wed Apr 20 14:07:25 2005
----- misc/build/icu/source/layout/KhmerReordering.cpp	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/KhmerReordering.cpp	2005-07-18 13:52:48.000000000 +0200
-+--- misc/build/icu/source/layout/KhmerReordering.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 1 ****
- ! dummy
-@@ -1544,8 +1627,8 @@
- ! 
- ! 
- ! U_NAMESPACE_END
--*** misc/icu/source/layout/KhmerReordering.h	Wed Apr 20 14:07:25 2005
----- misc/build/icu/source/layout/KhmerReordering.h	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/KhmerReordering.h	2005-07-18 13:52:48.000000000 +0200
-+--- misc/build/icu/source/layout/KhmerReordering.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 1 ****
- ! dummy
-@@ -1684,8 +1767,166 @@
- ! 
- ! U_NAMESPACE_END
- ! #endif
--*** misc/icu/source/layout/LESwaps.h	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/LESwaps.h	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/layout.dsp	2003-04-12 02:37:12.000000000 +0200
-+--- misc/build/icu/source/layout/layout.dsp	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 254,259 ****
-+--- 254,263 ----
-+  # End Source File
-+  # Begin Source File
-+  
-++ SOURCE=.\KhmerLayoutEngine.cpp
-++ # End Source File
-++ # Begin Source File
-++ 
-+  SOURCE=.\IndicRearrangementProcessor.cpp
-+  # End Source File
-+  # Begin Source File
-+***************
-+*** 262,267 ****
-+--- 266,275 ----
-+  # End Source File
-+  # Begin Source File
-+  
-++ SOURCE=.\KhmerReordering.cpp
-++ # End Source File
-++ # Begin Source File
-++ 
-+  SOURCE=.\LayoutEngine.cpp
-+  # End Source File
-+  # Begin Source File
-+***************
-+*** 522,527 ****
-+--- 530,539 ----
-+  # End Source File
-+  # Begin Source File
-+  
-++ SOURCE=.\KhmerLayoutEngine.h
-++ # End Source File
-++ # Begin Source File
-++ 
-+  SOURCE=.\IndicRearrangement.h
-+  # End Source File
-+  # Begin Source File
-+***************
-+*** 534,539 ****
-+--- 546,555 ----
-+  # End Source File
-+  # Begin Source File
-+  
-++ SOURCE=.\KhmerReordering.h
-++ # End Source File
-++ # Begin Source File
-++ 
-+  SOURCE=.\LayoutEngine.h
-+  
-+  !IF  "$(CFG)" == "layout - Win32 Release"
-+*** misc/icu/source/layout/LayoutEngine.cpp	2003-06-05 00:39:18.000000000 +0200
-+--- misc/build/icu/source/layout/LayoutEngine.cpp	2005-07-18 09:36:10.000000000 +0200
-+***************
-+*** 14,19 ****
-+--- 14,20 ----
-+  #include "ArabicLayoutEngine.h"
-+  #include "HanLayoutEngine.h"
-+  #include "IndicLayoutEngine.h"
-++ #include "KhmerLayoutEngine.h"
-+  #include "ThaiLayoutEngine.h"
-+  #include "GXLayoutEngine.h"
-+  #include "ScriptAndLanguageTags.h"
-+***************
-+*** 428,433 ****
-+--- 429,435 ----
-+              break;
-+  
-+          case arabScriptCode:
-++         case hebrScriptCode:
-+              result = new ArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable);
-+              break;
-+  
-+***************
-+*** 452,457 ****
-+--- 454,463 ----
-+  
-+              break;
-+  
-++         case khmrScriptCode:
-++             result = new KhmerOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable);
-++             break;
-++ 
-+          default:
-+              result = new OpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable);
-+              break;
-+*** misc/icu/source/layout/layoutobj.inc	2000-11-14 23:15:30.000000000 +0100
-+--- misc/build/icu/source/layout/layoutobj.inc	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 8,13 ****
-+--- 8,14 ----
-+  ArabicLayoutEngine.o \
-+  GXLayoutEngine.o \
-+  IndicLayoutEngine.o \
-++ KhmerLayoutEngine.o \
-+  LayoutEngine.o
-+  
-+  # aat/
-+***************
-+*** 48,53 ****
-+--- 49,55 ----
-+  HebrewShaping.o \
-+  IndicClassTables.o \
-+  IndicReordering.o \
-++ KhmerReordering.o \
-+  LigatureSubstitutionSubtables.o \
-+  LookupProcessor.o \
-+  Lookups.o \
-+*** misc/icu/source/layout/layout.vcproj	2003-05-01 00:50:20.000000000 +0200
-+--- misc/build/icu/source/layout/layout.vcproj	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 215,226 ****
-+--- 215,232 ----
-+  				RelativePath=".\IndicLayoutEngine.cpp">
-+  			</File>
-+  			<File
-++ 				RelativePath=".\KhmerLayoutEngine.cpp">
-++ 			</File>
-++ 			<File
-+  				RelativePath=".\IndicRearrangementProcessor.cpp">
-+  			</File>
-+  			<File
-+  				RelativePath=".\IndicReordering.cpp">
-+  			</File>
-+  			<File
-++ 				RelativePath=".\KhmerReordering.cpp">
-++ 			</File>
-++ 			<File
-+  				RelativePath=".\LEFontInstance.cpp">
-+  			</File>
-+  			<File
-+***************
-+*** 417,422 ****
-+--- 423,431 ----
-+  				RelativePath=".\IndicLayoutEngine.h">
-+  			</File>
-+  			<File
-++ 				RelativePath=".\KhmerLayoutEngine.h">
-++ 			</File>
-++ 			<File
-+  				RelativePath=".\IndicRearrangement.h">
-+  			</File>
-+  			<File
-+***************
-+*** 426,431 ****
-+--- 435,443 ----
-+  				RelativePath=".\IndicReordering.h">
-+  			</File>
-+  			<File
-++ 				RelativePath=".\KhmerReordering.h">
-++ 			</File>
-++ 			<File
-+  				RelativePath=".\LEFontInstance.h">
-+  				<FileConfiguration
-+  					Name="Debug|Win32">
-+*** misc/icu/source/layout/LESwaps.h	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/LESwaps.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 3,8 ****
- --- 3,9 ----
-@@ -1758,33 +1999,8 @@
-   
-   /**
-    * This class is used to access data which stored in big endian order
--*** misc/icu/source/layout/LayoutEngine.cpp	Thu Jun  5 00:39:18 2003
----- misc/build/icu/source/layout/LayoutEngine.cpp	Fri Mar 18 21:38:32 2005
--***************
--*** 14,19 ****
----- 14,20 ----
--  #include "ArabicLayoutEngine.h"
--  #include "HanLayoutEngine.h"
--  #include "IndicLayoutEngine.h"
--+ #include "KhmerLayoutEngine.h"
--  #include "ThaiLayoutEngine.h"
--  #include "GXLayoutEngine.h"
--  #include "ScriptAndLanguageTags.h"
--***************
--*** 452,457 ****
----- 453,462 ----
--  
--              break;
--  
--+         case khmrScriptCode:
--+             result = new KhmerOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable);
--+             break;
--+ 
--          default:
--              result = new OpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable);
--              break;
--*** misc/icu/source/layout/LookupProcessor.cpp	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/LookupProcessor.cpp	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/LookupProcessor.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/LookupProcessor.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 92,106 ****
-   le_int32 LookupProcessor::selectLookups(const FeatureTable *featureTable, LETag featureTag, le_int32 order)
-@@ -1834,8 +2050,8 @@
-    
-               featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag);
-               count = selectLookups(featureTable, featureTag, order);
--*** misc/icu/source/layout/Makefile.in	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/Makefile.in	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/Makefile.in	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/Makefile.in	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 52,57 ****
- --- 52,58 ----
-@@ -1856,8 +2072,107 @@
-   LigatureSubstSubtables.o \
-   LookupProcessor.o \
-   Lookups.o \
--*** misc/icu/source/layout/OpenTypeLayoutEngine.h	Tue Jun  3 22:58:22 2003
----- misc/build/icu/source/layout/OpenTypeLayoutEngine.h	Fri Mar 18 21:38:32 2005
-+*** misc/icu/source/layout/MarkToBasePosnSubtables.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/MarkToBasePosnSubtables.cpp	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 78,91 ****
-+      glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint baseAdvance;
-+  
-+          fontInstance->getGlyphAdvance(baseGlyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, baseAdvance);
-+  
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+--- 78,91 ----
-+      glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint baseAdvance;
-+  
-+          fontInstance->getGlyphAdvance(baseGlyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, baseAdvance);
-+  
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+*** misc/icu/source/layout/MarkToLigaturePosnSubtables.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/MarkToLigaturePosnSubtables.cpp	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 89,102 ****
-+      glyphIterator->setCurrGlyphBaseOffset(ligatureIterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint ligatureAdvance;
-+  
-+          fontInstance->getGlyphAdvance(ligatureGlyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, ligatureAdvance);
-+  
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - ligatureAdvance.fX, anchorDiffY - ligatureAdvance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+--- 89,102 ----
-+      glyphIterator->setCurrGlyphBaseOffset(ligatureIterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint ligatureAdvance;
-+  
-+          fontInstance->getGlyphAdvance(ligatureGlyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, ligatureAdvance);
-+  
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - ligatureAdvance.fX, anchorDiffY - ligatureAdvance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+*** misc/icu/source/layout/MarkToMarkPosnSubtables.cpp	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/MarkToMarkPosnSubtables.cpp	2005-07-18 09:07:29.000000000 +0200
-+***************
-+*** 78,91 ****
-+      glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint mark2Advance;
-+  
-+          fontInstance->getGlyphAdvance(mark2Glyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, mark2Advance);
-+  
-+!         glyphIterator->adjustCurrGlyphPositionAdjustment(anchorDiffX - mark2Advance.fX, anchorDiffY - mark2Advance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+--- 78,91 ----
-+      glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition());
-+  
-+      if (glyphIterator->isRightToLeft()) {
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX, anchorDiffY, -markAdvance.fX, -markAdvance.fY);
-+      } else {
-+          LEPoint mark2Advance;
-+  
-+          fontInstance->getGlyphAdvance(mark2Glyph, pixels);
-+          fontInstance->pixelsToUnits(pixels, mark2Advance);
-+  
-+!         glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - mark2Advance.fX, anchorDiffY - mark2Advance.fY, -markAdvance.fX, -markAdvance.fY);
-+      }
-+  
-+      return 1;
-+*** misc/icu/source/layout/OpenTypeLayoutEngine.h	2003-06-03 22:58:22.000000000 +0200
-+--- misc/build/icu/source/layout/OpenTypeLayoutEngine.h	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 319,324 ****
- --- 319,337 ----
-@@ -1880,131 +2195,8 @@
-           return tempGlyphCount;
-       };
-   
--*** misc/icu/source/layout/layout.dsp	Sat Apr 12 02:37:12 2003
----- misc/build/icu/source/layout/layout.dsp	Fri Mar 18 21:38:32 2005
--***************
--*** 254,259 ****
----- 254,263 ----
--  # End Source File
--  # Begin Source File
--  
--+ SOURCE=.\KhmerLayoutEngine.cpp
--+ # End Source File
--+ # Begin Source File
--+ 
--  SOURCE=.\IndicRearrangementProcessor.cpp
--  # End Source File
--  # Begin Source File
--***************
--*** 262,267 ****
----- 266,275 ----
--  # End Source File
--  # Begin Source File
--  
--+ SOURCE=.\KhmerReordering.cpp
--+ # End Source File
--+ # Begin Source File
--+ 
--  SOURCE=.\LayoutEngine.cpp
--  # End Source File
--  # Begin Source File
--***************
--*** 522,527 ****
----- 530,539 ----
--  # End Source File
--  # Begin Source File
--  
--+ SOURCE=.\KhmerLayoutEngine.h
--+ # End Source File
--+ # Begin Source File
--+ 
--  SOURCE=.\IndicRearrangement.h
--  # End Source File
--  # Begin Source File
--***************
--*** 534,539 ****
----- 546,555 ----
--  # End Source File
--  # Begin Source File
--  
--+ SOURCE=.\KhmerReordering.h
--+ # End Source File
--+ # Begin Source File
--+ 
--  SOURCE=.\LayoutEngine.h
--  
--  !IF  "$(CFG)" == "layout - Win32 Release"
--*** misc/icu/source/layout/layout.vcproj	Thu May  1 00:50:20 2003
----- misc/build/icu/source/layout/layout.vcproj	Fri Mar 18 21:38:32 2005
--***************
--*** 215,226 ****
----- 215,232 ----
--  				RelativePath=".\IndicLayoutEngine.cpp">
--  			</File>
--  			<File
--+ 				RelativePath=".\KhmerLayoutEngine.cpp">
--+ 			</File>
--+ 			<File
--  				RelativePath=".\IndicRearrangementProcessor.cpp">
--  			</File>
--  			<File
--  				RelativePath=".\IndicReordering.cpp">
--  			</File>
--  			<File
--+ 				RelativePath=".\KhmerReordering.cpp">
--+ 			</File>
--+ 			<File
--  				RelativePath=".\LEFontInstance.cpp">
--  			</File>
--  			<File
--***************
--*** 417,422 ****
----- 423,431 ----
--  				RelativePath=".\IndicLayoutEngine.h">
--  			</File>
--  			<File
--+ 				RelativePath=".\KhmerLayoutEngine.h">
--+ 			</File>
--+ 			<File
--  				RelativePath=".\IndicRearrangement.h">
--  			</File>
--  			<File
--***************
--*** 426,431 ****
----- 435,443 ----
--  				RelativePath=".\IndicReordering.h">
--  			</File>
--  			<File
--+ 				RelativePath=".\KhmerReordering.h">
--+ 			</File>
--+ 			<File
--  				RelativePath=".\LEFontInstance.h">
--  				<FileConfiguration
--  					Name="Debug|Win32">
--*** misc/icu/source/layout/layoutobj.inc	Tue Nov 14 23:15:30 2000
----- misc/build/icu/source/layout/layoutobj.inc	Fri Mar 18 21:38:34 2005
--***************
--*** 8,13 ****
----- 8,14 ----
--  ArabicLayoutEngine.o \
--  GXLayoutEngine.o \
--  IndicLayoutEngine.o \
--+ KhmerLayoutEngine.o \
--  LayoutEngine.o
--  
--  # aat/
--***************
--*** 48,53 ****
----- 49,55 ----
--  HebrewShaping.o \
--  IndicClassTables.o \
--  IndicReordering.o \
--+ KhmerReordering.o \
--  LigatureSubstitutionSubtables.o \
--  LookupProcessor.o \
--  Lookups.o \
--*** misc/icu/source/test/ieeetest/ieeetest.cpp	Wed Mar 21 20:46:50 2001
----- misc/build/icu/source/test/ieeetest/ieeetest.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/ieeetest/ieeetest.cpp	2001-03-21 20:46:50.000000000 +0100
-+--- misc/build/icu/source/test/ieeetest/ieeetest.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 13,23 ****
-   *******************************************************************************
-@@ -2030,8 +2222,8 @@
-   #include "unicode/putil.h"
-   
-   //==============================
--*** misc/icu/source/test/intltest/loctest.cpp	Thu Jun  5 01:56:50 2003
----- misc/build/icu/source/test/intltest/loctest.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/loctest.cpp	2003-06-05 01:56:50.000000000 +0200
-+--- misc/build/icu/source/test/intltest/loctest.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -2042,8 +2234,8 @@
-   #include "loctest.h"
-   #include <stdio.h>
-   #include <string.h>
--*** misc/icu/source/test/intltest/testidn.cpp	Mon Jun  9 06:54:46 2003
----- misc/build/icu/source/test/intltest/testidn.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/testidn.cpp	2003-06-09 06:54:46.000000000 +0200
-+--- misc/build/icu/source/test/intltest/testidn.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 19,27 ****
-   *   in various IDNA conversion processes.
-@@ -2065,8 +2257,8 @@
-   
-   #if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION
-   
--*** misc/icu/source/test/intltest/tsmutex.cpp	Fri May 24 01:56:48 2002
----- misc/build/icu/source/test/intltest/tsmutex.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/tsmutex.cpp	2002-05-24 01:56:48.000000000 +0200
-+--- misc/build/icu/source/test/intltest/tsmutex.cpp	2005-07-18 09:07:29.000000000 +0200
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -2077,8 +2269,8 @@
-   #include "tsmutex.h"
-   #include <stdio.h>
-   #include <string.h>
--*** misc/icu/source/test/intltest/tsputil.cpp	Fri Oct  5 20:47:10 2001
----- misc/build/icu/source/test/intltest/tsputil.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/tsputil.cpp	2001-10-05 20:47:10.000000000 +0200
-+--- misc/build/icu/source/test/intltest/tsputil.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -2089,8 +2281,8 @@
-   #include "tsputil.h"
-   
-   #include <float.h> // DBL_MAX, DBL_MIN
--*** misc/icu/source/test/intltest/uobjtest.cpp	Tue Jun  3 22:56:50 2003
----- misc/build/icu/source/test/intltest/uobjtest.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/uobjtest.cpp	2003-06-03 22:56:50.000000000 +0200
-+--- misc/build/icu/source/test/intltest/uobjtest.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -2101,8 +2293,8 @@
-   #include "uobjtest.h"
-   #include <string.h>
-   
--*** misc/icu/source/test/intltest/ustrtest.cpp	Fri May  9 18:15:50 2003
----- misc/build/icu/source/test/intltest/ustrtest.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/test/intltest/ustrtest.cpp	2003-05-09 18:15:50.000000000 +0200
-+--- misc/build/icu/source/test/intltest/ustrtest.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 4,9 ****
- --- 4,10 ----
-@@ -2113,8 +2305,8 @@
-   #include "ustrtest.h"
-   #include "unicode/unistr.h"
-   #include "unicode/uchar.h"
--*** misc/icu/source/tools/genbrk/genbrk.cpp	Tue Jun  3 22:56:52 2003
----- misc/build/icu/source/tools/genbrk/genbrk.cpp	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/tools/genbrk/genbrk.cpp	2003-06-03 22:56:52.000000000 +0200
-+--- misc/build/icu/source/tools/genbrk/genbrk.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 26,33 ****
-   //
-@@ -2134,8 +2326,8 @@
-   #include "unicode/ucnv.h"
-   #include "unicode/unistr.h"
-   #include "unicode/rbbi.h"
--*** misc/icu/source/tools/gennorm/gennorm.c	Tue May  6 03:36:14 2003
----- misc/build/icu/source/tools/gennorm/gennorm.c	Fri Mar 18 21:38:34 2005
-+*** misc/icu/source/tools/gennorm/gennorm.c	2003-05-06 03:36:14.000000000 +0200
-+--- misc/build/icu/source/tools/gennorm/gennorm.c	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 241,249 ****
-               return;
-@@ -2157,8 +2349,8 @@
-               qcFlags&=0x30;
-           } else {
-               return;
--*** misc/icu/source/tools/genpname/genpname.cpp	Wed Jun  4 00:23:50 2003
----- misc/build/icu/source/tools/genpname/genpname.cpp	Fri Mar 18 21:38:36 2005
-+*** misc/icu/source/tools/genpname/genpname.cpp	2003-06-04 00:23:50.000000000 +0200
-+--- misc/build/icu/source/tools/genpname/genpname.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 8,16 ****
-   **********************************************************************
-@@ -2180,8 +2372,8 @@
-   #include "unicode/putil.h"
-   #include "cmemory.h"
-   #include "cstring.h"
--*** misc/icu/source/tools/gentz/gentz.cpp	Tue Jun  3 22:56:54 2003
----- misc/build/icu/source/tools/gentz/gentz.cpp	Fri Mar 18 21:38:36 2005
-+*** misc/icu/source/tools/gentz/gentz.cpp	2003-06-03 22:56:54.000000000 +0200
-+--- misc/build/icu/source/tools/gentz/gentz.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 25,33 ****
-    * See tz.pl for the file format that is READ by this program.
-@@ -2203,8 +2395,8 @@
-   #include "unicode/putil.h"
-   #include "cmemory.h"
-   #include "cstring.h"
--*** misc/icu/source/tools/genuca/genuca.cpp	Tue Jun  3 22:56:54 2003
----- misc/build/icu/source/tools/genuca/genuca.cpp	Fri Mar 18 21:38:36 2005
-+*** misc/icu/source/tools/genuca/genuca.cpp	2003-06-03 22:56:54.000000000 +0200
-+--- misc/build/icu/source/tools/genuca/genuca.cpp	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 23,30 ****
-   *   05/09/2001  weiv                    Case bits are now in the CEs, not in front
-@@ -2224,8 +2416,8 @@
-   #include "unicode/udata.h"
-   #include "ucol_imp.h"
-   #include "genuca.h"
--*** misc/icu/source/tools/pkgdata/dllmode.c	Tue Jun  3 22:56:54 2003
----- misc/build/icu/source/tools/pkgdata/dllmode.c	Wed Apr 20 14:04:47 2005
-+*** misc/icu/source/tools/pkgdata/dllmode.c	2003-06-03 22:56:54.000000000 +0200
-+--- misc/build/icu/source/tools/pkgdata/dllmode.c	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 131,137 ****
-       }
-@@ -2277,8 +2469,8 @@
-                                        "\n");
-   #else
-       
--*** misc/icu/source/tools/pkgdata/gmake.c	Tue Aug  6 21:06:32 2002
----- misc/build/icu/source/tools/pkgdata/gmake.c	Wed Apr 20 14:06:42 2005
-+*** misc/icu/source/tools/pkgdata/gmake.c	2002-08-06 21:06:32.000000000 +0200
-+--- misc/build/icu/source/tools/pkgdata/gmake.c	2005-07-18 09:07:30.000000000 +0200
- ***************
- *** 203,209 ****
-         commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
 Index: inc/ZipPackageFolder.hxx
 ===================================================================
 RCS file: /cvs/xml/package/inc/ZipPackageFolder.hxx,v
@@ -1329,61 +398,6 @@
      }
  }
  
-Index: source/glyphs/gcach_layout.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
-retrieving revision 1.34
-retrieving revision 1.34.196.2
-diff -u -p -u -r1.34 -r1.34.196.2
---- openoffice.org.orig/vcl/source/glyphs/gcach_layout.cxx	31 Jan 2005 09:18:58 -0000	1.34
-+++ openoffice.org/vcl/source/glyphs/gcach_layout.cxx	18 Jul 2005 11:54:03 -0000	1.34.196.2
-@@ -290,19 +290,14 @@ float IcuFontFromServerFont::getYPixelsP
- 
- float IcuFontFromServerFont::getScaleFactorX() const
- {
--    const ImplFontSelectData& r = mrServerFont.GetFontSelData();
--    float fXScale = r.mnWidth ? r.mnWidth : r.mnHeight;
--    fXScale /= mrServerFont.GetEmUnits();
--    return fXScale;
-+    return 1.0;
- }
- 
- // -----------------------------------------------------------------------
- 
- float IcuFontFromServerFont::getScaleFactorY() const
- {
--    float fYScale = mrServerFont.GetFontSelData().mnHeight;
--    fYScale /= mrServerFont.GetEmUnits();
--    return fYScale; //TODO
-+    return 1.0;
- }
- 
- // -----------------------------------------------------------------------
-@@ -444,7 +439,14 @@ bool IcuLayoutEngine::operator()( Server
-             break;
- 
-         // find matching script
--        le_int32 eScriptCode = uscript_getScript( pIcuChars[nMinRunPos], &rcI18n );
-+        // TODO: split up bidi run into script runs
-+        le_int32 eScriptCode = -1;
-+        for( int i = nMinRunPos; i < nEndRunPos; ++i )
-+        {
-+            eScriptCode = uscript_getScript( pIcuChars[i], &rcI18n );
-+            if( (eScriptCode > 0) && (eScriptCode != latnScriptCode) )
-+                break;
-+        }
-         if( eScriptCode < 0 )   // TODO: handle errors better
-             eScriptCode = latnScriptCode;
- 
-@@ -524,7 +526,7 @@ bool IcuLayoutEngine::operator()( Server
-             // heuristic to detect group clusters using the "smoothed" char positions
-             long nGlyphFlags = 0;
-             if( nLastCharPos != -1 )
--                if( (nCharPos == nLastCharPos) || (nGlyphWidth == 0) )
-+                if( (nCharPos == nLastCharPos) || (nGlyphWidth <= 0) )
-                     nGlyphFlags = GlyphItem::IS_IN_CLUSTER;
-             if( bRightToLeft )
-                 nGlyphFlags |= GlyphItem::IS_RTL_GLYPH;
 Index: unx/source/app/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]