diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-02-06 19:28:35 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-02-06 19:28:35 +0000 |
| commit | 837c1a0ef4f2e0eb5000b4b993fd0b40d0a531db (patch) | |
| tree | 39e362648e2e9cc633e5ea81c8786fda9a256143 /src | |
| parent | Added new base class to handle viewBox and preserveAspectRatio. (diff) | |
| download | inkscape-837c1a0ef4f2e0eb5000b4b993fd0b40d0a531db.tar.gz inkscape-837c1a0ef4f2e0eb5000b4b993fd0b40d0a531db.zip | |
Markers are never shown directly, even if outside of <defs> section.
(bzr r13003)
Diffstat (limited to 'src')
| -rw-r--r-- | src/marker.cpp | 10 | ||||
| -rw-r--r-- | src/marker.h | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/marker.cpp b/src/marker.cpp index f6e55b3ec..900f8a2ca 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -283,8 +283,12 @@ Inkscape::XML::Node* SPMarker::write(Inkscape::XML::Document *xml_doc, Inkscape: } Inkscape::DrawingItem* SPMarker::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { - // CPPIFY: correct? - return SPGroup::show(drawing, key, flags); + // Markers in tree are never shown directly even if outside of <defs>. + return 0; +} + +Inkscape::DrawingItem* SPMarker::private_show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) { + return SPGroup::show(drawing, key, flags); } void SPMarker::hide(unsigned int key) { @@ -364,7 +368,7 @@ sp_marker_show_instance ( SPMarker *marker, Inkscape::DrawingItem *parent, } if (!v->items[pos]) { /* Parent class ::show method */ - v->items[pos] = marker->show(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); + v->items[pos] = marker->private_show(parent->drawing(), key, SP_ITEM_REFERENCE_FLAGS); if (v->items[pos]) { /* fixme: Position (Lauris) */ diff --git a/src/marker.h b/src/marker.h index d41df69b4..21ad63a41 100644 --- a/src/marker.h +++ b/src/marker.h @@ -65,6 +65,7 @@ public: virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags); virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); + virtual Inkscape::DrawingItem* private_show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); virtual void hide(unsigned int key); virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; |