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

List:       kde-commits
Subject:    koffice/kspread
From:       Laurent Montel <montel () kde ! org>
Date:       2004-12-19 17:43:52
Message-ID: 20041219174352.861EF1BAA9 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Start to implement validation from list


  M +4 -0      TODO   1.82
  M +174 -168  kspread_cell.cc   1.653
  M +4 -3      kspread_cell.h   1.199
  M +3 -3      kspread_global.h   1.30


--- koffice/kspread/TODO  #1.81:1.82
@@ -361,4 +361,8 @@
 
 
+After koffice-1.3
+-----------------
+-Improve validation (add list) In progress
+
 Oasis File Format:
 ==================

--- koffice/kspread/kspread_cell.cc  #1.652:1.653
@@ -4141,4 +4141,10 @@ bool KSpreadCell::testValidity() const
   valid = value().isString();
       }
+        else if ( d->extra()->validity->m_allow == Allow_List )
+        {
+            //test int value
+            if ( value().isString() && d->extra()->validity->listValidity.contains( \
value().asString() ) ) +                valid = true;
+        }
       else if(d->extra()->validity->m_allow==Allow_TextLength)
       {

--- koffice/kspread/kspread_cell.h  #1.198:1.199
@@ -92,4 +92,5 @@ struct KSpreadValidity
     bool allowEmptyCell;
     bool displayValidationInformation;
+    QStringList listValidity;
 };
 

--- koffice/kspread/kspread_global.h  #1.29:1.30
@@ -61,5 +61,5 @@ enum Operation { OverWrite, Add, Mul, Su
 enum Conditional { None, \
Equal,Superior,Inferior,SuperiorEqual,InferiorEqual,Between,Different, DifferentTo};  \
                enum Action { Stop, Warning, Information};
-enum Allow { Allow_All, Allow_Number, \
Allow_Text,Allow_Time,Allow_Date,Allow_Integer,Allow_TextLength}; +enum Allow { \
Allow_All, Allow_Number, \
Allow_Text,Allow_Time,Allow_Date,Allow_Integer,Allow_TextLength, Allow_List};  enum \
Series { Column,Row,Linear,Geometric };  namespace KSpread


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