← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/checkDocument.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/checkDocument.cpp
197
197
{
198
198
        if (itemMap.contains(ite))
199
199
        {
 
200
                // #10537 Check item has not been destroyed before requesting its selection
 
201
                if (itemMap[ite].isNull())
 
202
                        return;
200
203
                ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
201
 
                emit selectElement(m_Doc->DocItems.at(itemMap[ite])->OwnPage, itemMap[ite]);
 
204
                emit selectElement(itemMap[ite]->OwnPage, itemMap[ite]->ItemNr);
202
205
                return;
203
206
        }
204
207
        if (pageMap.contains(ite))
205
208
        {
 
209
                // #10537 Get page index from pointer in case user has deleted a page
 
210
                // after preflight has been run
 
211
                int pageIndex = m_Doc->DocPages.indexOf(pageMap[ite]);
 
212
                if (pageIndex < 0)
 
213
                        return;
206
214
                ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
207
 
                emit selectPage(pageMap[ite]);
 
215
                emit selectPage(pageIndex);
208
216
                return;
209
217
        }
210
218
        if (masterPageMap.contains(ite))
211
219
        {
212
 
                emit selectMasterPage(masterPageMap[ite]);
 
220
                // #10537 Get page index from pointer in case user has deleted a page
 
221
                // after preflight has been run
 
222
                int pageIndex = m_Doc->MasterPages.indexOf(masterPageMap[ite]);
 
223
                if (pageIndex < 0)
 
224
                        return;
 
225
                emit selectMasterPage(masterPageMap[ite]->pageName());
213
226
                return;
214
227
        }
215
228
        if (masterPageItemMap.contains(ite))
216
229
        {
 
230
                // #10537 Check item has not been destroyed before requesting its selection
 
231
                if (masterPageItemMap[ite].isNull())
 
232
                        return;
217
233
                if (!m_Doc->masterPageMode())
218
 
                        emit selectMasterPage(m_Doc->MasterItems.at(masterPageItemMap[ite])->OnMasterPage);
219
 
                emit selectElement(-1, masterPageItemMap[ite]);
 
234
                        emit selectMasterPage(masterPageItemMap[ite]->OnMasterPage);
 
235
                emit selectElement(-1, masterPageItemMap[ite]->ItemNr);
220
236
                return;
221
237
        }
222
238
}
454
470
                        hasError = false;
455
471
                        pageGraveError = false;
456
472
                        QTreeWidgetItem * page = new QTreeWidgetItem( masterPageRootItem);//, pagep );
457
 
                        masterPageMap.insert(page, doc->MasterPages.at(mPage)->pageName());
 
473
                        masterPageMap.insert(page, doc->MasterPages.at(mPage));
458
474
//                      pagep = page;
459
475
                        QMap<int, errorCodes>::Iterator masterItemErrorsIt;
460
476
                        for (masterItemErrorsIt = doc->masterItemErrors.begin();
466
482
                                {
467
483
                                        hasError = true;
468
484
                                        QTreeWidgetItem * object = new QTreeWidgetItem( page);
469
 
                                        masterPageItemMap.insert(object, doc->MasterItems.at(masterItemErrorsIt.key())->ItemNr);
 
485
                                        masterPageItemMap.insert(object, doc->MasterItems.at(masterItemErrorsIt.key()));
470
486
                                        object->setText(COLUMN_ITEM, doc->MasterItems.at(masterItemErrorsIt.key())->itemName());
471
487
                                        errorCodes::Iterator it3;
472
488
                                        if (masterItemErrorsIt.value().count() == 1)
483
499
                                                }
484
500
                                                object->setExpanded( true );
485
501
                                        }
486
 
                                        if (itemError)
487
 
                                                object->setIcon(COLUMN_ITEM, graveError );
488
 
                                        else
489
 
                                                object->setIcon(COLUMN_ITEM, onlyWarning );
 
502
                                        object->setIcon(COLUMN_ITEM, itemError ? graveError : onlyWarning);
490
503
                                }
491
504
                        }
492
505
                        if (hasError)
493
506
                        {
494
507
                                ++mpErrorCount;
495
 
                                if (pageGraveError)
496
 
                                        page->setIcon(COLUMN_ITEM, graveError );
497
 
                                else
498
 
                                        page->setIcon(COLUMN_ITEM, onlyWarning );
 
508
                                page->setIcon(COLUMN_ITEM, pageGraveError ? graveError : onlyWarning);
499
509
                                page->setExpanded( true );
500
510
                        }
501
511
                        else
513
523
                        hasError = false;
514
524
                        pageGraveError = false;
515
525
                        QTreeWidgetItem * page = new QTreeWidgetItem( reportDisplay);//, pagep );
516
 
                        pageMap.insert(page, aPage);
 
526
                        pageMap.insert(page, doc->DocPages.at(aPage));
517
527
//                      pagep = page;
518
528
                        QMap<int, errorCodes>::Iterator docItemErrorsIt;
519
529
                        for (docItemErrorsIt = doc->docItemErrors.begin();
526
536
                                        itemError = false;
527
537
                                        QTreeWidgetItem * object = new QTreeWidgetItem(page);
528
538
                                        object->setText(COLUMN_ITEM, doc->DocItems.at(docItemErrorsIt.key())->itemName());
529
 
                                        itemMap.insert(object, doc->DocItems.at(docItemErrorsIt.key())->ItemNr);
 
539
                                        itemMap.insert(object, doc->DocItems.at(docItemErrorsIt.key()));
530
540
                                        errorCodes::Iterator it3;
531
541
                                        if (docItemErrorsIt.value().count() == 1)
532
542
                                        {
542
552
                                                }
543
553
                                                object->setExpanded( true );
544
554
                                        }
545
 
                                        if (itemError)
546
 
                                                object->setIcon(COLUMN_ITEM, graveError );
547
 
                                        else
548
 
                                                object->setIcon(COLUMN_ITEM, onlyWarning );
 
555
                                        object->setIcon(COLUMN_ITEM, itemError ? graveError : onlyWarning);
549
556
                                }
550
557
                        }
551
558
                        if (hasError)
552
559
                        {
553
 
                                if (pageGraveError)
554
 
                                        page->setIcon(COLUMN_ITEM, graveError );
555
 
                                else
556
 
                                        page->setIcon(COLUMN_ITEM, onlyWarning );
 
560
                                page->setIcon(COLUMN_ITEM, itemError ? graveError : onlyWarning);
557
561
                                page->setExpanded( true );
558
562
                        }
559
563
                        else
590
594
                                        hasError = true;
591
595
                                        QTreeWidgetItem * object = new QTreeWidgetItem(freeItem);
592
596
                                        object->setText(0, doc->DocItems.at(freeItemsErrorsIt.key())->itemName());
593
 
                                        itemMap.insert(object, doc->DocItems.at(freeItemsErrorsIt.key())->ItemNr);
 
597
                                        itemMap.insert(object, doc->DocItems.at(freeItemsErrorsIt.key()));
594
598
                                        errorCodes::Iterator it3;
595
599
                                        if (freeItemsErrorsIt.value().count() == 1)
596
600
                                        {
606
610
                                                }
607
611
                                                object->setExpanded( true );
608
612
                                        }
609
 
                                        if (pageGraveError)
610
 
                                                object->setIcon(COLUMN_ITEM, graveError );
611
 
                                        else
612
 
                                                object->setIcon(COLUMN_ITEM, onlyWarning );
 
613
                                        object->setIcon(COLUMN_ITEM, pageGraveError ? graveError : onlyWarning);
613
614
                                }
614
615
                        }
615
616
                        if (hasError)
616
617
                        {
617
 
                                if (pageGraveError)
618
 
                                        freeItem->setIcon(COLUMN_ITEM, graveError );
619
 
                                else
620
 
                                        freeItem->setIcon(COLUMN_ITEM, onlyWarning );
 
618
                                freeItem->setIcon(COLUMN_ITEM, pageGraveError ? graveError : onlyWarning );
621
619
                                freeItem->setExpanded( true );
622
620
                        }
623
621
                        else