[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/okular/generators/ooo
From:       Pino Toscano <pino () kde ! org>
Date:       2009-05-26 17:23:41
Message-ID: 1243358621.249610.12349.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 973250 by pino:

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


 M  +3 -3      formatproperty.cpp  


--- trunk/KDE/kdegraphics/okular/generators/ooo/formatproperty.cpp #973249:973250
@@ -89,13 +89,13 @@
 
 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 @@
     format->setFont( font );
   }
 
-  if ( mFontStyle != 0 ) {
+  if ( mFontStyle != -1 ) {
     QFont font = format->font();
     font.setStyle( (QFont::Style)mFontStyle );
     format->setFont( font );
[prev in list] [next in list] [prev in thread] [next in thread]