mathed62.diff

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8b1e1e65a80ac99fe6f6e855e7de24a0cd8f14a8..1199d8883e7c84d472e0414834c8d935635595a8 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-16  André Pönitz  <poenitz@htwm.de>
+
+       * math_matrixinset.h:
+       * math_parinset.[Ch]:
+       * math_rowst.[Ch]: move MathedRowContainer::row_ to the base
+      
 2001-03-13  John Levon  <moz@compsoc.man.ac.uk>
 
        * Makefile.am:
@@ -14,8 +20,8 @@
 
 2001-03-15  André Pönitz  <poenitz@htwm.de>
 
-       * math_cursor.C: fix bug (cursor was leaving two insets at a time instead
-          of one)
+       * math_cursor.C: fix bug (cursor was leaving two insets at a time
+          instead of one)
 
 2001-03-15  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 

diff --git a/src/mathed/math_matrixinset.h b/src/mathed/math_matrixinset.h
index a3f59639790d90e6c25def6953956cac4d4ca953..8d67ef87f829ed21b3e0558af43b5fc77ddfbedf 100644 (file)
--- a/src/mathed/math_matrixinset.h
+++ b/src/mathed/math_matrixinset.h
@@ -37,9 +37,7 @@ public:
        int GetRows() const;
        ///
        virtual bool isMatrix() const;
-       
-       /// Use this to manage the extra information independently of paragraph
-       MathedRowContainer & getRowSt();
+
 private:
        ///  Number of columns & rows
        int nc_;
@@ -52,8 +50,6 @@ private:
        ///
        //std::vector<char> h_align;
        string h_align_; // a vector would perhaps be more correct
-       /// Vertical structure
-       MathedRowContainer row_;
 };
 
 
@@ -77,10 +73,4 @@ bool MathMatrixInset::isMatrix() const
        return true;
 }
        
-
-inline
-MathedRowContainer & MathMatrixInset::getRowSt()
-{
-       return row_;
-}
 #endif

diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C
index 7728671c711f3c411f1154aa7eed9c7d29714e49..20309ff6f28c767383406b962b551a75e974d269 100644 (file)
--- a/src/mathed/math_parinset.C
+++ b/src/mathed/math_parinset.C
@@ -23,8 +23,7 @@ extern int number_of_newlines;
 
 MathedRowContainer & MathParInset::getRowSt()
 {
-       static MathedRowContainer dummy;
-       return dummy;
+       return row_;
 }
 
 

diff --git a/src/mathed/math_parinset.h b/src/mathed/math_parinset.h
index fc332c64e9b41d4a490779ef6948cc8c189c997c..e414bf41aec387713ad85ef91b3ce08745ee8eae 100644 (file)
--- a/src/mathed/math_parinset.h
+++ b/src/mathed/math_parinset.h
@@ -67,7 +67,7 @@ public:
        ///
        virtual void SetStyle(short);
        ///
-       virtual MathedRowContainer & getRowSt();
+       MathedRowContainer & getRowSt();
        ///
        virtual bool Permit(short f) const;
        ///
@@ -85,6 +85,8 @@ protected:
        void xo(int tx);
        ///
        void yo(int ty);
+       ///
+       MathedRowContainer row_;
 private:
        /// Cursor start position
        int xo_;

diff --git a/src/mathed/math_rowst.C b/src/mathed/math_rowst.C
index 7128048cb5c16fdc66241b19898741a51b783c80..13aab03ab3d0ecd2ccc48af06483926bd3dcbcb0 100644 (file)
--- a/src/mathed/math_rowst.C
+++ b/src/mathed/math_rowst.C
@@ -145,12 +145,6 @@ MathedRowContainer::iterator::operator void *() const
        return (void *)(st_ && pos_ < st_->size());
 }
 
-MathedRowStruct & MathedRowContainer::iterator::operator*()
-{
-       Assert(st_);
-       return st_->data_[pos_];
-}
-
 MathedRowStruct * MathedRowContainer::iterator::operator->()
 {
        Assert(st_);

diff --git a/src/mathed/math_rowst.h b/src/mathed/math_rowst.h
index f934bdaf2ed57eebd893953289105b7d86b4f802..38805faf89187dd899b69c0f29a2350ba97621e1 100644 (file)
--- a/src/mathed/math_rowst.h
+++ b/src/mathed/math_rowst.h
@@ -75,8 +75,6 @@ public:
                /// "better" conversion to bool
                operator void *() const;
                ///
-               MathedRowStruct & operator*();
-               ///
                MathedRowStruct * operator->();
                ///
                MathedRowStruct const * operator->() const;
@@ -115,10 +113,6 @@ public:
 //private:
        ///
        std::vector<MathedRowStruct> data_;
-
-private:
-       // currently unimplemented just to make sure it's not used
-       void operator=(MathedRowContainer const &); // unimplemented
 };
 
 #endif