-rw-r--r-- | noncore/apps/opie-write/qrichtext.cpp | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp index f040f1e..768da44 100644 --- a/noncore/apps/opie-write/qrichtext.cpp +++ b/noncore/apps/opie-write/qrichtext.cpp | |||
@@ -186,15 +186,18 @@ QTextDeleteCommand::~QTextDeleteCommand() | |||
186 | text.resize( 0 ); | 186 | text.resize( 0 ); |
187 | } | 187 | } |
188 | 188 | ||
189 | QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | 189 | 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 ) { | 192 | if ( !s && doc ) { |
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; | ||
195 | } | 198 | } |
196 | 199 | ||
197 | cursor.setParagraph( s ); | 200 | cursor.setParagraph( s ); |
198 | cursor.setIndex( index ); | 201 | cursor.setIndex( index ); |
199 | int len = text.size(); | 202 | int len = text.size(); |
200 | if ( c ) | 203 | if ( c ) |
@@ -214,15 +217,18 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | |||
214 | return c; | 217 | return c; |
215 | } | 218 | } |
216 | 219 | ||
217 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | 220 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) |
218 | { | 221 | { |
219 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 222 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
220 | if ( !s ) { | 223 | if ( !s && doc ) { |
221 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; | 224 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
222 | return 0; | 225 | return 0; |
226 | } else if ( !doc ) { | ||
227 | owarn << "No valid doc" << oendl; | ||
228 | return 0; | ||
223 | } | 229 | } |
224 | 230 | ||
225 | cursor.setParagraph( s ); | 231 | cursor.setParagraph( s ); |
226 | cursor.setIndex( index ); | 232 | cursor.setIndex( index ); |
227 | QString str = QTextString::toString( text ); | 233 | QString str = QTextString::toString( text ); |
228 | cursor.insert( str, TRUE, &text ); | 234 | cursor.insert( str, TRUE, &text ); |
@@ -230,12 +236,15 @@ QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | |||
230 | cursor.setIndex( index ); | 236 | cursor.setIndex( index ); |
231 | if ( c ) { | 237 | if ( c ) { |
232 | c->setParagraph( s ); | 238 | c->setParagraph( s ); |
233 | c->setIndex( index ); | 239 | c->setIndex( index ); |
234 | for ( int i = 0; i < (int)text.size(); ++i ) | 240 | for ( int i = 0; i < (int)text.size(); ++i ) |
235 | c->gotoNextLetter(); | 241 | c->gotoNextLetter(); |
242 | } else { | ||
243 | owarn << "No valid cursor" << oendl; | ||
244 | return 0; | ||
236 | } | 245 | } |
237 | 246 | ||
238 | if ( !styleInformation.isEmpty() ) { | 247 | if ( !styleInformation.isEmpty() ) { |
239 | QDataStream styleStream( styleInformation, IO_ReadOnly ); | 248 | QDataStream styleStream( styleInformation, IO_ReadOnly ); |
240 | int num; | 249 | int num; |
241 | styleStream >> num; | 250 | styleStream >> num; |
@@ -1389,31 +1398,42 @@ struct Q_EXPORT QTextDocumentTag { | |||
1389 | #if defined(Q_FULL_TEMPLATE_INSTANTIATION) | 1398 | #if defined(Q_FULL_TEMPLATE_INSTANTIATION) |
1390 | bool operator==( const QTextDocumentTag& ) const { return FALSE; } | 1399 | bool operator==( const QTextDocumentTag& ) const { return FALSE; } |
1391 | #endif | 1400 | #endif |
1392 | }; | 1401 | }; |
1393 | 1402 | ||
1394 | 1403 | ||
1395 | #define NEWPAR do{ if ( !hasNewPar) { \ | 1404 | #define NEWPAR do { \ |
1405 | if ( !hasNewPar) { \ | ||
1406 | if ( !curpar ) { \ | ||
1407 | owarn << "no current paragraph" << oendl; \ | ||
1408 | return; \ | ||
1409 | } \ | ||
1396 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ | 1410 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ |
1397 | curpar->remove( curpar->length()-2, 1 ); \ | 1411 | curpar->remove( curpar->length()-2, 1 ); \ |
1398 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); vec = 0;} \ | 1412 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); \ |
1413 | if ( !curpar ) { \ | ||
1414 | owarn << "failed in creating a new paragraph" << oendl; \ | ||
1415 | return; \ | ||
1416 | } \ | ||
1417 | vec = 0; \ | ||
1418 | } \ | ||
1399 | hasNewPar = TRUE; \ | 1419 | hasNewPar = TRUE; \ |
1400 | curpar->rtext = TRUE; \ | 1420 | curpar->rtext = TRUE; \ |
1401 | curpar->align = curtag.alignment; \ | 1421 | curpar->align = curtag.alignment; \ |
1402 | curpar->lstyle = curtag.liststyle; \ | 1422 | curpar->lstyle = curtag.liststyle; \ |
1403 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ | 1423 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ |
1404 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ | 1424 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ |
1405 | space = TRUE; \ | 1425 | space = TRUE; \ |
1406 | delete vec; vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ | 1426 | delete vec; \ |
1427 | vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ | ||
1407 | int i = 0; \ | 1428 | int i = 0; \ |
1408 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ | 1429 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ |
1409 | vec->insert( i++, (*it).style ); \ | 1430 | vec->insert( i++, (*it).style ); \ |
1410 | vec->insert( i, curtag.style ); \ | 1431 | vec->insert( i, curtag.style ); \ |
1411 | }while(FALSE) | 1432 | }while(FALSE) |
1412 | 1433 | ||
1413 | |||
1414 | void QTextDocument::setRichText( const QString &text, const QString &context ) | 1434 | void QTextDocument::setRichText( const QString &text, const QString &context ) |
1415 | { | 1435 | { |
1416 | if ( !context.isEmpty() ) | 1436 | if ( !context.isEmpty() ) |
1417 | setContext( context ); | 1437 | setContext( context ); |
1418 | clear(); | 1438 | clear(); |
1419 | fParag = lParag = createParagraph( this ); | 1439 | fParag = lParag = createParagraph( this ); |
@@ -1892,14 +1912,17 @@ void QTextDocument::setRichTextMarginsInternal( QPtrList< QPtrVector<QStyleSheet | |||
1892 | curStyle = nextStyle; | 1912 | curStyle = nextStyle; |
1893 | nextStyle = styles.next(); | 1913 | nextStyle = styles.next(); |
1894 | continue; | 1914 | continue; |
1895 | } | 1915 | } |
1896 | 1916 | ||
1897 | int i, mar; | 1917 | int i, mar; |
1898 | QStyleSheetItem* mainStyle = curStyle->size() ? (*curStyle)[curStyle->size()-1] : 0; | 1918 | QStyleSheetItem* mainStyle = (*curStyle)[curStyle->size()-1]; |
1899 | if ( mainStyle && mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) | 1919 | if ( !mainStyle ) |
1920 | return; | ||
1921 | |||
1922 | if ( mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) | ||
1900 | stylesPar->setListItem( TRUE ); | 1923 | stylesPar->setListItem( TRUE ); |
1901 | int numLists = 0; | 1924 | int numLists = 0; |
1902 | for ( i = 0; i < (int)curStyle->size(); ++i ) { | 1925 | for ( i = 0; i < (int)curStyle->size(); ++i ) { |
1903 | if ( (*curStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock | 1926 | if ( (*curStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock |
1904 | && int((*curStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) | 1927 | && int((*curStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) |
1905 | numLists++; | 1928 | numLists++; |
@@ -5338,13 +5361,13 @@ int QTextFormatterBreakWords::format( QTextDocument *doc, QTextParagraph *parag, | |||
5338 | int ww = 0; | 5361 | int ww = 0; |
5339 | QChar lastChr; | 5362 | QChar lastChr; |
5340 | for ( ; i < len; ++i, ++col ) { | 5363 | for ( ; i < len; ++i, ++col ) { |
5341 | if ( c ) | 5364 | if ( c ) |
5342 | lastChr = c->c; | 5365 | lastChr = c->c; |
5343 | // ### next line should not be needed | 5366 | // ### next line should not be needed |
5344 | if ( painter ) | 5367 | if ( c && painter ) |
5345 | c->format()->setPainter( painter ); | 5368 | c->format()->setPainter( painter ); |
5346 | c = &string->at( i ); | 5369 | c = &string->at( i ); |
5347 | c->rightToLeft = FALSE; | 5370 | c->rightToLeft = FALSE; |
5348 | if ( i > 0 && (x > curLeft || ww == 0) || lastWasNonInlineCustom ) { | 5371 | if ( i > 0 && (x > curLeft || ww == 0) || lastWasNonInlineCustom ) { |
5349 | c->lineStart = 0; | 5372 | c->lineStart = 0; |
5350 | } else { | 5373 | } else { |