[LyX/master] InsetTabular: move XML helper methods to private

Thibaut Cuvelier tcuvelier at lyx.org
Thu Sep 1 22:43:21 UTC 2022


commit ff9f3c774edb513dab96e33fbc18a6856e3ab323
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Thu Sep 1 23:35:52 2022 +0200

    InsetTabular: move XML helper methods to private
    
    They are not needed outside InsetTabular.
---
 src/insets/InsetTabular.h |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 73e61f2..1bd49f1 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -953,20 +953,6 @@ public:
 				idx_type cell, row_type row, col_type column,
 				std::vector<unsigned int> const &,
 				bool onlydata, size_t max_length) const;
-	///
-	docstring xmlRow(XMLStream & xs, row_type row, OutputParams const &,
-	                 bool header = false, bool is_xhtml = true,
-					 BufferParams::TableOutput docbook_table_output = BufferParams::TableOutput::HTMLTable) const;
-	void xmlHeader(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
-	void xmlFooter(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
-	void xmlBody(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
-	XmlRowWiseBorders computeXmlBorders(row_type row) const;
-	std::vector<std::string> computeCssStylePerCell(row_type row, col_type col, idx_type cell) const;
-
-	/// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
-	std::string getHAlignAsXmlAttribute(idx_type cell, bool is_xhtml = true) const;
-	/// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
-	std::string getVAlignAsXmlAttribute(idx_type cell) const;
 
 	/// change associated Buffer
 	void setBuffer(Buffer & buffer);
@@ -978,6 +964,21 @@ public:
 private:
 	Buffer * buffer_;
 
+	/// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
+	std::string getHAlignAsXmlAttribute(idx_type cell, XmlOutputFormat output_format) const;
+	/// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
+	std::string getVAlignAsXmlAttribute(idx_type cell) const;
+
+	/// Helpers for XML tables (XHTML or DocBook).
+	docstring xmlRow(XMLStream & xs, row_type row, OutputParams const &,
+	                 bool header = false, bool is_xhtml = true,
+	                 BufferParams::TableOutput docbook_table_output = BufferParams::TableOutput::HTMLTable) const;
+	void xmlHeader(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
+	void xmlFooter(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
+	void xmlBody(XMLStream & xs, OutputParams const &, bool is_xhtml) const;
+	XmlRowWiseBorders computeXmlBorders(row_type row) const;
+	std::vector<std::string> computeCssStylePerCell(row_type row, col_type col, idx_type cell) const;
+
 }; // Tabular
 
 


More information about the lyx-cvs mailing list