← Back to branch summary

~ubuntu-branches/debian/sid/scribus/sid

« back to all changes in this revision

Viewing changes to scribus/smlinestyle.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/smlinestyle.cpp
227
227
        doc_->MLineStyles = tmpLines;
228
228
        QMap<QString, QString> replacement;
229
229
        for (int i = 0; i < deleted_.count(); ++i)
 
230
        {
 
231
                if (deleted_[i].first == deleted_[i].second)
 
232
                        continue;
230
233
                replacement[deleted_[i].first] = deleted_[i].second;
 
234
        }
231
235
 
232
236
        deleted_.clear();
233
237
 
347
351
        QList<RemoveItem>::iterator it;
348
352
        for (it = deleted_.begin(); it != deleted_.end(); ++it)
349
353
        {
350
 
                if ((*it).second == oldName)
 
354
                if (it->second == oldName)
351
355
                {
352
356
                        oldName = (*it).first;
353
357
                        deleted_.erase(it);
355
359
                }
356
360
        }
357
361
 
358
 
        deleted_.append(RemoveItem(oldName, newName));
 
362
        if (oldName != newName)
 
363
                deleted_.append(RemoveItem(oldName, newName));
359
364
}
360
365
 
361
366
void SMLineStyle::changeEvent(QEvent *e)