diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:53:13 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 19:02:03 -0600 |
| commit | a918e60386f3e2d36012c1cb2842e561455ecf3f (patch) | |
| tree | 5ea2bc6533aa18dfa753c58bc0a5fee120eb450d /cppcanvas/source/inc | |
| parent | e7bbed8e319ced003e9a29e9388ae91e9987e293 (diff) | |
mis-merge: clean-up remaining tools types
Diffstat (limited to 'cppcanvas/source/inc')
| -rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index f219af2ef420..d021ad8a4492 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -266,7 +266,7 @@ static float GetSwapFloat( SvStream& rSt ) ActionVector::const_iterator& o_rRangeBegin, ActionVector::const_iterator& o_rRangeEnd ) const; - void processObjectRecord(SvMemoryStream& rObjectStream, UINT16 flags); + void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags); void processEMFPlus( MetaCommentAction* pAct, const ActionFactoryParameters& rFactoryParms, OutDevState& rState, const CanvasSharedPtr& rCanvas ); void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor); @@ -293,7 +293,7 @@ static float GetSwapFloat( SvStream& rSt ) sal_Int32 nMmY; /* multipart object data */ bool mbMultipart; - UINT16 mMFlags; + sal_uInt16 mMFlags; SvMemoryStream mMStream; }; |