From: Uwe Stöhr <uwestoehr@web.de>
Date: Sat, 11 Jul 2009 13:41:34 +0000 (+0000)
Subject: InsetTabular.cpp:
X-Git-Tag: 2.0.0~6090
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6776598761077ac5f84f27ac28a2b40644de2e67;p=features.git

InsetTabular.cpp:
- longtables cannot have a valignment, tables not a longtablealignment

- squash a compiler warning

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 001be8e7d7..e600d4499b 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1326,10 +1326,14 @@ void Tabular::write(ostream & os) const
 	os << "<features"
 	   << write_attribute("rotate", rotate)
 	   << write_attribute("booktabs", use_booktabs)
-	   << write_attribute("islongtable", is_long_tabular)
-	   << write_attribute("tabularvalignment", tabular_valignment)
-	   << write_attribute("longtabularalignment", longtabular_alignment)
-	   << write_attribute("firstHeadTopDL", endfirsthead.topDL)
+	   << write_attribute("islongtable", is_long_tabular);
+	// longtables cannot be aligned vertically
+    if (!is_long_tabular)
+	   os << write_attribute("tabularvalignment", tabular_valignment);
+	if (is_long_tabular)
+	   os << write_attribute("longtabularalignment",
+	                         longtabular_alignment);
+	os << write_attribute("firstHeadTopDL", endfirsthead.topDL)
 	   << write_attribute("firstHeadBottomDL", endfirsthead.bottomDL)
 	   << write_attribute("firstHeadEmpty", endfirsthead.empty)
 	   << write_attribute("headTopDL", endhead.topDL)
@@ -4166,6 +4170,8 @@ Inset::DisplayType InsetTabular::display() const
 				return AlignCenter;
 			case Tabular::LYX_LONGTABULAR_ALIGN_RIGHT:
 				return AlignRight;
+			default:
+				return AlignCenter;
 			}
 		} else
 			return Inline;