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

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/lib/kotext
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-08-18 20:06:21
Message-ID: 1155931581.652754.7241.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 574354 by sebsauer:

Applied patch from Alexander Rieder to fix the crasher reported with bugreport \
#127555 BUG:127555


 M  +13 -1     KoStyleManager.cpp  


--- branches/koffice/1.6/koffice/lib/kotext/KoStyleManager.cpp #574353:574354
@@ -364,7 +364,19 @@
 
         int indexNextStyle = styleIndex( m_styleCombo->currentItem() );
         m_currentStyle->setFollowingStyle( m_origStyles.at( indexNextStyle ) ); // \
                point to orig, not changed! (#47377)
-        m_currentStyle->setParentStyle( style( m_inheritCombo->currentText() ) );
+
+        if ( m_inheritCombo->currentItem() == 0 )  //<None> selected
+          m_currentStyle->setParentStyle(0);
+        else
+        {
+          int indexParentStyle=styleIndex( m_inheritCombo->currentItem()-1 );
+          KoParagStyle *parent=m_origStyles.at(indexParentStyle);
+          if( parent==0L )  //If not found in the orig list (means its a new Style) \
look in the changeStyles list +            \
parent=m_changedStyles.at(indexParentStyle); +
+            m_currentStyle->setParentStyle( parent );
+        }
+
         if ( d->cbIncludeInTOC )
             m_currentStyle->setOutline( d->cbIncludeInTOC->isChecked() );
     }


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