summaryrefslogtreecommitdiffstats
path: root/src/text-chemistry.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-04-26 23:12:03 +0000
committerMarc Jeanmougin <mc@M0nst3r.bouyguesbox.fr>2015-04-26 23:12:03 +0000
commit60bdd590969d1c32c392a8fed15f4ceac4a678d2 (patch)
tree87b14c9b5238e99cb319ff9245caa37b8b1d3c6a /src/text-chemistry.cpp
parentfix (diff)
downloadinkscape-60bdd590969d1c32c392a8fed15f4ceac4a678d2.tar.gz
inkscape-60bdd590969d1c32c392a8fed15f4ceac4a678d2.zip
Just reread the entire diff against trunk. Given the diff size, i must have forgotten things, but hopefully, there are only very few changes of semantics:
->childList is now in the intuitive order (childList()[0] is now firstChild) -> sp_selection_paste_impl is now in the opposite order (change is local to selection-chemistry.cpp, and simplify a few things) -> selection.setReprList now takes the list in the opposite order. It was always the case (the list was always reversed before handing to it) -> a few comparison functions now work "the c++ way": the C way was to return -1 if a<b, 0 if a==b and 1 if a>b, now they return (bool)(a<b) (bzr r13922.1.15)
Diffstat (limited to 'src/text-chemistry.cpp')
-rw-r--r--src/text-chemistry.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index 5d57ac020..9fc862ad2 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -396,7 +396,7 @@ text_unflow ()
GSList *old_objs = NULL;
std::vector<SPItem*> items = selection->itemList();
- for(std::vector<SPItem*>::const_reverse_iterator i=items.rbegin();i!=items.rend();i++){
+ for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
if (!SP_IS_FLOWTEXT(*i)) {
continue;
@@ -452,6 +452,7 @@ text_unflow ()
}
selection->clear();
+ reverse(new_objs.begin(),new_objs.end());
selection->setList(new_objs);
for (GSList *i = old_objs; i; i = i->next) {
SP_OBJECT(i->data)->deleteObject (true);