LyXText if we didn't create a new LyXText as it is not needed then.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3726
a592a061-630c-0410-9148-
cb99ea01b6c8
pos_type selendpos = 0;
bool selection = false;
bool mark_set = false;
pos_type selendpos = 0;
bool selection = false;
bool mark_set = false;
+ bool text_found = false;
// the new buffer_ with the correct width.
bv_->text = textcache.findFit(buffer_, workarea_.workWidth());
if (bv_->text) {
// the new buffer_ with the correct width.
bv_->text = textcache.findFit(buffer_, workarea_.workWidth());
if (bv_->text) {
if (lyxerr.debugging()) {
lyxerr << "Found a LyXText that fits:\n";
textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_.workWidth(), bv_->text)));
if (lyxerr.debugging()) {
lyxerr << "Found a LyXText that fits:\n";
textcache.show(lyxerr, make_pair(buffer_, make_pair(workarea_.workWidth(), bv_->text)));
// please tell me WHY the heck you deactivated this code, whoever
// 'you' are (Jug 20020311)
#if 1
// please tell me WHY the heck you deactivated this code, whoever
// 'you' are (Jug 20020311)
#if 1
- buffer_->resizeInsets(bv_);
+ if (!text_found)
+ buffer_->resizeInsets(bv_);
#endif
// this will scroll the screen such that the cursor becomes visible
updateScrollbar();
#endif
// this will scroll the screen such that the cursor becomes visible
updateScrollbar();
+2002-03-12 Juergen Vigna <jug@sad.it>
+
+ * BufferView_pimpl.C (resizeCurrentBuffer): only resize insets if we
+ did resize the LyXText too.
+
+ * buffer.C (readLyXformat2): set layout information on newly allocated
+ paragraphs.
+
+ * tabular.C (OldFormatRead): set layout information on the paragraph.
+
2002-03-12 José Abílio Oliveira Matos <jamatos@novalis.fc.up.pt>
* buffer.C (simpleDocBookOnePar): fix empty definition case for now.
2002-03-12 José Abílio Oliveira Matos <jamatos@novalis.fc.up.pt>
* buffer.C (simpleDocBookOnePar): fix empty definition case for now.
if (!par) {
par = new Paragraph;
if (!par) {
par = new Paragraph;
+ par->layout(textclasslist[params.textclass].defaultLayoutName());
} else {
// We are inserting into an existing document
users->text->breakParagraph(users);
} else {
// We are inserting into an existing document
users->text->breakParagraph(users);
first_par = par;
else {
par = new Paragraph(par);
first_par = par;
else {
par = new Paragraph(par);
+ par->layout(textclasslist[params.textclass].defaultLayoutName());
}
pos = 0;
par->layout(layoutname);
}
pos = 0;
par->layout(layoutname);
#include "frontends/Alert.h"
#include "gettext.h"
#include "tabular_funcs.h"
#include "frontends/Alert.h"
#include "gettext.h"
#include "tabular_funcs.h"
+#include "lyxtextclasslist.h"
#include <algorithm>
#include <cstdlib>
#include <algorithm>
#include <cstdlib>
/* activates all lines and sets all widths to 0 */
void LyXTabular::Init(BufferParams const & bp,
/* activates all lines and sets all widths to 0 */
void LyXTabular::Init(BufferParams const & bp,
- int rows_arg, int columns_arg, LyXTabular const * lt)
+ int rows_arg, int columns_arg, LyXTabular const * lt)
{
rows_ = rows_arg;
columns_ = columns_arg;
{
rows_ = rows_arg;
columns_ = columns_arg;
void LyXTabular::OldFormatRead(BufferParams const & bp,
void LyXTabular::OldFormatRead(BufferParams const & bp,
- LyXLex & lex, string const & fl)
+ LyXLex & lex, string const & fl)
Paragraph * par = new Paragraph;
Paragraph * return_par = 0;
Paragraph * par = new Paragraph;
Paragraph * return_par = 0;
+ par->layout(textclasslist[bp.textclass].defaultLayoutName());
string tmptok;
int pos = 0;
Paragraph::depth_type depth = 0;
string tmptok;
int pos = 0;
Paragraph::depth_type depth = 0;