← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/smtextstyles.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/smtextstyles.cpp
119
119
                        tmpList << StyleName(styleName, parentName);
120
120
                }
121
121
        }
 
122
        qSort(tmpList.begin(), tmpList.end(), sortingQPairOfStrings);
122
123
 
123
124
        return tmpList;
124
125
}
291
292
 
292
293
        QMap<QString, QString> replacement;
293
294
        for (int i = 0; i < deleted_.count(); ++i)
 
295
        {
 
296
                if (deleted_[i].first == deleted_[i].second)
 
297
                        continue;
294
298
                replacement[deleted_[i].first] = deleted_[i].second;
 
299
        }
295
300
 
296
301
        doc_->redefineStyles(tmpStyles_, false);
297
302
        doc_->replaceStyles(replacement);
431
436
        QList<RemoveItem>::iterator it;
432
437
        for (it = deleted_.begin(); it != deleted_.end(); ++it)
433
438
        {
434
 
                if ((*it).second == oldName)
 
439
                if (it->second == oldName)
435
440
                {
436
441
                        oldName = (*it).first;
437
442
                        deleted_.erase(it);
439
444
                }
440
445
        }
441
446
 
442
 
        deleted_.append(RemoveItem(oldName, newName));
 
447
        if (oldName != newName)
 
448
                deleted_.append(RemoveItem(oldName, newName));
443
449
 
444
450
        if (!selectionIsDirty_)
445
451
        {
1651
1657
 
1652
1658
        QMap<QString, QString> replacement;
1653
1659
        for (int i = 0; i < deleted_.count(); ++i)
 
1660
        {
 
1661
                if (deleted_[i].first == deleted_[i].second)
 
1662
                        continue;
1654
1663
                replacement[deleted_[i].first] = deleted_[i].second;
 
1664
        }
1655
1665
 
1656
1666
        doc_->redefineCharStyles(tmpStyles_, false);
1657
1667
        doc_->replaceCharStyles(replacement);
1788
1798
        QList<RemoveItem>::iterator it;
1789
1799
        for (it = deleted_.begin(); it != deleted_.end(); ++it)
1790
1800
        {
1791
 
                if ((*it).second == oldName)
 
1801
                if (it->second == oldName)
1792
1802
                {
1793
1803
                        oldName = (*it).first;
1794
1804
                        deleted_.erase(it);
1796
1806
                }
1797
1807
        }
1798
1808
 
1799
 
        deleted_.append(RemoveItem(oldName, newName));
 
1809
        if (oldName != newName)
 
1810
                deleted_.append(RemoveItem(oldName, newName));
1800
1811
 
1801
1812
        if (!selectionIsDirty_)
1802
1813
        {