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

We don't want InsetCommand to have a function updateCommand while this is not a special function of an InsetCommand, but only accidentally a shared function of two children. So, in this case I think we should just (dynamically) cast these objecten and call their own insetCommand function.

Browse Source 
This also fixes compilation again. I forgot to cherry-pick all commits in git ;)...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35845 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-10-25 23:20:05 +00:00
parent b7764dbe42
commit 2e42a7b645
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CutAndPaste.cpp
View File

@ -36,6 +36,7 @@
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetBranch.h"
#include "insets/InsetCommand.h"
#include "insets/InsetFlex.h"
@ -271,7 +272,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
case LABEL_CODE: {
// check for duplicates
InsetCommand & lab = static_cast<InsetCommand &>(*it);
InsetLabel & lab = dynamic_cast<InsetLabel &>(*it);
docstring const oldname = lab.getParam("name");
lab.updateCommand(oldname, false);
// We need to update the buffer reference cache.
@ -309,7 +310,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
case BIBITEM_CODE: {
// check for duplicates
InsetCommand & bib = static_cast<InsetCommand &>(*it);
InsetBibitem & bib = dynamic_cast<InsetBibitem &>(*it);
docstring const oldkey = bib.getParam("key");
bib.updateCommand(oldkey, false);
// We need to update the buffer reference cache.

4
src/insets/InsetBibitem.h
View File

@ -42,6 +42,8 @@ public:
///
static bool isCompatibleCommand(std::string const & s)
{ return s == "bibitem"; }
///
void updateCommand(docstring const & new_key, bool dummy = false);
private:
/// verify label and update references.
/// Overloaded from Inset::initView.
@ -67,8 +69,6 @@ private:
/// Update the counter of this inset
void updateBuffer(ParIterator const &, UpdateType);
///
void updateCommand(docstring const & new_key, bool dummy = false);
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
///
Inset * clone() const { return new InsetBibitem(*this); }