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

Introduce allowMultiPar()

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20898 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-10-11 10:13:45 +00:00
parent c2b139d5a0
commit 04ee2d87fc
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Text3.cpp
View File

@ -210,8 +210,8 @@ static bool doInsertInset(Cursor & cur, Text * text,
if (gotsel && pastesel) {
lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
InsetLayout il = inset->getLayout(cur.buffer().params());
if (!il.multipar || cur.lastpit() == 0) {
if (!static_cast<InsetText *>(inset)->allowMultiPar()
|| cur.lastpit() == 0) {
// reset first par to default
LayoutPtr const layout =
cur.buffer().params().getTextClass().defaultLayout();

4
src/insets/InsetBox.cpp
View File

@ -14,6 +14,7 @@
#include "InsetBox.h"
#include "Buffer.h"
#include "BufferView.h"
#include "Cursor.h"
#include "DispatchResult.h"
@ -94,6 +95,7 @@ void InsetBox::init()
InsetBox::InsetBox(BufferParams const & bp, string const & label)
: InsetCollapsable(bp), params_(label)
{
setLayout(bp);
init();
}
@ -134,6 +136,7 @@ void InsetBox::read(Buffer const & buf, Lexer & lex)
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
setLayout(buf.params());
setButtonLabel();
}
@ -203,6 +206,7 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
setLayout(cur.buffer().params());
setButtonLabel();
break;
}

6
src/insets/InsetCollapsable.cpp
View File

@ -546,6 +546,12 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
}
bool InsetCollapsable::allowMultiPar() const
{
return layout_.multipar;
}
bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{

2
src/insets/InsetCollapsable.h
View File

@ -122,6 +122,8 @@ public:
///
bool allowSpellCheck() const { return true; }
///
bool allowMultiPar() const;
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
void setStatus(Cursor & cur, CollapseStatus st);

2
src/insets/InsetText.h
View File

@ -130,6 +130,8 @@ public:
/// should paragraph indendation be ommitted in any case?
bool neverIndent(Buffer const &) const;
///
virtual bool allowMultiPar() const { return true; }
///
InsetText(InsetText const &);
// Update the counters of this inset and of its contents