From kde-commits Mon Aug 03 19:45:55 2009 From: Thomas Zander Date: Mon, 03 Aug 2009 19:45:55 +0000 To: kde-commits Subject: koffice/kword Message-Id: <1249328755.142151.16193.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124932878808012 SVN commit 1006467 by zander: Give them an appropriate debug section. M +1 -1 part/KWCanvas.cpp M +13 -13 part/KWDLoader.cpp M +1 -1 part/KWDocument.cpp M +1 -1 part/KWPageManager.cpp M +1 -1 part/frames/KWFrameLayout.cpp M +2 -2 plugins/scripting/TextList.h --- trunk/koffice/kword/part/KWCanvas.cpp #1006466:1006467 @@ -283,7 +283,7 @@ m_view->setCurrentPage(currentPage); } else { // TODO paint the main-text-flake directly - kWarning() << "Non-page painting not implemented yet!"; + kWarning(32003) << "Non-page painting not implemented yet!"; } painter.end(); --- trunk/koffice/kword/part/KWDLoader.cpp #1006466:1006467 @@ -197,9 +197,9 @@ if (pgLayout.bottom == 0.0) pgLayout.bottom = paperborders.attribute("bottom").toDouble(); } else - kWarning() << "No tag!"; + kWarning(32001) << "No tag!"; } else - kWarning() << "No tag! This is a mandatory tag! Expect weird page sizes..."; + kWarning(32001) << "No tag! This is a mandatory tag! Expect weird page sizes..."; m_pageManager->pageStyle("Standard").setPageLayout(pgLayout); @@ -478,7 +478,7 @@ ImageKey imageKey; fill(&imageKey, key); if (imageKey.filename.isEmpty()) { - kWarning() << "could not find image in the store"; + kWarning(32001) << "could not find image in the store"; return; } @@ -649,11 +649,11 @@ formatCursor.setPosition(block.position() + pos); formatCursor.setPosition(block.position() + pos + length, QTextCursor::KeepAnchor); } else { - kWarning("Format has missing or invalid 'len' value, ignoring"); + kWarning(32001) << "Format has missing or invalid 'len' value, ignoring"; continue; } } else { - kWarning("Format has missing or invalid 'pos' value, ignoring"); + kWarning(32001) << "Format has missing or invalid 'pos' value, ignoring"; continue; } if (id == "1") { @@ -662,11 +662,11 @@ fill(&s2, format); s2.applyStyle(&formatCursor); } else if (id == "2") { - kWarning("File to old, image can not be recovered"); + kWarning(32001) << "File to old, image can not be recovered"; } else if (id == "4") { KoXmlElement variable = format.namedItem("VARIABLE").toElement(); if (variable.isNull()) { - kWarning() << "Missing VARIABLE tag"; + kWarning(32001) << "Missing VARIABLE tag"; continue; } KoXmlElement type = variable.namedItem("TYPE").toElement(); @@ -721,17 +721,17 @@ } } } else if (id == "5") { - kWarning("File to old, footnote can not be recovered"); + kWarning(32001) << "File to old, footnote can not be recovered"; } else if (id == "6") { // anchor for floating frame. KoXmlElement anchor = format.namedItem("ANCHOR").toElement(); if (anchor.isNull()) { - kWarning() << "Missing ANCHOR tag"; + kWarning(32001) << "Missing ANCHOR tag"; continue; } QString type = anchor.attribute("type", "frameset"); if (type == "frameset") { if (! anchor.hasAttribute("instance")) { - kWarning() << "ANCHOR is missing its instance attribute"; + kWarning(32001) << "ANCHOR is missing its instance attribute"; continue; } AnchorData data; @@ -839,7 +839,7 @@ case 10: llp.setStyle(KoListStyle::DiscItem); break; case 11: llp.setStyle(KoListStyle::BoxItem); break; case 7: llp.setStyle(KoListStyle::CustomCharItem); - kWarning() << "According to spec COUNTER with type 7 is not supported, ignoring"; + kWarning(32001) << "According to spec COUNTER with type 7 is not supported, ignoring"; // fall through default: { lstyle = 0; @@ -1160,7 +1160,7 @@ foreach (const AnchorData &anchor, m_anchors) { KWFrameSet *fs = m_document->frameSetByName(anchor.frameSetName); if (fs == 0) { - kWarning() << "Anchored frameset not found: '" << anchor.frameSetName; + kWarning(32001) << "Anchored frameset not found: '" << anchor.frameSetName; continue; } if (fs->frames().count() == 0) continue; @@ -1187,7 +1187,7 @@ foreach (const NotesData ¬e, m_notes) { KWFrameSet *fs = m_document->frameSetByName(note.frameSetName); if (fs == 0) { - kWarning() << "Frameset data for note not found: '" << note.frameSetName; + kWarning(32001) << "Frameset data for note not found: '" << note.frameSetName; continue; } KWTextFrameSet *tfs = dynamic_cast (fs); --- trunk/koffice/kword/part/KWDocument.cpp #1006466:1006467 @@ -260,7 +260,7 @@ KWPage page = m_pageManager.page(pageNumber); if (! page.isValid()) { - kWarning() << "remove page requested for a non exiting page!"; + kWarning(32001) << "remove page requested for a non exiting page!"; return; } addCommand(new KWPageRemoveCommand(this, page)); --- trunk/koffice/kword/part/KWPageManager.cpp #1006466:1006467 @@ -81,7 +81,7 @@ foreach (int id, oldPages.keys()) { Page page = oldPages[id]; if (diff < 0 && page.pageNumber >= from && page.pageNumber < to) { - kWarning() << "you requested to change the page number to a number that already exist, all will end soon"; + kWarning(32001) << "you requested to change the page number to a number that already exist, all will end soon"; return; } const int oldPageNumber = page.pageNumber; // debug only --- trunk/koffice/kword/part/frames/KWFrameLayout.cpp #1006466:1006467 @@ -277,7 +277,7 @@ } case KWord::MainTextFrameSet: { if (columnsCount < 1) { - kWarning() << "Too many columns present on page, ignoring 1"; + kWarning(32001) << "Too many columns present on page, ignoring 1"; break; } main[--columnsCount] = static_cast(frame); --- trunk/koffice/kword/plugins/scripting/TextList.h #1006466:1006467 @@ -92,12 +92,12 @@ void setStyle(QObject* style) { ParagraphStyle* s = dynamic_cast(style); if (! s) { - kWarning() << "TextList.setStyle Invalid ParagraphStyle object"; + kWarning(32001) << "TextList.setStyle Invalid ParagraphStyle object"; return; } KoParagraphStyle* ps = s->style(); if (! ps) { - kWarning() << "TextList.setStyle Invalid KoParagraphStyle object"; + kWarning(32001) << "TextList.setStyle Invalid KoParagraphStyle object"; return; } const int count = m_list ? m_list->count() : 0;