mathed62.diff

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

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>
 

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

src/mathed/math_parinset.C

@@ -23,8 +23,7 @@ extern int number_of_newlines;
 
 MathedRowContainer & MathParInset::getRowSt()
 {
-	static MathedRowContainer dummy;
-	return dummy;
+	return row_;
 }
 
 

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_;

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_);

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