ooo-build r12619 - trunk/patches/dev300

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Wed May 21 12:19:16 2008
New Revision: 12619
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12619&view=rev

Log:
added a fix

Added:
   trunk/patches/dev300/sw-html-export-font.diff
Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed May 21 12:19:16 2008
@@ -254,7 +254,7 @@
 cjk-character-units-ui.diff, Amelia Wang
 cjk-character-units-imp.diff, Amelia Wang
 cjk-character-units-rulers-sync-with-pggrid-fix.diff, Amelia Wang
-cjk-character-units-fix.diff, i#356101, Amelia Wang 
+cjk-character-units-fix.diff, i#356101, Amelia Wang
 cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
 
 # text layout enhancement for better CJK support
@@ -633,11 +633,15 @@
 
 # the 'three layer OOo' needs rpath
 unxsplash-rpath.diff, i#60696, jholesov
- 
+
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
+# Allows to export font correctly, which fix copy/paste bugs, as a
+good side effect :)
+sw-html-export-font.diff, i#89626, mloiseleur
+
 
 
 [ CalcFixes ]
@@ -776,7 +780,7 @@
 # Dynyamically resize filtered range when new data rows are present.
 sc-dbrange-dynamic-resize.diff, n#352662, i#85305, kohei
 
-# When importing an Excel file, skip un-supported pivot charts altogether 
+# When importing an Excel file, skip un-supported pivot charts altogether
 # instead of importing them as an empty chart object.
 sc-skip-pivot-charts.diff, n#355300, i#85658, kohei
 
@@ -788,7 +792,7 @@
 sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
 
 # reduce precision to 15 significant digits for INT, FLOOR, CEILING functions
-# and possibly others that use approxFloor() or approxCeil() functions 
+# and possibly others that use approxFloor() or approxCeil() functions
 # internally.
 sal-approx-value.diff, n#310706, i#86775, kohei
 
@@ -1560,7 +1564,7 @@
 # end LCL hacks
 basic-source-classes-eventatt-cxx.diff, #no-upstream
 #ditto
-# null patch below was removed because it causes 
+# null patch below was removed because it causes
 # other problems, e.g. the current NULL behavour fails
 # for vba api
 #for NULL and IsNULL compatibility with MSO
@@ -1587,7 +1591,7 @@
 vba-partition-function.diff, n#294187, Fong
 # GetAttr function, using windows api to get file attributes in Win32.
 vba-getattr-function.diff, n#294187, Fong
-# Fomat function enhancement for VBA 
+# Fomat function enhancement for VBA
 vba-format-function.diff, n#294187, Fong
 
 # the following patches are part of cws-pflin10
@@ -1653,7 +1657,7 @@
 
 [ CalcFixes ]
 
-# Support several different formula syntax, and add a formula syntax 
+# Support several different formula syntax, and add a formula syntax
 # configuration option in the Options page.
 sc-formula-syntax-core.diff, n#358558, kohei
 sc-formula-syntax-ui.diff, n#358558, kohei
@@ -1664,11 +1668,11 @@
 # Toggle gridline display per sheet.
 sc-sheet-gridline-toggle.diff, i#14893, kohei
 
-# Skip overlapped cells (cells that are hidden under a merged cell) when 
+# Skip overlapped cells (cells that are hidden under a merged cell) when
 # navigating through cells.
 sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
 
-# Make sure that the colors between the tabs of selected and unselected 
+# Make sure that the colors between the tabs of selected and unselected
 # sheets can be distinguished.
 svtools-adjust-sheet-tabcolor.diff, n#386029, kohei
 
@@ -2190,7 +2194,7 @@
 ;extensions_packinfo.diff
 ;extensions_shellscripts.diff
 ;extensions_deliver.diff
- 
+
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips
 i27928-extended-tips-on.diff
@@ -2275,7 +2279,7 @@
 
 [ NovellOnly ]
 #only enable enhanced field work in Novell OOo by default
-officecfg-field-patch.diff, flr, n#248354 
+officecfg-field-patch.diff, flr, n#248354
 
 
 [ Fixes ]

Added: trunk/patches/dev300/sw-html-export-font.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-html-export-font.diff	Wed May 21 12:19:16 2008
@@ -0,0 +1,20 @@
+--- sw/source/filter/html/css1atr.cxx.orig	2008-05-16 10:10:24.000000000 +0200
++++ sw/source/filter/html/css1atr.cxx	2008-05-16 10:28:16.000000000 +0200
+@@ -2939,7 +2939,7 @@
+ 	case WEIGHT_ULTRALIGHT:	pStr = sCSS1_PV_extra_light; 	break;
+ 	case WEIGHT_LIGHT:		pStr = sCSS1_PV_light; 			break;
+ 	case WEIGHT_SEMILIGHT:	pStr = sCSS1_PV_demi_light; 	break;
+-	case WEIGHT_NORMAL:		pStr = sCSS1_PV_medium;			break;
++	case WEIGHT_NORMAL:		pStr = sCSS1_PV_normal;			break;
+ 	case WEIGHT_SEMIBOLD:	pStr = sCSS1_PV_demi_bold; 		break;
+ 	case WEIGHT_BOLD:
+ 		if( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) )
+@@ -2953,7 +2953,7 @@
+ 		break;
+ 	case WEIGHT_ULTRABOLD:	pStr = sCSS1_PV_extra_bold;		break;
+ 	default:
+-		;
++		pStr = sCSS1_PV_normal;
+ 	}
+ 
+ 	if( pStr )