oox/source/drawingml/color.cxx | 1 - 1 file changed, 1 deletion(-) New commits: commit a54e0780897a8e8a8ca3ae2ba00118bd6debaf9c Author: Matúš Kukan <matus.ku...@collabora.com> Date: Fri Oct 3 16:56:32 2014 +0200
Remove OSL_ASSERT which could fail for allowed XLS_TOKEN(tint) Change-Id: I6e0cc345f6903128ffebe5fb56f6e198ee32da9a diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 05cc58d..e6f3bf1 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -461,7 +461,6 @@ sal_Int32 Color::getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr { for( TransformVec::const_iterator aIt = maTransforms.begin(), aEnd = maTransforms.end(); aIt != aEnd; ++aIt ) { - OSL_ASSERT((aIt->mnToken & sal_Int32(0xFFFF0000))==0); switch( aIt->mnToken ) { case XML_red: toCrgb(); lclSetValue( mnC1, aIt->mnValue ); break;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits