Remove the XOpenIM test as lyxlookup.C has been buried.

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 56a336081611386b24a2bc1de82fcd701d6e91f0..6ffe90292132a884f270c4a358b4d381cb1ba8e3 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -154,7 +154,7 @@ Painter & BufferView::Pimpl::painter() const
 void BufferView::Pimpl::buffer(Buffer * b)
 {
        lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
-                           << b << ")" << endl;
+                           << b << ')' << endl;
        if (buffer_) {
                buffer_->delUser(bv_);
 
@@ -640,7 +640,11 @@ void BufferView::Pimpl::savePosition(unsigned int i)
                                      bv_->text->cursor.pos());
        if (i > 0) {
                ostringstream str;
+#if USE_BOOST_FORMAT
                str << boost::format(_("Saved bookmark %1$d")) % i;
+#else
+               str << _("Saved bookmark ") << i;
+#endif
                owner_->message(STRCONV(str.str()));
        }
 }
@@ -672,7 +676,11 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
        update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
        if (i > 0) {
                ostringstream str;
+#if USE_BOOST_FORMAT
                str << boost::format(_("Moved to bookmark %1$d")) % i;
+#else
+               str << _("Moved to bookmark ") << i;
+#endif
                owner_->message(STRCONV(str.str()));
        }
 }
@@ -880,16 +888,28 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
        string const disp_fn(MakeDisplayPath(filename));
 
        ostringstream s1;
+#if USE_BOOST_FORMAT
        s1 << boost::format(_("Inserting document %1$s ...")) % disp_fn;
+#else
+       s1 << _("Inserting document ") << disp_fn << _(" ...");
+#endif
        owner_->message(STRCONV(s1.str()));
        bool const res = bv_->insertLyXFile(filename);
        if (res) {
                ostringstream str;
+#if USE_BOOST_FORMAT
                str << boost::format(_("Document %1$s inserted.")) % disp_fn;
+#else
+               str << _("Document ") << disp_fn << _(" inserted.");
+#endif
                owner_->message(STRCONV(str.str()));
        } else {
                ostringstream str;
+#if USE_BOOST_FORMAT
                str << boost::format(_("Could not insert document %1$s")) % disp_fn;
+#else
+               str << _("Could not insert document ") << disp_fn;
+#endif
                owner_->message(STRCONV(str.str()));
        }
 }
@@ -898,11 +918,11 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 bool BufferView::Pimpl::dispatch(FuncRequest const & ev)
 {
        lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch:"
-               << " action[" << ev.action <<"]"
-               << " arg[" << ev.argument << "]"
-               << " x[" << ev.x << "]"
-               << " y[" << ev.y << "]"
-               << " button[" << ev.button() << "]"
+               << " action[" << ev.action << ']'
+               << " arg[" << ev.argument << ']'
+               << " x[" << ev.x << ']'
+               << " y[" << ev.y << ']'
+               << " button[" << ev.button() << ']'
                << endl;
 
        // e.g. Qt mouse press when no buffer