X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=8def8c6f228526645b12cf7cc5b613f76d5c00d4;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=b3f87159a7301d700c7c39cb002ada5545a98ac4;hpb=68b0cca2e701e4959ffb4754184b9b28110b8e7f;p=lyx.git diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index b3f87159a7..8def8c6f22 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -19,6 +19,7 @@ #include "encoding.h" #include "gettext.h" #include "language.h" +#include "lyxrow.h" #include "lyxtext.h" #include "outputparams.h" #include "paragraph_pimpl.h" @@ -96,6 +97,9 @@ void breakParagraph(BufferParams const & bparams, Paragraph & par = pars[par_offset]; + // we will invalidate the row cache + par.rows().clear(); + // without doing that we get a crash when typing at the // end of a paragraph tmp->layout(bparams.getLyXTextClass().defaultLayout()); @@ -316,45 +320,6 @@ LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars) } -pit_type outerPar(Buffer const & buf, InsetBase const * inset) -{ - ParIterator pit = const_cast(buf).par_iterator_begin(); - ParIterator end = const_cast(buf).par_iterator_end(); - for ( ; pit != end; ++pit) { - LyXText * text; - // the second '=' below is intentional - for (int i = 0; (text = inset->getText(i)); ++i) - if (&text->paragraphs() == &pit.plist()) - return pit.outerPar(); - - InsetList::const_iterator ii = pit->insetlist.begin(); - InsetList::const_iterator iend = pit->insetlist.end(); - for ( ; ii != iend; ++ii) - if (ii->inset == inset) - return pit.outerPar(); - } - lyxerr << "outerPar: should not happen" << endl; - BOOST_ASSERT(false); - return buf.paragraphs().size(); // shut up compiler -} - - -/// return the range of pars [beg, end[ owning the range of y [ystart, yend] -void getParsInRange(ParagraphList & pars, int ystart, int yend, - pit_type & beg, pit_type & end) -{ - BOOST_ASSERT(!pars.empty()); - pit_type const endpar = pars.size(); - pit_type const begpar = 0; - - for (beg = endpar - 1; beg != begpar && pars[beg].y > ystart; --beg) - ; - - for (end = beg ; end != endpar && pars[end].y <= yend; ++end) - ; -} - - /// return the number of InsetOptArg in a paragraph int numberOfOptArgs(Paragraph const & par) { @@ -368,5 +333,3 @@ int numberOfOptArgs(Paragraph const & par) } return num; } - -