rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch, NONE, 1.1 openoffice.org.spec, 1.1650, 1.1651

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch 
Log Message:
add openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch

openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch:

--- NEW FILE openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch ---
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.25.126.1
diff -u -r1.25.126.1 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx	17 Jan 2008 16:06:53 -0000	1.25.126.1
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx	16 Sep 2008 10:31:12 -0000
@@ -821,15 +823,18 @@
         {
             sal_uInt8 nRet =
                 rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
-            if (eTextEncoding == RTL_TEXTENCODING_UCS2)
-            {
-                ASSERT(nRet != 0x80, "This method may be redundant");
-                nRet = 0x80;
-            }
-            else if (eTextEncoding == RTL_TEXTENCODING_DONTKNOW)
+            switch (eTextEncoding)
             {
-                ASSERT(nRet != 0x80, "This method may be redundant");
-                nRet = 0x80;
+            	case RTL_TEXTENCODING_DONTKNOW:
+            	case RTL_TEXTENCODING_UCS2:
+            	case RTL_TEXTENCODING_UTF7:
+            	case RTL_TEXTENCODING_UTF8:
+            	case RTL_TEXTENCODING_JAVA_UTF8:
+                    ASSERT(nRet != 0x80, "This method may be redundant");
+                    nRet = 0x80;
+            	    break;
+            	default:
+            	    break;
             }
             return nRet;
         }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1650
retrieving revision 1.1651
diff -u -r1.1650 -r1.1651
--- openoffice.org.spec	16 Sep 2008 08:43:13 -0000	1.1650
+++ openoffice.org.spec	16 Sep 2008 10:52:31 -0000	1.1651
@@ -113,6 +113,7 @@
 Patch42: workspace.cmcfixes50.patch
 Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch44: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
+Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1312,6 +1313,7 @@
 %patch42 -p1 -b .workspace.cmcfixes50.patch
 %patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch44 -p1 -b .ooo93419.svx.accessibity-loops.patch
+%patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`