From d50180f0a580a851c6a5831968b7a27138602382 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 May 2009 17:23:39 +0000 Subject: [PATCH] 0 is a valid value for font style, so use -1 as "not exlicitly set" svn path=/trunk/KDE/kdegraphics/okular/; revision=973250 --- generators/ooo/formatproperty.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/ooo/formatproperty.cpp b/generators/ooo/formatproperty.cpp index bdf76d78c..8746268dc 100644 --- a/generators/ooo/formatproperty.cpp +++ b/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 );