mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
delete unused variables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16443 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
ceb51f7f76
commit
ad84c0ce5d
@ -577,7 +577,6 @@ void BufferView::center()
|
||||
CursorSlice & bot = cursor_.bottom();
|
||||
TextMetrics & tm = text_metrics_[bot.text()];
|
||||
pit_type const pit = bot.pit();
|
||||
int max_width = workWidth();
|
||||
tm.redoParagraph(pit);
|
||||
ParagraphMetrics const & pm = tm.parMetrics(pit);
|
||||
anchor_ref_ = pit;
|
||||
|
@ -185,8 +185,10 @@ public:
|
||||
void recUndo(LCursor & cur, pit_type first, pit_type last) const;
|
||||
///
|
||||
void recUndo(LCursor & cur, pit_type first) const;
|
||||
/// returns true if par was empty and was removed
|
||||
bool setCursorFromCoordinates(LCursor & cur, int x, int y);
|
||||
|
||||
/// sets cursor only within this LyXText.
|
||||
/// x,y are screen coordinates
|
||||
void setCursorFromCoordinates(LCursor & cur, int x, int y);
|
||||
|
||||
/// sets cursor recursively descending into nested editable insets
|
||||
/**
|
||||
|
@ -138,8 +138,6 @@ RowPainter::RowPainter(PainterInfo & pi,
|
||||
erased_(pi.erased_),
|
||||
xo_(x), yo_(y), width_(text_metrics_.width())
|
||||
{
|
||||
Buffer const & buffer = *bv_.buffer();
|
||||
int const right_margin = text_metrics_.rightMargin(pm_);
|
||||
RowMetrics m = text_metrics_.computeRowMetrics(pit_, row_);
|
||||
x_ = m.x + xo_;
|
||||
|
||||
|
@ -2070,9 +2070,7 @@ pos_type LyXText::x2pos(BufferView const & bv, pit_type pit, int row,
|
||||
//}
|
||||
|
||||
|
||||
// x,y are screen coordinates
|
||||
// sets cursor only within this LyXText
|
||||
bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
|
||||
void LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
|
||||
{
|
||||
BOOST_ASSERT(this == cur.text());
|
||||
pit_type pit = getPitNearY(cur.bv(), y);
|
||||
@ -2117,7 +2115,8 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y)
|
||||
<< " pos: " << pos
|
||||
<< endl;
|
||||
|
||||
return setCursor(cur, pit, pos, true, bound);
|
||||
setCursor(cur, pit, pos, true, bound);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
10
src/text2.C
10
src/text2.C
@ -759,7 +759,6 @@ pos_type LyXText::getColumnNearX(BufferView const & bv, int right_margin,
|
||||
TextMetrics const & tm = bv.textMetrics(this);
|
||||
int const xo = bv.coordCache().get(this, pit).x_;
|
||||
x -= xo;
|
||||
int max_witdh = tm.maxWidth();
|
||||
RowMetrics const r = tm.computeRowMetrics(pit, row);
|
||||
Paragraph const & par = pars_[pit];
|
||||
|
||||
@ -910,7 +909,6 @@ pit_type LyXText::getPitNearY(BufferView & bv, int y)
|
||||
|
||||
TextMetrics & tm = bv.textMetrics(this);
|
||||
ParagraphMetrics const & pm = tm.parMetrics(it->first);
|
||||
int max_width = tm.maxWidth();
|
||||
|
||||
// If we are off-screen (before the visible part)
|
||||
if (y < 0
|
||||
@ -972,7 +970,6 @@ pit_type LyXText::getPitNearY(BufferView & bv, int y)
|
||||
|
||||
Row const & LyXText::getRowNearY(BufferView const & bv, int y, pit_type pit) const
|
||||
{
|
||||
Paragraph const & par = pars_[pit];
|
||||
ParagraphMetrics const & pm = bv.parMetrics(this, pit);
|
||||
|
||||
int yy = bv.coordCache().get(this, pit).y_ - pm.ascent();
|
||||
@ -1002,7 +999,6 @@ InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
|
||||
|
||||
TextMetrics const & tm = cur.bv().textMetrics(this);
|
||||
ParagraphMetrics const & pm = tm.parMetrics(pit);
|
||||
Buffer const & buffer = cur.buffer();
|
||||
int right_margin = tm.rightMargin(pm);
|
||||
int xx = x; // is modified by getColumnNearX
|
||||
pos_type const pos = row.pos()
|
||||
@ -1070,13 +1066,15 @@ bool LyXText::cursorLeft(LCursor & cur)
|
||||
return setCursor(cur, cur.pit(), cur.pos(), true, true);
|
||||
}
|
||||
if (cur.pos() != 0) {
|
||||
bool boundary = cur.boundary();
|
||||
bool updateNeeded = setCursor(cur, cur.pit(), cur.pos() - 1, true, false);
|
||||
if (!checkAndActivateInset(cur, false)) {
|
||||
/** FIXME: What's this cause purpose???
|
||||
bool boundary = cur.boundary();
|
||||
if (false && !boundary &&
|
||||
bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1))
|
||||
updateNeeded |=
|
||||
setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
|
||||
*/
|
||||
}
|
||||
return updateNeeded;
|
||||
}
|
||||
@ -1126,7 +1124,6 @@ bool LyXText::cursorUp(LCursor & cur)
|
||||
// Tell BufferView to test for FitCursor in any case!
|
||||
cur.updateFlags(Update::FitCursor);
|
||||
|
||||
Paragraph const & par = cur.paragraph();
|
||||
ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
|
||||
|
||||
int row;
|
||||
@ -1181,7 +1178,6 @@ bool LyXText::cursorDown(LCursor & cur)
|
||||
// Tell BufferView to test for FitCursor in any case!
|
||||
cur.updateFlags(Update::FitCursor);
|
||||
|
||||
Paragraph const & par = cur.paragraph();
|
||||
ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
|
||||
|
||||
int row;
|
||||
|
@ -205,9 +205,7 @@ void LyXText::cursorPrevious(LCursor & cur)
|
||||
pit_type cpar = cur.pit();
|
||||
|
||||
int x = cur.x_target();
|
||||
|
||||
// FIXME: there would maybe a need for this 'updated' boolean in the future...
|
||||
bool updated = setCursorFromCoordinates(cur, x, 0);
|
||||
setCursorFromCoordinates(cur, x, 0);
|
||||
cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
|
||||
|
||||
if (cpar == cur.pit() && cpos == cur.pos())
|
||||
@ -226,8 +224,7 @@ void LyXText::cursorNext(LCursor & cur)
|
||||
pit_type cpar = cur.pit();
|
||||
|
||||
int x = cur.x_target();
|
||||
// FIXME: there would maybe a need for this 'updated' boolean in the future...
|
||||
bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
|
||||
setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
|
||||
cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
|
||||
|
||||
if (cpar == cur.pit() && cpos == cur.pos())
|
||||
|
Loading…
Reference in New Issue
Block a user