backport: implement <strikethrough> in <p> tags

svn path=/branches/KDE/4.2/kdegraphics/okular/; revision=973223
remotes/origin/KDE/4.2
Pino Toscano 17 years ago
parent a002dd70dc
commit 70ec3077ff
  1. 19
      generators/fictionbook/converter.cpp
  2. 1
      generators/fictionbook/converter.h

@ -501,6 +501,9 @@ bool Converter::convertParagraph( const QDomElement &element )
} else if ( childElement.tagName() == QLatin1String( "image" ) ) {
if ( !convertImage( childElement ) )
return false;
} else if ( childElement.tagName() == QLatin1String( "strikethrough" ) ) {
if ( !convertStrikethrough( childElement ) )
return false;
}
} else if ( child.isText() ) {
const QDomText childText = child.toText();
@ -529,6 +532,22 @@ bool Converter::convertEmphasis( const QDomElement &element )
return true;
}
bool Converter::convertStrikethrough( const QDomElement &element )
{
QTextCharFormat origFormat = mCursor->charFormat();
QTextCharFormat strikeoutFormat( origFormat );
strikeoutFormat.setFontStrikeOut( true );
mCursor->setCharFormat( strikeoutFormat );
if ( !convertParagraph( element ) )
return false;
mCursor->setCharFormat( origFormat );
return true;
}
bool Converter::convertStrong( const QDomElement &element )
{
QTextCharFormat origFormat = mCursor->charFormat();

@ -42,6 +42,7 @@ class Converter : public Okular::TextDocumentConverter
bool convertLink( const QDomElement &element );
bool convertEmphasis( const QDomElement &element );
bool convertStrong( const QDomElement &element );
bool convertStrikethrough( const QDomElement &element );
bool convertStyle( const QDomElement &element );

Loading…
Cancel
Save