diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-23 21:24:31 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-08 21:04:16 +0000 |
| commit | 8a512e144c249051e0c3ef9d7da3259840478752 (patch) | |
| tree | 5d04fddf86aa1089bfad4ae5c9d1cf81b4596e47 /src | |
| parent | comment alternate colors (diff) | |
| download | inkscape-8a512e144c249051e0c3ef9d7da3259840478752.tar.gz inkscape-8a512e144c249051e0c3ef9d7da3259840478752.zip | |
finish rebase from master
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape.h | 1 | ||||
| -rw-r--r-- | src/live_effects/lpe-measure-segments.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/selectorsdialog.h | 1 | ||||
| -rw-r--r-- | src/ui/dialog/styledialog.h | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/inkscape.h b/src/inkscape.h index ab6b65eac..897f9e296 100644 --- a/src/inkscape.h +++ b/src/inkscape.h @@ -124,7 +124,6 @@ public: void switch_desktops_prev (); void get_all_desktops (std::list< SPDesktop* >& listbuf); void reactivate_desktop (SPDesktop * desktop); - void readStyleSheets(bool forceupd = false); SPDesktop * find_desktop_by_dkey (unsigned int dkey); unsigned int maximum_dkey(); SPDesktop * next_desktop (); diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp index 07ea6a707..27f5ce4bb 100644 --- a/src/live_effects/lpe-measure-segments.cpp +++ b/src/live_effects/lpe-measure-segments.cpp @@ -682,12 +682,11 @@ LPEMeasureSegments::doOnApply(SPLPEItem const* lpeitem) // Style element not found, create one styleNode = SP_ACTIVE_DOCUMENT->getReprDoc()->createElement("svg:style"); textNode = SP_ACTIVE_DOCUMENT->getReprDoc()->createTextNode(""); + root->addChild(styleNode, nullptr); + Inkscape::GC::release(styleNode); styleNode->appendChild(textNode); Inkscape::GC::release(textNode); - - root->addChild(styleNode, nullptr); - Inkscape::GC::release(styleNode); } Glib::ustring styleContent = Glib::ustring(textNode->content()); if (styleContent.find(".measure-arrows\n{\n") == -1) { diff --git a/src/ui/dialog/selectorsdialog.h b/src/ui/dialog/selectorsdialog.h index c12772e5a..6830a0124 100644 --- a/src/ui/dialog/selectorsdialog.h +++ b/src/ui/dialog/selectorsdialog.h @@ -130,7 +130,6 @@ class SelectorsDialog : public Widget::Panel { StyleDialog *_style_dialog; // Reading and writing the style element. Inkscape::XML::Node *_getStyleTextNode(); - void _updateStyleSheets(); void _readStyleElement(); void _writeStyleElement(); diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h index 22d85620c..90b9d298f 100644 --- a/src/ui/dialog/styledialog.h +++ b/src/ui/dialog/styledialog.h @@ -123,7 +123,6 @@ class StyleDialog : public Widget::Panel { // Reading and writing the style element. Inkscape::XML::Node *_getStyleTextNode(); - void _updateStyleSheets(); void _readStyleElement(); Glib::RefPtr<Gtk::TreeModel> _selectTree(Glib::ustring selector); void _writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::ustring selector); |