X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettabular.h;h=21c7a728fa05cdd924df6f3402e71d32007f97d4;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=0532d31ad3b259088edfb639311e3122dcdcb52a;hpb=edd81011cecb115b1dc05cc68bf5206fa0e853dd;p=lyx.git

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 0532d31ad3..21c7a728fa 100644
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -34,6 +34,9 @@
 
 #include "inset.h"
 #include "tabular.h"
+#include "mailinset.h"
+
+namespace lyx {
 
 class FuncStatus;
 class LyXLex;
@@ -43,12 +46,7 @@ class BufferParams;
 class Paragraph;
 class CursorSlice;
 
-namespace lyx {
-namespace frontend {
-class Painter;
-}
-}
-
+namespace frontend { class Painter; }
 
 class InsetTabular : public InsetOld {
 public:
@@ -62,13 +60,13 @@ public:
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	void drawSelection(PainterInfo & pi, int x, int y) const;
 	///
-	virtual lyx::docstring const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
 	EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
@@ -84,20 +82,21 @@ public:
 	///
 	bool display() const { return tabular.isLongTabular(); }
 	///
-	int latex(Buffer const &, std::ostream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
 	Code lyxCode() const { return InsetBase::TABULAR_CODE; }
 	/// get offset of this cursor slice relative to our upper left corner
-	void cursorPos(CursorSlice const & sl, bool boundary, int & x, int & y) const;
+	void cursorPos(BufferView const & bv, CursorSlice const & sl,
+		bool boundary, int & x, int & y) const;
 	///
 	bool tabularFeatures(LCursor & cur, std::string const & what);
 	///
@@ -116,8 +115,12 @@ public:
 	///
 	LyXText * getText(int) const;
 
-	///
-	void markErased(bool);
+	/// set the change for the entire inset
+	void setChange(Change const & change);
+	/// accept the changes within the inset
+	void acceptChanges();
+	/// reject the changes within the inset
+	void rejectChanges();
 
 	// this should return true if we have a "normal" cell, otherwise false.
 	// "normal" means without width set!
@@ -125,7 +128,7 @@ public:
 	bool forceDefaultParagraphs(idx_type cell = 0) const;
 
 	///
-	void addPreview(lyx::graphics::PreviewLoader &) const;
+	void addPreview(graphics::PreviewLoader &) const;
 
 	///
 	Buffer const & buffer() const;
@@ -158,7 +161,7 @@ private:
 	virtual std::auto_ptr<InsetBase> doClone() const;
 
 	///
-	void drawCellLines(lyx::frontend::Painter &, int x, int y, row_type row,
+	void drawCellLines(frontend::Painter &, int x, int y, row_type row,
 			   idx_type cell, bool erased) const;
 	///
 	void setCursorFromCoordinates(LCursor & cur, int x, int y) const;
@@ -174,8 +177,6 @@ private:
 	///
 	void removeTabularRow();
 	///
-	bool hasPasteBuffer() const;
-	///
 	bool copySelection(LCursor & cur);
 	///
 	bool pasteSelection(LCursor & cur);
@@ -187,14 +188,14 @@ private:
 	void getSelection(LCursor & cur, row_type & rs, row_type & re,
 			  col_type & cs, col_type & ce) const;
 	///
-	bool insertAsciiString(BufferView &, lyx::docstring const & buf, bool usePaste);
+	bool insertPlaintextString(BufferView &, docstring const & buf, bool usePaste);
 	/// are we operating on several cells?
 	bool tablemode(LCursor & cur) const;
 
 	/// return the "Manhattan distance" to nearest corner
-	int dist(idx_type cell, int x, int y) const;
+	int dist(BufferView &, idx_type cell, int x, int y) const;
 	/// return the cell nearest to x, y
-	idx_type getNearestCell(int x, int y) const;
+	idx_type getNearestCell(BufferView &, int x, int y) const;
 
 	///
 	Buffer const * buffer_;
@@ -205,9 +206,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
-
 class InsetTabularMailer : public MailInset {
 public:
 	///
@@ -231,4 +229,6 @@ private:
 
 std::string const featureAsString(LyXTabular::Feature feature);
 
+} // namespace lyx
+
 #endif