From 97f0b8686dd608de0238a585d7c40d4324c56b58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 16 Mar 2001 12:54:34 +0000 Subject: [PATCH] mathed62.diff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1784 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 10 ++++++++-- src/mathed/math_matrixinset.h | 12 +----------- src/mathed/math_parinset.C | 3 +-- src/mathed/math_parinset.h | 4 +++- src/mathed/math_rowst.C | 6 ------ src/mathed/math_rowst.h | 6 ------ 6 files changed, 13 insertions(+), 28 deletions(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 8b1e1e65a8..1199d8883e 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,9 @@ +2001-03-16 André Pönitz + + * math_matrixinset.h: + * math_parinset.[Ch]: + * math_rowst.[Ch]: move MathedRowContainer::row_ to the base + 2001-03-13 John Levon * Makefile.am: @@ -14,8 +20,8 @@ 2001-03-15 André Pönitz - * 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 diff --git a/src/mathed/math_matrixinset.h b/src/mathed/math_matrixinset.h index a3f5963979..8d67ef87f8 100644 --- 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 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 7728671c71..20309ff6f2 100644 --- 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 fc332c64e9..e414bf41ae 100644 --- 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 7128048cb5..13aab03ab3 100644 --- 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 f934bdaf2e..38805faf89 100644 --- 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 data_; - -private: - // currently unimplemented just to make sure it's not used - void operator=(MathedRowContainer const &); // unimplemented }; #endif -- 2.39.2