allow multiple style tags

2 files changed, 1 insertions, 46 deletions

diff --git a/src/ui/dialog/selectorsdialog.cpp b/src/ui/dialog/selectorsdialog.cpp
index 806ce61c2..dfa3f3aeb 100644
--- a/src/ui/dialog/selectorsdialog.cpp
+++ b/src/ui/dialog/selectorsdialog.cpp
@@ -526,25 +526,6 @@ Inkscape::XML::Node *SelectorsDialog::_getStyleTextNode()
 }
 
 /**
- * Ditto for update stylesheets.
- */
-void SelectorsDialog::_updateStyleSheets()
-{
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    document->setStyleSheet(nullptr);
-    Inkscape::XML::Node *root = document->getReprRoot();
-    for (unsigned i = 0; i < root->childCount(); --i) {
-        gchar const * name =  root->nthChild(i)->name();
-        if (name && strcmp(name,"svg:style") == 0) {
-            SPStyleElem *styleelem = dynamic_cast<SPStyleElem *>(document->getObjectByRepr(root->nthChild(i)));
-            styleelem->read_content();
-        }
-    }
-    document->getRoot()->emitModified( SP_OBJECT_MODIFIED_CASCADE );
-}
-
-
-/**
  * Fill the Gtk::TreeStore from the svg:style element.
  */
 void SelectorsDialog::_readStyleElement()
@@ -712,7 +693,7 @@ void SelectorsDialog::_writeStyleElement()
     // harm in keeping it around ...
     Inkscape::XML::Node *textNode = _getStyleTextNode();
     textNode->setContent(styleContent.c_str());
-    _updateStyleSheets();
+    INKSCAPE.readStyleSheets();
     DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_SELECTORS, _("Edited style element."));
 
     _updating = false;
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index d89114ca5..2b95d0fc3 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -308,23 +308,6 @@ Inkscape::XML::Node *StyleDialog::_getStyleTextNode()
     return textNode;
 }
 
-/**
- * Ditto for update stylesheets.
- */
-void StyleDialog::_updateStyleSheets()
-{
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    document->setStyleSheet(nullptr);
-    Inkscape::XML::Node *root = document->getReprRoot();
-    for (unsigned i = 0; i < root->childCount(); --i) {
-        gchar const * name =  root->nthChild(i)->name();
-        if (name && strcmp(name,"svg:style") == 0) {
-            SPStyleElem *styleelem = dynamic_cast<SPStyleElem *>(document->getObjectByRepr(root->nthChild(i)));
-            styleelem->read_content();
-        }
-    }
-    document->getRoot()->emitModified( SP_OBJECT_MODIFIED_CASCADE );
-}
 
 Glib::RefPtr<Gtk::TreeModel> StyleDialog::_selectTree(Glib::ustring selector)
 {
@@ -1017,16 +1000,7 @@ void StyleDialog::_writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::u
         std::string result;
         std::regex_replace(std::back_inserter(result), content.begin(), content.end(), e, "$1" + styleContent + "$3");
         textNode->setContent(result.c_str());
-<<<<<<< HEAD
-        INKSCAPE.readStyleSheets(true);
-        for (auto iter : document->getObjectsBySelector(selector)) {
-=======
         _updateStyleSheets();
-        /* for (auto iter : document->getObjectsBySelector(selector)) {
->>>>>>> Add initial commit
-            iter->style->readFromObject(iter);
-            iter->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
-        } */
     }
     _updating = false;
     _readStyleElement();