You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/01/05 20:13:24 UTC
svn commit: r1227772 [2/2] - in /incubator/ooo/branches/alg/linecap/main:
basegfx/inc/basegfx/polygon/ basegfx/source/polygon/ canvas/source/vcl/
cppcanvas/source/mtfrenderer/ cui/source/inc/ cui/source/tabpages/
drawinglayer/inc/drawinglayer/attribute...
Modified: incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.cxx?rev=1227772&r1=1227771&r2=1227772&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.cxx Thu Jan 5 19:13:22 2012
@@ -28,6 +28,7 @@
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
#include <com/sun/star/presentation/FadeEffect.hpp>
@@ -111,6 +112,7 @@ const XMLPropertyMapEntry aXMLSDProperti
GMAP( "LineEndCenter", XML_NAMESPACE_DRAW, XML_MARKER_END_CENTER, XML_TYPE_BOOL, 0 ),
GMAP( "LineTransparence", XML_NAMESPACE_SVG, XML_STROKE_OPACITY, XML_SD_TYPE_OPACITY, 0 ),
GMAP( "LineJoint", XML_NAMESPACE_DRAW, XML_STROKE_LINEJOIN, XML_SD_TYPE_LINEJOIN, 0 ),
+ GMAP( "LineCap", XML_NAMESPACE_SVG , XML_STROKE_LINECAP, XML_SD_TYPE_LINECAP, 0 ),
// fill attributes
GMAP( "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SD_TYPE_FILLSTYLE, 0 ),
@@ -392,6 +394,14 @@ SvXMLEnumMapEntry aXML_LineJoint_EnumMap
{ XML_TOKEN_INVALID, 0 }
};
+SvXMLEnumMapEntry aXML_LineCap_EnumMap[] =
+{
+ { XML_BUTT, drawing::LineCap_BUTT },
+ { XML_ROUND, drawing::LineCap_ROUND },
+ { XML_GRADIENTSTYLE_SQUARE, drawing::LineCap_SQUARE }, // use XML_GRADIENTSTYLE_SQUARE as XML_SQUARE, is defined as "square" already
+ { XML_TOKEN_INVALID, 0 }
+};
+
SvXMLEnumMapEntry aXML_FillStyle_EnumMap[] =
{
{ XML_NONE, drawing::FillStyle_NONE },
@@ -887,6 +897,11 @@ const XMLPropertyHandler* XMLSdPropHdlFa
pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, ::getCppuType((const drawing::LineJoint*)0) );
break;
}
+ case XML_SD_TYPE_LINECAP :
+ {
+ pHdl = new XMLEnumPropertyHdl( aXML_LineCap_EnumMap, ::getCppuType((const drawing::LineCap*)0) );
+ break;
+ }
case XML_SD_TYPE_FILLSTYLE :
{
pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const drawing::FillStyle*)0) );
Modified: incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.hxx?rev=1227772&r1=1227771&r2=1227772&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.hxx (original)
+++ incubator/ooo/branches/alg/linecap/main/xmloff/source/draw/sdpropls.hxx Thu Jan 5 19:13:22 2012
@@ -83,6 +83,7 @@ extern const XMLPropertyMapEntry aXMLSDP
#define XML_SD_TYPE_CONTROL_BORDER (XML_SD_TYPES_START + 32 )
#define XML_SD_TYPE_CONTROL_BORDER_COLOR (XML_SD_TYPES_START + 33 )
#define XML_SD_TYPE_IMAGE_SCALE_MODE (XML_SD_TYPES_START + 34 )
+#define XML_SD_TYPE_LINECAP (XML_SD_TYPES_START + 35 )
// 3D property types
#define XML_SD_TYPE_BACKFACE_CULLING (XML_SD_TYPES_START + 40 )