From 7529272c368b870dba1b84df6c238ac772a7994b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 25 Jan 2000 15:57:39 +0000 Subject: [PATCH] Small fix to ca.po, using directive for compaq cxx. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@446 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ po/ca.po | 2 +- src/table.C | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b570a82629..2f5283eec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-01-25 Jean-Marc Lasgouttes + + * src/table.C (calculate_width_of_column): add using std::max + directive. + 2000-01-25 Lars Gullik Bjønnes * several files: marked several lines with "DEL LINE", this is diff --git a/po/ca.po b/po/ca.po index dc1269a6b7..f0c97cef46 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3253,7 +3253,7 @@ msgstr "Falta el par #: src/lyx_main.C:563 #, fuzzy msgid "Unknown file type '" -msgstr "Desconec el tipus de fitxer '"" +msgstr "Desconec el tipus de fitxer '" #: src/lyx_main.C:564 msgid "' after " diff --git a/src/table.C b/src/table.C index 04a75b81ba..5186ca80a9 100644 --- a/src/table.C +++ b/src/table.C @@ -743,6 +743,8 @@ bool LyXTable::calculate_width_of_column(int column) { int old_column_width = column_info[column].width_of_column; int maximum = 0; + using std::max; + for (int i = 0; i < rows; ++i) { maximum = max(cell_info[i][column].width_of_cell, maximum); } -- 2.39.2