ooo-build r14406 - in trunk: . patches/dev300 patches/lwp

[pmladek svn gnome org]

Author: pmladek
Date: Thu Oct 23 14:16:56 2008
New Revision: 14406
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14406&view=rev

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

	* patches/lwp/warning-return-values-lotuswordpro.diff:
	* patches/dev300/apply: avoid warning: control reaches end of non-void
	  function



Added:
   trunk/patches/lwp/warning-return-values-lotuswordpro.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Oct 23 14:16:56 2008
@@ -1431,6 +1431,8 @@
 cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
 cws-ooo11lotusfilter-lwp-filter.diff, Fong
 cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
+# avoid warning: control reaches end of non-void function
+warning-return-values-lotuswordpro.diff, pmladek
 
 
 [ Win32Only ]

Added: trunk/patches/lwp/warning-return-values-lotuswordpro.diff
==============================================================================
--- (empty file)
+++ trunk/patches/lwp/warning-return-values-lotuswordpro.diff	Thu Oct 23 14:16:56 2008
@@ -0,0 +1,64 @@
+--- lotuswordpro/source/filter/lwpborderstuff.cxx.old	2008-10-23 13:16:31.000000000 +0200
++++ lotuswordpro/source/filter/lwpborderstuff.cxx	2008-10-23 15:48:06.000000000 +0200
+@@ -182,6 +182,9 @@ sal_uInt16	LwpBorderStuff::GetSideType(s
+ 		return m_nBoderGroupIDBottom;
+ 		break;
+ 	}
++	// FIXME: this is needed to avoid warning: control reaches end of non-void function
++	//        a better solution would be to enum value for the parameter side
++	return 0;
+ }
+ 
+ LwpColor	LwpBorderStuff::GetSideColor(sal_uInt16 side)
+@@ -201,6 +204,9 @@ LwpColor	LwpBorderStuff::GetSideColor(sa
+ 		return m_aColorBottom;
+ 		break;
+ 	}
++	// FIXME: this is needed to avoid warning: control reaches end of non-void function
++	//        a better solution would be to enum value for the parameter side
++	return LwpColor();
+ }
+ 
+ float	LwpBorderStuff::GetSideWidth(sal_uInt16 side)
+@@ -220,6 +226,9 @@ float	LwpBorderStuff::GetSideWidth(sal_u
+ 		return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthBottom));
+ 		break;
+ 	}
++	// FIXME: this is needed to avoid warning: control reaches end of non-void function
++	//        a better solution would be to enum value for the parameter side
++	return 0;
+ }
+ 
+ void LwpBorderStuff::operator = (const LwpBorderStuff& rOther)
+--- lotuswordpro/source/filter/lwpmargins.hxx.old	2008-10-23 13:16:32.000000000 +0200
++++ lotuswordpro/source/filter/lwpmargins.hxx	2008-10-23 15:59:21.000000000 +0200
+@@ -113,5 +113,8 @@ inline double LwpMargins::GetMarginsValu
+ 		return LwpTools::ConvertFromUnitsToMetric(m_nBottom);
+ 		break;
+ 	}
++	// FIXME: this is needed to avoid warning: control reaches end of non-void function
++	//        a better solution would be to enum value for the parameter side
++	return 0;
+ }
+-#endif
+\ No newline at end of file
++#endif
+--- lotuswordpro/source/filter/xfilter/xfutil.cxx.old	2008-10-23 13:16:32.000000000 +0200
++++ lotuswordpro/source/filter/xfilter/xfutil.cxx	2008-10-23 16:02:44.000000000 +0200
+@@ -288,7 +288,7 @@ rtl::OUString	GetCrossoutName(enumXFCros
+ 		return A2OUSTR("X");
+ 		break;
+ 	}
+-	
++	return A2OUSTR("");
+ }
+ 
+ rtl::OUString	GetTransformName(enumXFTransform type)
+@@ -425,6 +425,7 @@ rtl::OUString	GetFrameXRel(enumXFFrameXR
+ 		return A2OUSTR("frame-start-margin");
+ 		break;
+ 	}
++	return A2OUSTR("");
+ }
+ 
+ rtl::OUString	GetFrameYPos(enumXFFrameYPos pos)