diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/object/sp-style-elem.cpp | 34 | ||||
| -rw-r--r-- | src/object/sp-style-elem.h | 5 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp index de2041764..e0080e334 100644 --- a/src/object/sp-style-elem.cpp +++ b/src/object/sp-style-elem.cpp @@ -450,23 +450,6 @@ void update_style_recursively( SPObject *object ) { } } -/* - * Returns each statement as an SPStyle - */ -std::vector<SPStyle *> SPStyleElem::getStyles() { - std::vector<SPStyle *> ret; - gint count = cr_stylesheet_nr_rules(style_sheet); - - for (gint x = 0; x < count; x++) { - SPStyle *item = new SPStyle(nullptr, nullptr); - CRStatement *statement = cr_stylesheet_statement_get_from_list(style_sheet, x); - item->mergeStatement(statement); - ret.push_back(item); - } - - return ret; -} - void SPStyleElem::read_content() { // First, create the style-sheet object and track it in this @@ -505,6 +488,16 @@ void SPStyleElem::read_content() { cr_parser_destroy(parser); delete parse_tmp; + //Record each css statement as an SPStyle + gint count = cr_stylesheet_nr_rules(style_sheet); + + for (gint x = 0; x < count; x++) { + SPStyle *item = new SPStyle(nullptr, nullptr); + CRStatement *statement = cr_stylesheet_statement_get_from_list(style_sheet, x); + item->mergeStatement(statement); + styles.push_back(item); + } + // If style sheet has changed, we need to cascade the entire object tree, top down // Get root, read style, loop through children update_style_recursively( (SPObject *)document->getRoot() ); @@ -542,6 +535,13 @@ void SPStyleElem::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); } +void SPStyleElem::release() { + while(!styles.empty()) { + auto style = styles.back(); + sp_style_unref(style); + styles.pop_back(); + } +} /* diff --git a/src/object/sp-style-elem.h b/src/object/sp-style-elem.h index 76089172e..49d6e33ce 100644 --- a/src/object/sp-style-elem.h +++ b/src/object/sp-style-elem.h @@ -23,13 +23,14 @@ public: Media media; bool is_css; + std::vector<SPStyle *> styles; void build(SPDocument* doc, Inkscape::XML::Node* repr) override; void set(SPAttributeEnum key, char const* value) override; void read_content() override; - Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; + void release() override; - std::vector<SPStyle *> getStyles(); + Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags) override; }; |
