rpms/openoffice.org/devel openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
Log Message:
and other possible disaster areas

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/collator_unicode.hxx                       |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   23 +++++--
 i18npool/source/breakiterator/makefile.mk               |    8 +-
 i18npool/source/collator/collator_unicode.cxx           |    7 +-
 inc/collator_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                             |    6 +
 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/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 19 files changed, 73 insertions(+), 72 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	14 Nov 2005 09:44:16 -0000	1.6
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	14 Nov 2005 10:12:24 -0000	1.7
@@ -371,19 +371,26 @@
  using namespace ::com::sun::star::lang;
  using namespace ::rtl;
  
-@@ -90,12 +92,15 @@ void SAL_CALL BreakIterator_Unicode::loa
+@@ -90,12 +92,21 @@ void SAL_CALL BreakIterator_Unicode::loa
              if ( !U_SUCCESS(status) ) throw ERROR;
  
              status = U_ZERO_ERROR;
 -            aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
 -                    OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
 -                    RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
+-            if (!U_SUCCESS(status) ) {
 +
-+            UDataMemory *pData = udata_open("OpenOffice_icu/OpenOffice", "brk", 
-+                OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
-+                RTL_TEXTENCODING_ASCII_US).getStr(), &status);
++            UDataMemory *pData;
++			if (!rLocale.Language.getLength())
++				pData = 0;
++			else
++			{
++				pData = udata_open("OpenOffice_icu/OpenOffice", "brk", 
++                	OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
++                	RTL_TEXTENCODING_ASCII_US).getStr(), &status);
++			}
 +            aBreakIterator = pData ? new RuleBasedBreakIterator(pData, status) : 0;
-             if (!U_SUCCESS(status) ) {
++            if (!U_SUCCESS(status) || !aBreakIterator) {
                  status = U_ZERO_ERROR;
 -                aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);
 +                pData = udata_open("OpenOffice_icu/OpenOffice", "brk", rule, &status);