From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 25 Dec 2016 16:23:07 +0000 (+0100)
Subject: Use master buffer params for quote style
X-Git-Tag: 2.3.0alpha1~576
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7533e7a0a18fad7ccb0b395017d790a07698d87a;p=lyx.git

Use master buffer params for quote style

+ some formatting polishment
---

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 3ea36f5fe7..1119cc3c7c 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1688,31 +1688,40 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
 	MenuDefinition iqs;
 	MenuDefinition rqs;
 	MenuDefinition xqs;
-	InsetQuotesParams::QuoteStyle globalqs = bv->buffer().params().quotes_style;
+	InsetQuotesParams::QuoteStyle globalqs =
+			bv->buffer().masterBuffer()->params().quotes_style;
 	FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xld"));
-	docstring desc = bformat(_("%1$stext (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::PrimaryQuotes,
-										   InsetQuotesParams::OpeningQuote)));
+	docstring desc = bformat(_("%1$stext (dynamic)"),
+				 docstring(1, quoteparams.getQuoteChar(globalqs,
+								       InsetQuotesParams::PrimaryQuotes,
+								       InsetQuotesParams::OpeningQuote)));
 	if (prefixIs(qtype, "x"))
 		add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	else
 		xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xls"));
-	desc = bformat(_("%1$stext (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::SecondaryQuotes,
-										 InsetQuotesParams::OpeningQuote)));
+	desc = bformat(_("%1$stext (dynamic)"),
+		       docstring(1, quoteparams.getQuoteChar(globalqs, 
+							     InsetQuotesParams::SecondaryQuotes,
+							     InsetQuotesParams::OpeningQuote)));
 	if (prefixIs(qtype, "x"))
 		add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	else
 		xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xrd"));
-	desc = bformat(_("text%1$s (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::PrimaryQuotes,
-										 InsetQuotesParams::ClosingQuote)));
+	desc = bformat(_("text%1$s (dynamic)"),
+		       docstring(1, quoteparams.getQuoteChar(globalqs,
+							     InsetQuotesParams::PrimaryQuotes,
+							     InsetQuotesParams::ClosingQuote)));
 	if (prefixIs(qtype, "x"))
 		add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	else
 		xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xrs"));
-	desc = bformat(_("text%1$s (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::SecondaryQuotes,
-										 InsetQuotesParams::ClosingQuote)));
+	desc = bformat(_("text%1$s (dynamic)"),
+		       docstring(1, quoteparams.getQuoteChar(globalqs,
+							     InsetQuotesParams::SecondaryQuotes,
+							     InsetQuotesParams::ClosingQuote)));
 	if (prefixIs(qtype, "x"))
 		add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
 	else