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

diff --git a/ChangeLog b/ChangeLog
index b570a82629632fda6383f7ecceaf3d037b533554..2f5283eec6c5af198046e9d1e0c5b3cd365b1dac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/table.C (calculate_width_of_column): add using std::max
+       directive. 
+
 2000-01-25  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * several files: marked several lines with "DEL LINE", this is

diff --git a/po/ca.po b/po/ca.po
index dc1269a6b70ba151a411129445c2bbfcc4edbc2a..f0c97cef462e7b16cde2a2fb0eaf756444f6e2e7 100644 (file)
--- 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 04a75b81badf306e0dd21081591f055a35bdaac0..5186ca80a925e30bc472fa7a64201033178cebff 100644 (file)
--- 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);
        }