From kde-commits  Mon Apr 25 13:14:12 2005
From: Ben Burton <bab () debian ! org>
Date: Mon, 25 Apr 2005 13:14:12 +0000
To: kde-commits
Subject: KOFFICE_1_3_BRANCH: koffice/kspread
Message-Id: <20050425131412.97721488 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111443487806215

CVS commit by benb: 

Backport patch that fixes the bug in which currency selection is ignored for cell formatting.


  M +4 -1      kspread_style.cc   1.10.2.1


--- koffice/kspread/kspread_style.cc  #1.10:1.10.2.1
@@ -362,4 +362,5 @@ bool KSpreadStyle::loadXML( QDomElement 
       m_currency.symbol = format.attribute( "symbol" );
     }
+    m_featuresSet |= SFormatType;
   }
   if ( format.hasAttribute( "angle" ) )
@@ -749,5 +750,5 @@ KSpreadFormat::FormatType KSpreadStyle::
 KSpreadFormat::Currency const & KSpreadStyle::currency() const
 {
-  return ( !m_parent ? m_currency : m_parent->currency() );
+  return ( !m_parent || featureSet( SFormatType ) ? m_currency : m_parent->currency() );
 }
 
@@ -1240,8 +1241,10 @@ KSpreadStyle * KSpreadStyle::setCurrency
     KSpreadStyle * style = new KSpreadStyle( this );
     style->m_currency = currency;
+    style->m_featuresSet |= SFormatType;
     return style;
   }
 
   m_currency = currency;
+  m_featuresSet |= SFormatType;
   return this;
 }