rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28955

Modified Files:
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 
Log Message:
hyphenation stuff changed slightly, fix up

openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:

Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	8 Jan 2008 14:51:50 -0000	1.1
+++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	15 Jan 2008 12:30:51 -0000	1.2
@@ -105,7 +105,7 @@
 +                  aDicts[k].aPtr = NULL;
 +                  aDicts[k].aLoc = nLoc;
 +                  aDicts[k].aEnc = 0;
-+                  aDicts[k].aName = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
++                  aDicts[k].aName = A2OU(postsyspdict[i]->filename);
 +                  aDicts[k].apCC = new CharClass(nLoc);
 +
 +                  free(postsyspdict[i]->filename);
@@ -120,6 +120,29 @@
                // reallocate the size to just cover the unique locales
                aSuppLocales.realloc(numlocs);
  
+@@ -391,6 +448,7 @@
+ 	       OUString DictFN = aDicts[k].aName + A2OU(".dic");
+ 	       OUString userdictpath;
+ 	       OUString dictpath;
++           const OUString systemdictpath(A2OU("/usr/share/hyphen/"));
+ 
+ 	       osl::FileBase::getSystemPathFromFileURL(
+ 						    aPathOpt.GetUserDictionaryPath() + A2OU("/"),
+@@ -402,11 +460,13 @@
+ 	    
+                OString uTmp(OU2ENC(userdictpath + DictFN,osl_getThreadTextEncoding()));
+                OString sTmp(OU2ENC(dictpath + DictFN,osl_getThreadTextEncoding()));
++               OString dTmp(OU2ENC(systemdictpath + DictFN,osl_getThreadTextEncoding()));
+ 
+ 	       if ( ( dict = hnj_hyphen_load ( uTmp.getStr() ) ) == NULL )
+ 	          if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
++	             if ( ( dict = hnj_hyphen_load ( dTmp.getStr()) ) == NULL )
+ 		  {
+-		     fprintf(stderr, "Couldn't find file %s and %s\n", OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding()),  OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding() ));
++		     fprintf(stderr, "Couldn't find file %s and %s and %s\n", OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding()),  OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding() ), OU2ENC(systemdictpath + DictFN, osl_getThreadTextEncoding() ));
+ 		     return NULL;
+ 		  }
+ 	       aDicts[k].aPtr = dict;
 Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
 ===================================================================
 RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v