ws changes only

[lyx.git] / src / insets / insetminipage.C

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 9d9abf6fcf72639184508152fadefe2ac45b7444..5480c181ab2be15dd870b099521a6218fe363b22 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -17,11 +17,15 @@
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
 
 #include "support/std_sstream.h"
 
+
+using std::string;
 using std::endl;
 using std::auto_ptr;
 using std::istringstream;
@@ -201,9 +205,7 @@ void InsetMinipage::read(Buffer const & buf, LyXLex & lex)
 
 void InsetMinipage::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (collapsed_)
-               dimension_collapsed(dim);
-       else {
+       if (isOpen()) {
                Dimension d;
                MetricsInfo m = mi;
                m.base.textwidth = params_.width.inPixels(mi.base.textwidth);
@@ -223,7 +225,9 @@ void InsetMinipage::metrics(MetricsInfo & mi, Dimension & dim) const
                        break;
                }
                dim.wid = d.wid;
-       }
+       } else
+               dimension_collapsed(dim);
+
        dim_ = dim;
 }
 
@@ -314,7 +318,7 @@ void InsetMinipageMailer::string2params(string const & in,
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0, 0);
        lex.setStream(data);
 
@@ -346,5 +350,5 @@ InsetMinipageMailer::params2string(InsetMinipage::Params const & params)
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-       return STRCONV(data.str());
+       return data.str();
 }