summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-shape.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-16 16:45:03 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-16 16:45:03 +0000
commit61f4ad6f7569805e50488d4af92756b310c51246 (patch)
tree45f8df080a1b5e63a856e6fd3a99a468fd3b9f1c /src/display/drawing-shape.cpp
parentDebugging routines to print out XML, SP Object, and Display Item trees. (diff)
downloadinkscape-61f4ad6f7569805e50488d4af92756b310c51246.tar.gz
inkscape-61f4ad6f7569805e50488d4af92756b310c51246.zip
Code rearrangement to make it clearer what is happening.
(bzr r13803)
Diffstat (limited to 'src/display/drawing-shape.cpp')
-rw-r--r--src/display/drawing-shape.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 66160638f..5bdc7a323 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -34,15 +34,12 @@ namespace Inkscape {
DrawingShape::DrawingShape(Drawing &drawing)
: DrawingItem(drawing)
, _curve(NULL)
- , _style(NULL)
, _last_pick(NULL)
, _repick_after(0)
{}
DrawingShape::~DrawingShape()
{
- if (_style)
- sp_style_unref(_style);
if (_curve)
_curve->unref();
}
@@ -67,8 +64,8 @@ DrawingShape::setPath(SPCurve *curve)
void
DrawingShape::setStyle(SPStyle *style)
{
- _setStyleCommon(_style, style);
_nrstyle.set(style);
+ DrawingItem::setStyle(style);
}
unsigned