You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by li...@apache.org on 2012/08/17 11:02:54 UTC
svn commit: r1374181 -
/incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
Author: lijiany
Date: Fri Aug 17 09:02:54 2012
New Revision: 1374181
URL: http://svn.apache.org/viewvc?rev=1374181&view=rev
Log:
Fix win7 build bread issue.
Reported by: Andre
Patched by: Jianyuan Li
Modified:
incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
Modified: incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx?rev=1374181&r1=1374180&r2=1374181&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/filter/wmf/enhwmf.cxx Fri Aug 17 09:02:54 2012
@@ -1281,6 +1281,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
}
break;
case EMR_CREATEDIBPATTERNBRUSHPT :
+ {
sal_uInt32 nTmp32;
sal_uInt32 nOffset;
*pWMF >> nIndex;
@@ -1317,7 +1318,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
}
Color aColor( (sal_Char)( nRed / nCount ), (sal_Char)( nGreen / nCount ), (sal_Char)( nBlue / nCount ) );
pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( aColor, sal_False ) );
-
+ }
break;
#ifdef WIN_MTF_ASSERT
@@ -1338,7 +1339,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_ANGLEARC : WinMtfAssertHandler( "AngleArc" ); break;
case EMR_SETCOLORADJUSTMENT : WinMtfAssertHandler( "SetColorAdjustment" ); break;
case EMR_POLYDRAW16 : WinMtfAssertHandler( "PolyDraw16" ); break;
- case EMR_CREATEDIBPATTERNBRUSHPT : WinMtfAssertHandler( "CreateDibPatternBrushPt" ); break;
case EMR_POLYTEXTOUTA : WinMtfAssertHandler( "PolyTextOutA" ); break;
case EMR_POLYTEXTOUTW : WinMtfAssertHandler( "PolyTextOutW" ); break;
case EMR_CREATECOLORSPACE : WinMtfAssertHandler( "CreateColorSpace" ); break;