diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
| commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
| tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/kernel/qrichtext.cpp | |
| parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
| download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip | |
Sync with latest script
Diffstat (limited to 'src/kernel/qrichtext.cpp')
| -rw-r--r-- | src/kernel/qrichtext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 82ce63ea0..e572fb8f8 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -2109,7 +2109,7 @@ void TQTextDocument::setRichTextMarginsInternal( TQPtrList< TQPtrVector<TQStyleS } stylesPar->ldepth = numLists; if ( stylesPar->next() && nextStyle ) { - // also set the depth of the next paragraph, retquired for the margin calculation + // also set the depth of the next paragraph, required for the margin calculation numLists = 0; for ( i = 0; i < (int)nextStyle->size(); ++i ) { if ( (*nextStyle)[ i ]->displayMode() == TQStyleSheetItem::DisplayBlock @@ -4274,7 +4274,7 @@ void TQTextParagraph::move( int &dy ) if ( p ) p->lastInFrame = TRUE; - // do page breaks if retquired + // do page breaks if required if ( hasdoc && document()->isPageBreakEnabled() ) { int shift; if ( ( shift = document()->formatter()->formatVertically( document(), this ) ) ) { @@ -4364,7 +4364,7 @@ void TQTextParagraph::format( int start, bool doMove ) } } - // do page breaks if retquired + // do page breaks if required if ( hasdoc && document()->isPageBreakEnabled() ) { int shift = document()->formatter()->formatVertically( document(), this ); if ( shift && !formattedAgain ) { |