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

Compile fix: solve the merge conflicts in the correct way ;)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36607 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-11-29 23:47:55 +00:00
parent c42a61c5ac
commit 80c1e18bda
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/InsetInfo.cpp
View File

@ -452,7 +452,7 @@ void InsetInfo::updateInfo()
} }
docstring InsetInfo::contextMenuName() const docstring InsetInfo::contextMenu(BufferView const &, int, int) const
{ {
//FIXME: We override the implementation of InsetCollapsable, //FIXME: We override the implementation of InsetCollapsable,
//because this inset is not a collapsable inset. //because this inset is not a collapsable inset.

2
src/insets/InsetInfo.h
View File

@ -126,7 +126,7 @@ public:
/// ///
docstring toolTip(BufferView const & bv, int x, int y) const; docstring toolTip(BufferView const & bv, int x, int y) const;
/// ///
docstring contextMenuName() const; docstring contextMenu(BufferView const &, int, int) const;
/// ///
docstring contextMenuName() const; docstring contextMenuName() const;
/// should paragraph indendation be ommitted in any case? /// should paragraph indendation be ommitted in any case?

2
src/insets/InsetTabular.cpp
View File

@ -3327,7 +3327,7 @@ void InsetTabular::write(ostream & os) const
} }
docstring InsetTabular::contextMenuName() const docstring InsetTabular::contextMenu(BufferView const &, int, int) const
{ {
// FIXME: depending on the selection state, // FIXME: depending on the selection state,
// we could offer a different menu. // we could offer a different menu.

2
src/insets/InsetText.cpp
View File

@ -813,7 +813,7 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
} }
docstring InsetText::contextMenuName() const docstring InsetText::contextMenu(BufferView const &, int, int) const
{ {
docstring context_menu = contextMenuName(); docstring context_menu = contextMenuName();
if (context_menu != InsetText::contextMenuName()) if (context_menu != InsetText::contextMenuName())