diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-04-26 23:27:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-04-26 23:27:03 +0000 |
| commit | cf159c3d0415a1a761eb7ca760256cd224927d3c (patch) | |
| tree | 03cfd9a7f543ec07377c96ed23b9f5b0626a6e2a /src/widgets/stroke-style.cpp | |
| parent | Redesign of the BSpline LPE widgets (diff) | |
| parent | Clean up of style code: Patch from suv: SPStyle: struct -> class (diff) | |
| download | inkscape-cf159c3d0415a1a761eb7ca760256cd224927d3c.tar.gz inkscape-cf159c3d0415a1a761eb7ca760256cd224927d3c.zip | |
update to trunk
(bzr r11950.1.336)
Diffstat (limited to 'src/widgets/stroke-style.cpp')
| -rw-r--r-- | src/widgets/stroke-style.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index a4cca9472..0e0a4fd72 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -581,7 +581,8 @@ StrokeStyle::forkMarker(SPObject *marker, int loc, SPItem *item) Glib::ustring urlId = Glib::ustring::format("url(#", marker->getRepr()->attribute("id"), ")"); unsigned int refs = 0; for (int i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) { - if (item->style->marker[i].set && !strcmp(urlId.c_str(), item->style->marker[i].value)) { + if (item->style->marker_ptrs[i]->set && + !strcmp(urlId.c_str(), item->style->marker_ptrs[i]->value)) { refs++; } } @@ -1176,11 +1177,11 @@ StrokeStyle::updateAllMarkers(GSList const *objects) combo->setDesktop(desktop); - if (object->style->marker[keyloc[i].loc].value != NULL && !all_texts) { + if (object->style->marker_ptrs[keyloc[i].loc]->value != NULL && !all_texts) { // If the object has this type of markers, // Extract the name of the marker that the object uses - SPObject *marker = getMarkerObj(object->style->marker[keyloc[i].loc].value, object->document); + SPObject *marker = getMarkerObj(object->style->marker_ptrs[keyloc[i].loc]->value, object->document); // Scroll the combobox to that marker combo->set_current(marker); |