CVS commit by hadacek: compile M +8 -0 DESIGN 1.1.4.2 M +2 -2 FilterPage.cpp 1.16.2.3 --- koffice/filters/kword/pdf/DESIGN #1.1.4.1:1.1.4.2 @@ -21,4 +21,5 @@ | which calls the following methods as appropriate: | * Device::startPage -> new Page + | | * Device::endPage -> FilterPage::endPage | |- [XPDF]TextPage::coalesce @@ -26,16 +27,23 @@ | |- Page::checkHeader | |- Page::checkFooter + | | * Device::updateFont/... -> TextPage::updateFont + | | * Device::beginString -> Page::beginWord -> new Word + | | * Device::drawChar -> [XPDF]TextPage::addChar -> Word::addChar | |- Word::checkLigature | |- [XPDF]TextWord::addChar | |- Word::checkCombination + | | * Device::endString -> Page::endWord -> [XPDF]TextPage::endWord | -> Page::addWord | |- Word::checkCombination | |- [XPDF]TextPage::addWord + | | * Device::drawLink -> Page::addLink + | | * Device::drawImage(Mask) -> Device::initImage -> Device::addImage + | | * Device::stroke/fill/... (ignored at the moment) | --- koffice/filters/kword/pdf/FilterPage.cpp #1.16.2.2:1.16.2.3 @@ -322,5 +322,5 @@ void Page::fillParagraph(Paragraph &par, int lineHeight = 0; Word *prevWord = 0; - for (Word *word = static_cast((*it)->words); word; word = word->next) { + for (Word *word = static_cast((*it)->words); word; word = static_cast(word->next)) { // tabulations @@ -446,5 +446,5 @@ void Page::prepare() for (int i = 0; ilines; line; line = line->next) - for (Word *word = static_cast(line->words); word; word = word->next) + for (Word *word = static_cast(line->words); word; word = static_cast(word->next)) if ( r.isInside(word->rect()) ) word->link = link; }