anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use doctring as LBUFFER() etc parameters

Browse Source
This commit is contained in:
Kornel Benko 2013-04-27 21:38:01 +02:00
parent 07ca50d905
commit 06d72d6ca0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferView.cpp
View File

@ -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

2
src/CutAndPaste.cpp
View File

@ -685,7 +685,7 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
{
errorlist.clear();
LBUFERR(!in.paragraphs().empty(), "");
LBUFERR(!in.paragraphs().empty(), from_ascii(""));
if (oldone == newone)
return;

4
src/DocIterator.cpp
View File

@ -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;

2
src/Paragraph.cpp
View File

@ -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;