rpms/openoffice.org/devel openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.13, 1.14

Tue Aug 8 11:32:55 UTC 2006

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
Log Message:
rh#201546# icu doesn't reference count or copy the string

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/breakiterator_unicode.hxx                  |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   24 +++++--
 i18npool/source/breakiterator/makefile.mk               |   16 ++--
 i18npool/source/collator/collator_unicode.cxx           |   32 ++++-----
 i18npool/source/collator/gencoll_rule.cxx               |    4 -
 inc/breakiterator_unicode.hxx                           |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |   11 ++-
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/collator/gencoll_rule.cxx                        |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 21 files changed, 87 insertions(+), 101 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14

--- openoffice.org-1.9.128.ooo54479.systemicu.patch	7 Aug 2006 13:23:00 -0000	1.13
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	8 Aug 2006 11:32:53 -0000	1.14
@@ -267,13 +267,28 @@
  vc	vcl										usr1	-	all	vc_mkout NULL
  vc	vcl\source\unotypes						nmake	-	all	vc_unot NULL
  vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_unot NULL
+Index: inc/breakiterator_unicode.hxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/inc/breakiterator_unicode.hxx,v
+retrieving revision 1.12
+diff -u -r1.12 breakiterator_unicode.hxx
+--- openoffice.org.orig/i18npool/inc/breakiterator_unicode.hxx	17 Nov 2005 20:30:00 -0000	1.12
++++ openoffice.org/i18npool/inc/breakiterator_unicode.hxx	8 Aug 2006 11:31:48 -0000
+@@ -92,6 +92,7 @@
+ 
+     struct {
+         rtl::OUString aText;
++	UnicodeString aICUText;
+         icu::BreakIterator *aBreakIterator;
+     } character, word, sentence, line, *icuBI; 
+     com::sun::star::lang::Locale aLocale;
 Index: prj/build.lst
 ===================================================================
 RCS file: /cvs/l10n/i18npool/prj/build.lst,v
 retrieving revision 1.20
 diff -u -r1.20 build.lst
 --- openoffice.org.orig/i18npool/prj/build.lst	7 Apr 2006 14:30:57 -0000	1.20
-+++ openoffice.org/i18npool/prj/build.lst	7 Aug 2006 12:47:54 -0000
++++ openoffice.org/i18npool/prj/build.lst	8 Aug 2006 11:31:48 -0000
 @@ -1,4 +1,4 @@
 -inp  i18npool    :   bridges sax stoc comphelper icu i18nutil regexp NULL
 +inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
@@ -286,7 +301,7 @@
 retrieving revision 1.22
 diff -u -r1.22 breakiterator_unicode.cxx
 --- openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Nov 2005 20:30:35 -0000	1.22
-+++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	7 Aug 2006 12:47:55 -0000
++++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	8 Aug 2006 11:31:48 -0000
 @@ -37,9 +37,10 @@
  #include <unicode/locid.h>
  #include <unicode/rbbi.h>
@@ -327,13 +342,25 @@
                  if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
              }
          }
+@@ -151,7 +158,10 @@
+ 
+     if (newBreak || !icuBI->aText.equals(rText)) {
+         icuBI->aText = rText;
+-        icuBI->aBreakIterator->setText(UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength()));
++	//ICU doesn't copy or reference such a UnicodeString, only a pointer to it, so it must exist
++	//for the duration of the usage
++        icuBI->aICUText = UnicodeString(icuBI->aText.getStr(), icuBI->aText.getLength());
++        icuBI->aBreakIterator->setText(icuBI->aICUText);
+     }
+ }
+ 
 Index: source/breakiterator/makefile.mk
 ===================================================================
 RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
 retrieving revision 1.9
 diff -u -r1.9 makefile.mk
 --- openoffice.org.orig/i18npool/source/breakiterator/makefile.mk	1 Nov 2005 14:52:19 -0000	1.9
-+++ openoffice.org/i18npool/source/breakiterator/makefile.mk	7 Aug 2006 12:47:55 -0000
++++ openoffice.org/i18npool/source/breakiterator/makefile.mk	8 Aug 2006 11:31:48 -0000
 @@ -51,11 +51,11 @@
  MY_BRK_TXTFILES:=$(shell ls data/*.txt)
  
@@ -370,7 +397,7 @@
 retrieving revision 1.12
 diff -u -r1.12 collator_unicode.cxx
 --- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	20 Apr 2006 13:41:49 -0000	1.12
-+++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	7 Aug 2006 12:47:56 -0000
++++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	8 Aug 2006 11:31:49 -0000
 @@ -73,8 +73,21 @@
  	throw(RuntimeException)
  {
@@ -430,7 +457,7 @@
 retrieving revision 1.7
 diff -u -r1.7 gencoll_rule.cxx
 --- openoffice.org.orig/i18npool/source/collator/gencoll_rule.cxx	31 Jan 2006 18:36:13 -0000	1.7
-+++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	7 Aug 2006 12:47:56 -0000
++++ openoffice.org/i18npool/source/collator/gencoll_rule.cxx	8 Aug 2006 11:31:49 -0000
 @@ -81,9 +81,6 @@
  
  }


