Do not output deleted rows columns if show changes in output is false

[lyx.git] / src / insets / InsetQuotes.cpp

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 515d24119d959a93526a64f6a43b6cacfb766181..d34efa48cd4ed07d920c8c4d969f41e9b286da04 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -111,10 +111,9 @@ InsetQuotesParams::QuoteStyle InsetQuotesParams::getQuoteStyle(string const & s,
                str = "eld";
        }
 
-       int i;
-
        // '.' wildcard means: keep current style
        if (!allow_wildcards || str[0] != '.') {
+               int i;
                for (i = 0; i < stylescount(); ++i) {
                        if (str[0] == style_char[i]) {
                                res = QuoteStyle(i);
@@ -144,10 +143,9 @@ InsetQuotesParams::QuoteSide InsetQuotesParams::getQuoteSide(string const & s,
                str = "eld";
        }
 
-       int i;
-
        // '.' wildcard means: keep current side
        if (!allow_wildcards || str[1] != '.') {
+               int i;
                for (i = 0; i < 2; ++i) {
                        if (str[1] == side_char[i]) {
                                res = InsetQuotesParams::QuoteSide(i);
@@ -177,10 +175,9 @@ InsetQuotesParams::QuoteLevel InsetQuotesParams::getQuoteLevel(string const & s,
                str = "eld";
        }
 
-       int i;
-
        // '.' wildcard means: keep current level
        if (!allow_wildcards || str[2] != '.') {
+               int i;
                for (i = 0; i < 2; ++i) {
                        if (str[2] == level_char[i]) {
                                res = InsetQuotesParams::QuoteLevel(i);
@@ -588,9 +585,9 @@ docstring const InsetQuotesParams::getGuiLabel(QuoteStyle const & qs, bool langd
 }
 
 
-docstring const InsetQuotesParams::getShortGuiLabel(docstring const string)
+docstring const InsetQuotesParams::getShortGuiLabel(docstring const & str)
 {
-       std::string const s = to_ascii(string);
+       string const s = to_ascii(str);
        QuoteStyle const style = getQuoteStyle(s);
        QuoteSide const side = getQuoteSide(s);
        QuoteLevel const level = getQuoteLevel(s);