mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mis-merge: clean-up remaining tools types

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-03-12 18:53:13 -06:00
parent e7bbed8e31
commit a918e60386
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -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;
};