← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plugins/textediting/autocorrection/AutocorrectConfigDialog.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/textediting/autocorrection/AutocorrectConfigDialog.cpp
342
342
{
343
343
    int currentRow = widget.abbreviationList->currentRow();
344
344
    QListWidgetItem *item = widget.abbreviationList->takeItem(currentRow);
345
 
    Q_ASSERT(item);
 
345
    if(!item)
 
346
        return;
346
347
    m_upperCaseExceptions.remove(item->text());
347
348
    delete item;
348
349
}
361
362
{
362
363
    int currentRow = widget.twoUpperLetterList->currentRow();
363
364
    QListWidgetItem *item = widget.twoUpperLetterList->takeItem(currentRow);
364
 
    Q_ASSERT(item);
 
365
    if(!item)
 
366
        return;
365
367
    m_twoUpperLetterExceptions.remove(item->text());
366
368
    delete item;
367
369
}