X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=782a05f7ea16538e31f8ebd6bbc2691bb416cdbd;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=1ef87a0f7231a15bdba934c807798bd09bfbb02a;hpb=a2c6c069083e5f7a10e30510c9c57146a2305bec;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 1ef87a0f72..782a05f7ea 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -583,12 +583,15 @@ void LocalLayout::validate() {
 		toqstr("<p style=\"color: #c00000; font-weight: bold; \">") 
 		  + invalid + toqstr("</p>");
 
-	string const layout = fromqstr(locallayoutTE->document()->toPlainText());
-	if (layout.empty())
+	string const layout = 
+		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+	if (layout.empty()) {
 		is_valid_ = true;
-	else
+		infoLB->setText("");
+	} else {
 		is_valid_ = TextClass::validate(layout);
-	infoLB->setText(is_valid_ ? vtext : ivtext);
+		infoLB->setText(is_valid_ ? vtext : ivtext);
+	}
 	validatePB->setEnabled(false);
 }
 
@@ -1243,6 +1246,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(latexModule, qt_("Document Class"));
 	docPS->addPanel(masterChildModule, qt_("Child Documents"));
 	docPS->addPanel(modulesModule, qt_("Modules"));
+	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->addPanel(fontModule, qt_("Fonts"));
 	docPS->addPanel(textLayoutModule, qt_("Text Layout"));
 	docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
@@ -1260,7 +1264,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(branchesModule, qt_("Branches"));
 	docPS->addPanel(outputModule, qt_("Output"));
 	docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
-	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
@@ -2779,10 +2782,7 @@ void GuiDocument::paramsToDialog()
 	}
 
 	// Master/Child
-	std::vector<Buffer *> children;
-	if (bufferview())
-		children = buffer().getChildren(false);
-	if (children.empty()) {
+	if (!buffer().hasChildren()) {
 		masterChildModule->childrenTW->clear();
 		includeonlys_.clear();
 		docPS->showPanel(qt_("Child Documents"), false);
@@ -3045,9 +3045,9 @@ void GuiDocument::updateIncludeonlys()
 		masterChildModule->maintainAuxCB->setEnabled(true);
 	}
 	QTreeWidgetItem * item = 0;
-	std::vector<Buffer *> children = buffer().getChildren(false);
-	vector<Buffer *>::const_iterator it  = children.begin();
-	vector<Buffer *>::const_iterator end = children.end();
+	ListOfBuffers children = buffer().getChildren();
+	ListOfBuffers::const_iterator it  = children.begin();
+	ListOfBuffers::const_iterator end = children.end();
 	bool has_unincluded = false;
 	bool all_unincluded = true;
 	for (; it != end; ++it) {