anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 11:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of InsetTabular::hasPasteBuffer. I verified that it was equivalent

Browse Source 
to cap::tabularStackDirty().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16494 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2007-01-04 11:00:09 +00:00
parent b7c5197b7e
commit 129f5b6431
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CutAndPaste.C
View File

@ -74,7 +74,7 @@ CutStack theCuts(10);
// store whether the tabular stack is newer than the normal copy stack
// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
// when we (hopefully) have a one-for-all paste mechanism.
bool dirty_tabular_stack_;
bool dirty_tabular_stack_ = false;
void region(CursorSlice const & i1, CursorSlice const & i2,

10
src/insets/insettabular.C
View File

@ -174,12 +174,6 @@ string const featureAsString(LyXTabular::Feature feature)
}
bool InsetTabular::hasPasteBuffer() const
{
return (paste_tabular.get() != 0);
}
InsetTabular::InsetTabular(Buffer const & buf, row_type rows,
col_type columns)
: tabular(buf.params(), max(rows, row_type(1)),
@ -729,7 +723,7 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
}
case LFUN_PASTE:
if (hasPasteBuffer() && tabularStackDirty()) {
if (tabularStackDirty()) {
recordUndoInset(cur, Undo::INSERT);
pasteSelection(cur);
break;
@ -1802,7 +1796,7 @@ bool InsetTabular::copySelection(LCursor & cur)
// mark tabular stack dirty
// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
// when we (hopefully) have a one-for-all paste mechanism.
cap::dirtyTabularStack(true);
dirtyTabularStack(true);
return true;
}

2
src/insets/insettabular.h
View File

@ -177,8 +177,6 @@ private:
///
void removeTabularRow();
///
bool hasPasteBuffer() const;
///
bool copySelection(LCursor & cur);
///
bool pasteSelection(LCursor & cur);