The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 06d72d6ca095dfa08c3c7aeb40a71ec4875b4d29 Author: Kornel Benko <[email protected]> Date: Sat Apr 27 21:38:01 2013 +0200 Use doctring as LBUFFER() etc parameters diff --git a/src/BufferView.cpp b/src/BufferView.cpp index c32d295..32445ca 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -876,7 +876,7 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter) if (tm.contains(bot_pit)) { ParagraphMetrics const & pm = tm.parMetrics(bot_pit); - LBUFERR(!pm.rows().empty(), ""); + LBUFERR(!pm.rows().empty(), from_ascii("")); // FIXME: smooth scrolling doesn't work in mathed. CursorSlice const & cs = dit.innerTextSlice(); int offset = coordOffset(dit).y_; @@ -2401,7 +2401,7 @@ TextMetrics const & BufferView::textMetrics(Text const * t) const TextMetrics & BufferView::textMetrics(Text const * t) { - LBUFERR(t, ""); + LBUFERR(t, from_ascii("")); TextMetricsCache::iterator tmc_it = d->text_metrics_.find(t); if (tmc_it == d->text_metrics_.end()) { tmc_it = d->text_metrics_.insert( @@ -2792,7 +2792,7 @@ Point BufferView::coordOffset(DocIterator const & dit) const TextMetrics const & tm = textMetrics(sl.text()); ParagraphMetrics const & pm = tm.parMetrics(sl.pit()); - LBUFERR(!pm.rows().empty(), ""); + LBUFERR(!pm.rows().empty(), from_ascii("")); y -= pm.rows()[0].ascent(); #if 1 // FIXME: document this mess diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 893c9ef..0fe6757 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -685,7 +685,7 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, { errorlist.clear(); - LBUFERR(!in.paragraphs().empty(), ""); + LBUFERR(!in.paragraphs().empty(), from_ascii("")); if (oldone == newone) return; diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 8239000..5c44bf2 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -210,7 +210,7 @@ FontSpan DocIterator::locateWord(word_location const loc) const CursorSlice const & DocIterator::innerTextSlice() const { - LBUFERR(!empty(), ""); + LBUFERR(!empty(), from_ascii("")); // go up until first non-0 text is hit // (innermost text is 0 in mathed) for (int i = depth() - 1; i >= 0; --i) @@ -219,7 +219,7 @@ CursorSlice const & DocIterator::innerTextSlice() const // This case is in principe not possible. We _must_ // be inside a Text. - LBUFERR(false, ""); + LBUFERR(false, from_ascii("")); // Squash warning static const CursorSlice c; return c; diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index a4eb93f..f34877b 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -1044,7 +1044,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, unsigned int & column) { Inset * inset = owner_->getInset(i); - LBUFERR(inset, ""); + LBUFERR(inset, from_ascii("")); if (style.pass_thru) { odocstringstream ods; ----------------------------------------------------------------------- Summary of changes: src/BufferView.cpp | 6 +++--- src/CutAndPaste.cpp | 2 +- src/DocIterator.cpp | 4 ++-- src/Paragraph.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- The LyX Source Repository
