merge booktabs branch

[lyx.git] / src / frontends / xforms / ColorHandler.C

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index a43bc9036f5cb3878ab4e3a1454403bbfa73f666..140af1d4212b3d30d8bb2d0726e90fb60a8bed5a 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -17,7 +17,7 @@
 #include "LColor.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 
@@ -155,7 +155,7 @@ GC LyXColorHandler::getGCForeground(string const & s)
                }
 
                lyxerr << bformat(
-                       _("LyX: Couldn't allocate '%1$s' with (r,g,b)=%3$s.\n"),
+                       _("LyX: Couldn't allocate '%1$s' with (r,g,b)=%2$s.\n"),
                        s, tostr(xcol));
 
                lyxerr << bformat(