remove paragraph::autoBreakRows

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9397 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index c37e150eb8b347a16ca89735bdb9410f2ee8878c..24d03d44b22242ecd514237852b3d4bfeabd31c7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-17  Alfredo Braunstein  <abraunst@lyx.org>
+
+       * paragraph.[Ch] (autoBreakRows): remove
+
+       * lyxtext.h: move autoBreakRows_ flag from InsetText to here.
+
+       * buffer.[Ch] (insertStringAsLines): receive an autobreakrows bool to
+       avoid using the paragraph one
+
+       * text2.C (LyXText, insertStringAsLines): adjust
+       
 2004-12-16  Angus Leeming  <leeming@lyx.org>
 
        * bufferlist.C:

diff --git a/src/buffer.C b/src/buffer.C
index 37ec8955e8a5879cb62cbd11f1dcf8c250acdfc5..610a56a78c31966d50500f7a84852f6a4a70fc0f 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -474,7 +474,7 @@ bool Buffer::readDocument(LyXLex & lex)
 // needed to insert the selection
 void Buffer::insertStringAsLines(ParagraphList & pars,
        pit_type & par, pos_type & pos,
-       LyXFont const & fn, string const & str)
+       LyXFont const & fn, string const & str, bool autobreakrows)
 {
        LyXLayout_ptr const & layout = pars[par].layout();
 
@@ -483,7 +483,6 @@ void Buffer::insertStringAsLines(ParagraphList & pars,
        pars[par].checkInsertChar(font);
        // insert the string, don't insert doublespace
        bool space_inserted = true;
-       bool autobreakrows = pars[par].autoBreakRows();
        for (string::const_iterator cit = str.begin();
            cit != str.end(); ++cit) {
                if (*cit == '\n') {

diff --git a/src/buffer.h b/src/buffer.h
index 67b8c859b758e7bfc5f6e48f90341e18aff4e86b..9e7b9a1675eb96d4ba5c41e4888be304cd0a734e 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -99,7 +99,7 @@ public:
        ///
        void insertStringAsLines(ParagraphList & plist,
                lyx::pit_type &, lyx::pos_type &,
-               LyXFont const &, std::string const &);
+               LyXFont const &, std::string const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index d20b7fce59902fbd32a521a8d6689ee383c07f3e..fd9ae88b087cb14747efc62204220d3c01bddc04 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+
+2004-12-17  Alfredo Braunstein  <abraunst@lyx.org>
+
+       * insettext.[Ch] : move autoBreakRows_ bool to LyXText 
+
 2004-12-15  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * insettabular.C (tabularFeatures): re-enable SET_ALL_LINES and

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index ee35d1f1aa9de72d5aa63910f9bbd514ed20eca1..fdb2c5611aef0c6d7b8eb2e9cf17c48bc5f38713 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -72,8 +72,7 @@ using std::vector;
 
 
 InsetText::InsetText(BufferParams const & bp)
-       : autoBreakRows_(false), drawFrame_(false),
-         frame_color_(LColor::insetframe), text_(0)
+       : drawFrame_(false), frame_color_(LColor::insetframe), text_(0)
 {
        paragraphs().push_back(Paragraph());
        paragraphs().back().layout(bp.getLyXTextClass().defaultLayout());
@@ -86,7 +85,7 @@ InsetText::InsetText(BufferParams const & bp)
 InsetText::InsetText(InsetText const & in)
        : UpdatableInset(in), text_(in.text_.bv_owner)
 {
-       autoBreakRows_ = in.autoBreakRows_;
+       text_.autoBreakRows_ = in.text_.autoBreakRows_;
        drawFrame_ = in.drawFrame_;
        frame_color_ = in.frame_color_;
        text_.paragraphs() = in.text_.paragraphs();
@@ -226,7 +225,7 @@ void InsetText::clearInset(Painter & pain, int x, int y) const
 
 void InsetText::updateLocal(LCursor & cur)
 {
-       if (!autoBreakRows_ && paragraphs().size() > 1) {
+       if (!text_.autoBreakRows_ && paragraphs().size() > 1) {
                // collapse paragraphs
                while (paragraphs().size() > 1) {
                        ParagraphList::iterator const first = paragraphs().begin();
@@ -409,8 +408,8 @@ void InsetText::setText(string const & data, LyXFont const & font)
 
 void InsetText::setAutoBreakRows(bool flag)
 {
-       if (flag != autoBreakRows_) {
-               autoBreakRows_ = flag;
+       if (flag != text_.autoBreakRows_) {
+               text_.autoBreakRows_ = flag;
                if (!flag)
                        removeNewlines();
        }

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 1390ff8e1f16c2b1db19e11d98e2041877b5495c..ad8664f1ab3abdcdb81b71dc0dcc06fa55cd2036 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -86,7 +86,7 @@ public:
        ///
        void setAutoBreakRows(bool);
        ///
-       bool getAutoBreakRows() const { return autoBreakRows_; }
+       bool getAutoBreakRows() const { return text_.autoBreakRows_; }
        ///
        void setDrawFrame(bool);
        ///
@@ -157,8 +157,6 @@ private:
        ///
        void clearInset(Painter &, int x, int y) const;
 
-       ///
-       bool autoBreakRows_;
        ///
        bool drawFrame_;
        /** We store the LColor::color value as an int to get LColor.h out

diff --git a/src/lyxtext.h b/src/lyxtext.h
index cc637f1694811a0e5ff75c57256be7e1578414d1..07b4765bd077b3a047ffca18a0b34969a8c472fc 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -352,6 +352,8 @@ public:
        /// our 'outermost' Font
        LyXFont font_;
 
+       ///
+       bool autoBreakRows_;
 private:
        /// return past-the-last paragraph influenced by a layout
        /// change on pit

diff --git a/src/paragraph.C b/src/paragraph.C
index 62667f63b6584913cdddd73dcc9f8b1938056c88..a2d4a52f351d8fbb4b8f02ea247f1ec575572725 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -716,12 +716,6 @@ bool Paragraph::forceDefaultParagraphs() const
 }
 
 
-bool Paragraph::autoBreakRows() const
-{
-       return inInset() && static_cast<InsetText *>(inInset())->getAutoBreakRows();
-}
-
-
 namespace {
 
 // paragraphs inside floats need different alignment tags to avoid

diff --git a/src/paragraph.h b/src/paragraph.h
index 8aac8031a415fbb774d711727e4f0677a707a9f6..26d11218283e4f9d982921cec162fb9a093141c7 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -169,8 +169,6 @@ public:
        ///
        InsetBase::Code ownerCode() const;
        ///
-       bool autoBreakRows() const;
-       ///
        bool forceDefaultParagraphs() const;
 
        ///

diff --git a/src/text2.C b/src/text2.C
index e406a65f6649c4eb6050cf3250a92c9b158ba660..55f9d4e1ada06aa8de6413ce27cab7f060a72932 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -74,7 +74,8 @@ using std::string;
 LyXText::LyXText(BufferView * bv)
        : maxwidth_(bv ? bv->workWidth() : 100),
          background_color_(LColor::background),
-         bv_owner(bv)
+         bv_owner(bv),
+         autoBreakRows_(false)
 {}
 
 
@@ -893,7 +894,8 @@ void LyXText::insertStringAsLines(LCursor & cur, string const & str)
 
        // only to be sure, should not be neccessary
        cur.clearSelection();
-       cur.buffer().insertStringAsLines(pars_, pit, pos, current_font, str);
+       cur.buffer().insertStringAsLines(pars_, pit, pos, current_font, str,
+               autoBreakRows_);
 
        cur.resetAnchor();
        setCursor(cur, cur.pit(), pos);