-rw-r--r-- | noncore/apps/opie-write/qrichtext.cpp | 72 |
1 files changed, 23 insertions, 49 deletions
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp index 768da44..b457cd6 100644 --- a/noncore/apps/opie-write/qrichtext.cpp +++ b/noncore/apps/opie-write/qrichtext.cpp | |||
@@ -190,10 +190,7 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | |||
190 | { | 190 | { |
191 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 191 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
192 | if ( !s && doc ) { | 192 | if ( !s ) { |
193 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; | 193 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
194 | return 0; | 194 | return 0; |
195 | } else if ( !doc ) { | ||
196 | owarn << "No valid doc" << oendl; | ||
197 | return 0; | ||
198 | } | 195 | } |
199 | 196 | ||
@@ -221,10 +218,7 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | |||
221 | { | 218 | { |
222 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 219 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
223 | if ( !s && doc ) { | 220 | if ( !s ) { |
224 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; | 221 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
225 | return 0; | 222 | return 0; |
226 | } else if ( !doc ) { | ||
227 | owarn << "No valid doc" << oendl; | ||
228 | return 0; | ||
229 | } | 223 | } |
230 | 224 | ||
@@ -240,7 +234,4 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | |||
240 | for ( int i = 0; i < (int)text.size(); ++i ) | 234 | for ( int i = 0; i < (int)text.size(); ++i ) |
241 | c->gotoNextLetter(); | 235 | c->gotoNextLetter(); |
242 | } else { | ||
243 | owarn << "No valid cursor" << oendl; | ||
244 | return 0; | ||
245 | } | 236 | } |
246 | 237 | ||
@@ -1402,33 +1393,22 @@ struct Q_EXPORT QTextDocumentTag { | |||
1402 | 1393 | ||
1403 | 1394 | ||
1404 | #define NEWPAR do { \ | 1395 | #define NEWPAR do{ if ( !hasNewPar) { \ |
1405 | if ( !hasNewPar) { \ | 1396 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ |
1406 | if ( !curpar ) { \ | 1397 | curpar->remove( curpar->length()-2, 1 ); \ |
1407 | owarn << "no current paragraph" << oendl; \ | 1398 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); vec = 0;} \ |
1408 | return; \ | 1399 | hasNewPar = TRUE; \ |
1409 | } \ | 1400 | curpar->rtext = TRUE; \ |
1410 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ | 1401 | curpar->align = curtag.alignment; \ |
1411 | curpar->remove( curpar->length()-2, 1 ); \ | 1402 | curpar->lstyle = curtag.liststyle; \ |
1412 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); \ | 1403 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ |
1413 | if ( !curpar ) { \ | 1404 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ |
1414 | owarn << "failed in creating a new paragraph" << oendl; \ | 1405 | space = TRUE; \ |
1415 | return; \ | 1406 | delete vec; vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ |
1416 | } \ | 1407 | int i = 0; \ |
1417 | vec = 0; \ | 1408 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ |
1418 | } \ | 1409 | vec->insert( i++, (*it).style ); \ |
1419 | hasNewPar = TRUE; \ | 1410 | vec->insert( i, curtag.style ); \ |
1420 | curpar->rtext = TRUE; \ | 1411 | }while(FALSE) |
1421 | curpar->align = curtag.alignment; \ | 1412 | |
1422 | curpar->lstyle = curtag.liststyle; \ | ||
1423 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ | ||
1424 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ | ||
1425 | space = TRUE; \ | ||
1426 | delete vec; \ | ||
1427 | vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ | ||
1428 | int i = 0; \ | ||
1429 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ | ||
1430 | vec->insert( i++, (*it).style ); \ | ||
1431 | vec->insert( i, curtag.style ); \ | ||
1432 | } while ( FALSE ) | ||
1433 | 1413 | ||
1434 | void QTextDocument::setRichText( const QString &text, const QString &context ) | 1414 | void QTextDocument::setRichText( const QString &text, const QString &context ) |
@@ -1916,9 +1896,6 @@ void QTextDocument::setRichTextMarginsInternal( QPtrList< QPtrVector<QStyleSheet | |||
1916 | 1896 | ||
1917 | int i, mar; | 1897 | int i, mar; |
1918 | QStyleSheetItem* mainStyle = (*curStyle)[curStyle->size()-1]; | 1898 | QStyleSheetItem* mainStyle = curStyle->size() ? (*curStyle)[curStyle->size()-1] : 0; |
1919 | if ( !mainStyle ) | 1899 | if ( mainStyle && mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) |
1920 | return; | ||
1921 | |||
1922 | if ( mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) | ||
1923 | stylesPar->setListItem( TRUE ); | 1900 | stylesPar->setListItem( TRUE ); |
1924 | int numLists = 0; | 1901 | int numLists = 0; |
@@ -3071,5 +3048,4 @@ QTextParagraph *QTextDocument::draw( QPainter *p, int cx, int cy, int cw, int ch | |||
3071 | QPainter painter; | 3048 | QPainter painter; |
3072 | 3049 | ||
3073 | bool fullWidthSelection = FALSE; | ||
3074 | while ( parag ) { | 3050 | while ( parag ) { |
3075 | lastFormatted = parag; | 3051 | lastFormatted = parag; |
@@ -3078,6 +3054,4 @@ QTextParagraph *QTextDocument::draw( QPainter *p, int cx, int cy, int cw, int ch | |||
3078 | 3054 | ||
3079 | QRect pr = parag->rect(); | 3055 | QRect pr = parag->rect(); |
3080 | if ( fullWidthSelection ) | ||
3081 | pr.setWidth( parag->document()->width() ); | ||
3082 | if ( pr.y() > cy + ch ) | 3056 | if ( pr.y() > cy + ch ) |
3083 | goto floating; | 3057 | goto floating; |
@@ -5365,5 +5339,5 @@ int QTextFormatterBreakWords::format( QTextDocument *doc, QTextParagraph *parag, | |||
5365 | lastChr = c->c; | 5339 | lastChr = c->c; |
5366 | // ### next line should not be needed | 5340 | // ### next line should not be needed |
5367 | if ( c && painter ) | 5341 | if ( painter ) |
5368 | c->format()->setPainter( painter ); | 5342 | c->format()->setPainter( painter ); |
5369 | c = &string->at( i ); | 5343 | c = &string->at( i ); |