0 is a valid value for font style, so use -1 as "not exlicitly set"

svn path=/trunk/KDE/kdegraphics/okular/; revision=973250
remotes/origin/KDE/4.3
Pino Toscano 17 years ago
parent 685d737f21
commit d50180f0a5
  1. 6
      generators/ooo/formatproperty.cpp

@ -89,13 +89,13 @@ void ParagraphFormatProperty::setLeftMargin( const qreal margin )
TextFormatProperty::TextFormatProperty()
: mStyleInformation( 0 ), mHasFontSize( false ),
mFontWeight( -1 ), mFontStyle( 0 ), mTextPosition( 0 )
mFontWeight( -1 ), mFontStyle( -1 ), mTextPosition( 0 )
{
}
TextFormatProperty::TextFormatProperty( const StyleInformation *information )
: mStyleInformation( information ), mHasFontSize( false ),
mFontWeight( -1 ), mFontStyle( 0 ), mTextPosition( 0 )
mFontWeight( -1 ), mFontStyle( -1 ), mTextPosition( 0 )
{
}
@ -120,7 +120,7 @@ void TextFormatProperty::apply( QTextCharFormat *format ) const
format->setFont( font );
}
if ( mFontStyle != 0 ) {
if ( mFontStyle != -1 ) {
QFont font = format->font();
font.setStyle( (QFont::Style)mFontStyle );
format->setFont( font );

Loading…
Cancel
Save