ooo-build r11861 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Mar 10 19:05:57 2008
New Revision: 11861
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11861&view=rev

Log:
2008-03-10  Petr Mladek  <pmladek suse cz>

	* patches/src680/warning-string-comparsion-sw.diff,
	  patches/src680/apply: warning: comparison with string literal
	  results in unspecified results, i#86880

	* patches/src680/shell-senddoc-sylpheed-filenames.diff,
	  patches/src680/apply:  allow to send documents with a space in
	  the name via sylpheed-claws, n#362773, i#86887
	* patches/src680/shell-senddoc-support-groupwise.diff,
	  patches/src680/apply: support the groupwise mail client, n#368044,
	  i#86886



Added:
   trunk/patches/src680/shell-senddoc-support-groupwise.diff
   trunk/patches/src680/shell-senddoc-sylpheed-filenames.diff
   trunk/patches/src680/warning-string-comparsion-sw.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Mar 10 19:05:57 2008
@@ -399,6 +399,12 @@
 # berkeley db exception handling
 desktop-db-exception-visibility.diff, i#86268
 
+# support the groupwise mail client
+shell-senddoc-support-groupwise.diff, n#368044, i#86886, pmladek
+
+# allow to send documents with a space in the name via sylpheed-claws
+shell-senddoc-sylpheed-filenames.diff, n#362773, i#86887, pmladek
+
 [ Fixes < ooh680-m4 ]
 # default formatting PPT export bug n#285959
 sd-default-format-n285959.diff, i#81395, n#285959, hub
@@ -1187,6 +1193,9 @@
 # fixes warnings about that a variable is used unitialized
 warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
 
+# warning: comparison with string literal results in unspecified results
+warning-string-comparsion-sw.diff, i#86880, pmladek
+
 #fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
 stlport-solaris-fileno.diff, fridrich
 

Added: trunk/patches/src680/shell-senddoc-support-groupwise.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/shell-senddoc-support-groupwise.diff	Mon Mar 10 19:05:57 2008
@@ -0,0 +1,20 @@
+--- shell/source/unix/misc/senddoc.sh.old	2008-03-06 22:51:57.000000000 +0100
++++ shell/source/unix/misc/senddoc.sh	2008-03-10 11:57:18.000000000 +0100
+@@ -243,7 +243,7 @@ case `basename "$MAILER" | sed 's/-.*$//
+ 		rm -f $BODY
+ 		;;
+ 		
+-	evolution)
++	evolution | groupwise)
+ 	
+ 		while [ "$1" != "" ]; do
+ 			case $1 in
+@@ -272,7 +272,7 @@ case `basename "$MAILER" | sed 's/-.*$//
+ 					shift
+ 					;;
+ 				--attach)
+-					MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" | ${URI_ENCODE}`
++					MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "file://$2" | ${URI_ENCODE}`
+ 					shift
+ 					;;
+ 				*)

Added: trunk/patches/src680/shell-senddoc-sylpheed-filenames.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/shell-senddoc-sylpheed-filenames.diff	Mon Mar 10 19:05:57 2008
@@ -0,0 +1,20 @@
+--- shell/source/unix/misc/senddoc.sh.old	2008-03-06 22:51:57.000000000 +0100
++++ shell/source/unix/misc/senddoc.sh	2008-03-10 11:57:18.000000000 +0100
+@@ -315,7 +315,7 @@ case `basename "$MAILER" | sed 's/-.*$//
+ 					shift
+ 					;;
+ 				--attach)
+-					ATTACH="${ATTACH:-}${ATTACH:+ } $2"
++					ATTACH="${ATTACH:-}${ATTACH:+ }$2"
+ 					shift
+ 					;;
+ 				*)
+@@ -324,7 +324,7 @@ case `basename "$MAILER" | sed 's/-.*$//
+ 			shift;
+ 		done
+ 		 
+-		 ${MAILER} ${TO:+--compose} ${TO:-} ${ATTACH:+--attach} ${ATTACH:-}
++		 ${MAILER} ${TO:+--compose} "${TO:-}" ${ATTACH:+--attach} "${ATTACH:-}"
+ 		;;
+ 
+ 	Mail | Thunderbird | *.app )

Added: trunk/patches/src680/warning-string-comparsion-sw.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/warning-string-comparsion-sw.diff	Mon Mar 10 19:05:57 2008
@@ -0,0 +1,80 @@
+--- sw/source/filter/html/htmlforw.cxx.old	2007-09-27 11:48:34.000000000 +0200
++++ sw/source/filter/html/htmlforw.cxx	2008-03-07 13:29:49.000000000 +0100
+@@ -1088,7 +1088,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+ 
+     sOut += sOptions;
+ 
+-    if( sHTML_IT_image == pType )
++    if( !strcmp( sHTML_IT_image, pType ) )
+     {
+         aTmp = xPropSet->getPropertyValue(
+                     OUString::createFromAscii( "ImageURL" ) );
+@@ -1153,7 +1153,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+     {
+         // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen,
+         // das entsprechende Flag loeschen.
+-        nFrmOpts |= (sHTML_IT_image == pType
++        nFrmOpts |= ( !strcmp ( sHTML_IT_image, pType )
+                             ? HTML_FRMOPTS_IMG_CONTROL_CSS1
+                             : HTML_FRMOPTS_CONTROL_CSS1);
+     }
+@@ -1163,8 +1163,9 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+ 
+     if( rHTMLWrt.bCfgOutStyles )
+     {
+-        sal_Bool bEdit = sHTML_textarea == pTag || sHTML_IT_file == pType ||
+-                     sHTML_IT_text == pType;
++        sal_Bool bEdit = !strcmp ( sHTML_textarea, pTag ) || 
++			 !strcmp ( sHTML_IT_file, pType ) ||
++			 !strcmp (sHTML_IT_text, pType );
+ 
+         SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
+                              RES_CHRATR_END );
+@@ -1286,7 +1287,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+ 
+     rWrt.Strm() << '>';
+ 
+-    if( sHTML_select == pTag )
++    if( !strcmp ( sHTML_select, pTag ) )
+     {
+         aTmp = xPropSet->getPropertyValue(
+                     OUString::createFromAscii( "StringItemList" ) );
+@@ -1366,7 +1367,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+         }
+         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_select, sal_False );
+     }
+-    else if( sHTML_textarea == pTag )
++    else if( !strcmp ( sHTML_textarea, pTag ) )
+     {
+         // In TextAreas duerfen keine zusaetzlichen Spaces oder LF exportiert
+         // werden!
+@@ -1393,7 +1394,8 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
+         }
+         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_textarea, sal_False );
+     }
+-    else if( sHTML_IT_checkbox == pType || sHTML_IT_radio == pType )
++    else if( !strcmp ( sHTML_IT_checkbox, pType ) || 
++	     !strcmp ( sHTML_IT_radio, pType ) )
+     {
+         aTmp = xPropSet->getPropertyValue( OUString::createFromAscii("Label") );
+         if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+--- sw/source/filter/rtf/rtfatr.cxx.old	2007-10-22 17:12:26.000000000 +0200
++++ sw/source/filter/rtf/rtfatr.cxx	2008-03-07 13:34:55.000000000 +0100
+@@ -1615,7 +1615,7 @@ void ExportPICT(const Size &rOrig, const
+     const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry,
+     unsigned long nSize, SwRTFWriter &rWrt)
+ {
+-    bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
++    bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
+     if (pBLIPType && nSize && pGraphicAry)
+     {
+         rWrt.Strm() << '{' << sRTF_PICT;
+@@ -1760,7 +1760,7 @@ static Writer& OutRTF_SwGrfNode(Writer& 
+      the wmf format wrapped in nonshppict, so as to keep wordpad happy. If its
+      a wmf already then we don't need any such wrapping
+     */
+-    bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
++    bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
+     if (!bIsWMF)
+ 	    OutComment(rRTFWrt, sRTF_SHPPICT);
+