add missing implementation of three-arg overload of bformat

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6977 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 1648c841e01b26fb0307aecac3b5ffdce0995ab4..423337e9a20fa6b47493ed879bd401d64b7a20ba 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,4 +1,8 @@
 
+2003-05-19  André Pönitz  <poenitz@gmx.net>
+
+       * lstrings.C: add missing implementation of three-arg bformat
+
 2003-05-15  André Pönitz  <poenitz@gmx.net>
 
        * lstrings.[Ch]: use string const & instead of char const * for format

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index cf5589c23e06d2e3bcf6f8b91715daf52ae11c3f..1b7b05fb235cd87a0795b6a145c8e03cd6da5fff 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -665,9 +665,10 @@ string const getStringFromVector(vector<string> const & vec,
        for (vector<string>::const_iterator it = vec.begin();
             it != vec.end(); ++it) {
                string item = trim(*it);
-               if (item.empty()) continue;
-
-               if (i++ > 0) str += delim;
+               if (item.empty())
+                       continue;
+               if (i++ > 0)
+                       str += delim;
                str += item;
        }
        return str;
@@ -687,6 +688,15 @@ string bformat(string const & fmt, string const & arg1, string const & arg2)
        return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
 }
 
+
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+       string const & arg3)
+{
+       return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
+               % STRCONV(arg3)).str());
+}
+
+
 string bformat(string const & fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4)
 {
@@ -714,6 +724,19 @@ string bformat(string const & fmt, string const & arg1, string const & arg2)
 }
 
 
+string bformat(char const * fmt, string const & arg1, string const & arg2,
+       string const & arg3)
+{
+       lyx::Assert(contains(fmt, "%1$s"));
+       lyx::Assert(contains(fmt, "%2$s"));
+       lyx::Assert(contains(fmt, "%3$s"));
+       string str = subst(fmt, "%1$s", arg1);
+       str = subst(str, "%2$s", arg2);
+       str = subst(str, "%3$s", arg3);
+       return subst(str, "%%", "%");
+}
+
+
 string bformat(char const * fmt, string const & arg1, string const & arg2,
        string const & arg3, string const & arg4)
 {