diff options
| author | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-11-17 10:31:35 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-11-17 10:31:35 +0000 |
| commit | fed7beb3ceaa2321040d2757788e27f429f61854 (patch) | |
| tree | 0d78307a747f1b4e5191e66217c77ba7da72108a /src | |
| parent | Fix a bug pointed by suv when the title of a symbol has duplicates (diff) | |
| download | inkscape-fed7beb3ceaa2321040d2757788e27f429f61854.tar.gz inkscape-fed7beb3ceaa2321040d2757788e27f429f61854.zip | |
Code simplification
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/symbols.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 609edee2e..fda1825da 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -887,25 +887,11 @@ void SymbolsDialog::symbolsInDocRecursive (SPObject *r, std::map<Glib::ustring, } if ( dynamic_cast<SPSymbol *>(r)) { + Glib::ustring id = r->getAttribute("id"); if(r->title()) { - Glib::ustring current = symbol_set->get_active_text(); - if (current == ALLDOCS) { - if (l.count(doc_title + r->title()) > 0) { - l[doc_title + r->title() + Glib::ustring("_") + r->getId()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); - } else { - l[doc_title + r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); - } - } else { - if (l.count(r->title()) > 0) { - l[r->title() + Glib::ustring("_") + r->getId()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); - } else { - l[r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); - } - - } + l[doc_title + r->title() + id] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); } else { - Glib::ustring id = r->getAttribute("id"); - l[Glib::ustring(_("Symbol without title ")) + id] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); + l[Glib::ustring(_("notitle_")) + id] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r)); } } for (auto& child: r->children) { |