diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp index 75b055a60..c2fbe6d36 100644 --- a/src/columns/ColDepends.cpp +++ b/src/columns/ColDepends.cpp @@ -102,8 +102,6 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma minimum = length; } } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp index db7fa387c..940ebc7bb 100644 --- a/src/columns/ColDescription.cpp +++ b/src/columns/ColDescription.cpp @@ -153,9 +153,6 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int minimum = 4; maximum = utf8_width (description) + 1 + 1 + format (task.annotation_count).length () + 1; } - - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColID.cpp b/src/columns/ColID.cpp index c47d2ea4f..b11980593 100644 --- a/src/columns/ColID.cpp +++ b/src/columns/ColID.cpp @@ -55,10 +55,6 @@ void ColumnID::measure (Task& task, unsigned int& minimum, unsigned int& maximum else length = 1 + (int) log10 ((double) task.id); // Slow minimum = maximum = length; - - if (_style != "default" && - _style != "number") - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp index 3d2a905cc..a267371c6 100644 --- a/src/columns/ColIMask.cpp +++ b/src/columns/ColIMask.cpp @@ -46,13 +46,7 @@ void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maxi { minimum = maximum = 0; if (task.has (_name)) - { minimum = maximum = task.get (_name).length (); - - if (_style != "default" && - _style != "number") - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); - } } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp index 3e74fb8e4..71e49b82d 100644 --- a/src/columns/ColLast.cpp +++ b/src/columns/ColLast.cpp @@ -46,13 +46,7 @@ void ColumnLast::measure (Task& task, unsigned int& minimum, unsigned int& maxim { minimum = maximum = 0; if (task.has (_name)) - { minimum = maximum = task.get (_name).length (); - - if (_style != "default" && - _style != "number") - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); - } } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp index d7a82e256..97e14753a 100644 --- a/src/columns/ColMask.cpp +++ b/src/columns/ColMask.cpp @@ -46,12 +46,7 @@ void ColumnMask::measure (Task& task, unsigned int& minimum, unsigned int& maxim { minimum = maximum = 0; if (task.has (_name)) - { minimum = maximum = task.get (_name).length (); - - if (_style != "default") - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); - } } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp index a58a39a2e..614b375de 100644 --- a/src/columns/ColParent.cpp +++ b/src/columns/ColParent.cpp @@ -49,8 +49,6 @@ void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& max { if (_style == "default" || _style == "long") minimum = maximum = 36; else if (_style == "short") minimum = maximum = 8; - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp index 1da64525d..cfdf3ef15 100644 --- a/src/columns/ColProject.cpp +++ b/src/columns/ColProject.cpp @@ -73,10 +73,6 @@ void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& ma { project = indentProject (project, " ", '.'); } - else if (_style != "default" && - _style != "full" && - _style != "indented") - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); minimum = longestWord (project); maximum = utf8_width (project); diff --git a/src/columns/ColRType.cpp b/src/columns/ColRType.cpp index e9e2d9ac5..96968c32e 100644 --- a/src/columns/ColRType.cpp +++ b/src/columns/ColRType.cpp @@ -67,8 +67,6 @@ void ColumnRType::measure (Task& task, unsigned int& minimum, unsigned int& maxi minimum = maximum = task.get (_name).length (); else if (_style == "indicator") minimum = maximum = 1; - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp index ea4d10018..159e4a5d7 100644 --- a/src/columns/ColRecur.cpp +++ b/src/columns/ColRecur.cpp @@ -79,8 +79,6 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi { minimum = maximum = utf8_width (context.config.get ("recurrence.indicator")); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp index 2e5af0cbe..4dec53c19 100644 --- a/src/columns/ColStatus.cpp +++ b/src/columns/ColStatus.cpp @@ -74,8 +74,6 @@ void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& max } else if (_style == "short") minimum = maximum = 1; - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp index 6684b331b..1f11c1df8 100644 --- a/src/columns/ColTags.cpp +++ b/src/columns/ColTags.cpp @@ -108,8 +108,6 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim else minimum = maximum = utf8_width (tags); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColTemplate.cpp b/src/columns/ColTemplate.cpp index 6a392d39e..f25e8660b 100644 --- a/src/columns/ColTemplate.cpp +++ b/src/columns/ColTemplate.cpp @@ -49,8 +49,6 @@ void ColumnTemplate::measure (Task& task, unsigned int& minimum, unsigned int& m { if (_style == "default" || _style == "long") minimum = maximum = 36; else if (_style == "short") minimum = maximum = 8; - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp index c1675a14c..b239a264c 100644 --- a/src/columns/ColTypeDate.cpp +++ b/src/columns/ColTypeDate.cpp @@ -130,8 +130,6 @@ void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& m if (date > now) minimum = maximum = Duration (date - now).formatVague ().length (); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp index 60faa1e20..4723e984f 100644 --- a/src/columns/ColUDA.cpp +++ b/src/columns/ColUDA.cpp @@ -91,8 +91,6 @@ void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int& minimum = maximum = utf8_width (indicator); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } @@ -174,8 +172,6 @@ void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int& minimum = maximum = utf8_width (indicator); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } @@ -266,8 +262,6 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma minimum = maximum = utf8_width (indicator); } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } @@ -363,8 +357,6 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int else minimum = maximum = 0; } - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } } diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp index aea498bf3..ad734834d 100644 --- a/src/columns/ColUUID.cpp +++ b/src/columns/ColUUID.cpp @@ -48,8 +48,6 @@ void ColumnUUID::measure (Task&, unsigned int& minimum, unsigned int& maximum) if (_style == "default" || _style == "long") minimum = maximum = 36; else if (_style == "short") minimum = maximum = 8; - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp index 8ee23ef95..64b5d887b 100644 --- a/src/columns/ColUrgency.cpp +++ b/src/columns/ColUrgency.cpp @@ -49,9 +49,6 @@ void ColumnUrgency::measure (Task& task, unsigned int& minimum, unsigned int& ma else if (_style == "integer") minimum = maximum = format ((int)task.urgency ()).length (); - - else - throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); } ////////////////////////////////////////////////////////////////////////////////