Merge branch 'recurrence' into 2.6.0

2017-01-07 12:29:11 -05:00
parent a50e65a134 fd4ca47581
commit 4e7576cb79
65 changed files with 652 additions and 484 deletions
--- a/src/columns/ColParent.cpp
+++ b/src/columns/ColParent.cpp
@@ -45,13 +45,10 @@ ColumnParent::ColumnParent ()
 void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
 {
  minimum = maximum = 0;
-
  if (task.has (_name))
  {
         if (_style == "default" || _style == "long") minimum = maximum = 36;
    else if (_style == "short")                       minimum = maximum = 8;
-    else
-      throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
  }
 }