From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Thu, 23 Sep 2021 23:19:28 +0000 (+0200)
Subject: Fix a few warnings in Floating.
X-Git-Tag: 2.4-beta2~1175
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dca39815;p=lyx.git

Fix a few warnings in Floating.
---

diff --git a/src/Floating.cpp b/src/Floating.cpp
index ecd325f3d3..d396e8a2c7 100644
--- a/src/Floating.cpp
+++ b/src/Floating.cpp
@@ -85,6 +85,10 @@ Floating::Floating(string const & type, string const & placement,
 		// Specific floats for achemso.
 		else if (docbook_float_type_ == "figure" && achemso.find(floattype_) != achemso.end())
 			docbook_attr_ += " type='" + floattype_ + "'";
+
+		// Finally, merge in the attributes given in argument.
+		if (!docbookAttr.empty())
+			docbook_attr_ += " " + docbookAttr;
 	}
 }
 
diff --git a/src/Floating.h b/src/Floating.h
index 7461e96192..7af2334148 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -143,7 +143,7 @@ private:
 	/// DocBook tag type (block, paragraph, inline)
 	mutable std::string docbook_tag_type_;
 	/// DocBook float type, to override float_type_ (figure, table, algorithm, video)
-	mutable std::string docbook_float_type_;
+	std::string docbook_float_type_;
 };