ws changes only

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

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index e7ebb7b32f21585974d03e2d0d8ba1f8f0254a77..5480c181ab2be15dd870b099521a6218fe363b22 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -12,28 +12,25 @@
 #include <config.h>
 
 #include "insetminipage.h"
-#include "insettext.h"
 
 #include "BufferView.h"
 #include "debug.h"
-#include "dimension.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
 #include "metricsinfo.h"
+#include "paragraph.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "support/std_sstream.h"
 
-#include "support/LOstream.h"
 
-using std::ostream;
+using std::string;
 using std::endl;
 using std::auto_ptr;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
 
 
 // Some information about Minipages in LaTeX:
@@ -111,7 +108,7 @@ dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd)
                /* FIXME: I refuse to believe we have to live
                 * with ugliness like this ... */
                inset.getLyXText(cmd.view())->fullRebreak();
-               cmd.view()->updateInset();
+               cmd.view()->updateInset(this);
                return DISPATCHED;
        }
 
@@ -192,14 +189,14 @@ void InsetMinipage::Params::read(LyXLex & lex)
 }
 
 
-void InsetMinipage::write(Buffer const * buf, ostream & os) const
+void InsetMinipage::write(Buffer const & buf, ostream & os) const
 {
        params_.write(os);
        InsetCollapsable::write(buf, os);
 }
 
 
-void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
+void InsetMinipage::read(Buffer const & buf, LyXLex & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -208,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);
@@ -230,7 +225,9 @@ void InsetMinipage::metrics(MetricsInfo & mi, Dimension & dim) const
                        break;
                }
                dim.wid = d.wid;
-       }
+       } else
+               dimension_collapsed(dim);
+
        dim_ = dim;
 }
 
@@ -241,7 +238,7 @@ string const InsetMinipage::editMessage() const
 }
 
 
-int InsetMinipage::latex(Buffer const * buf, ostream & os,
+int InsetMinipage::latex(Buffer const & buf, ostream & os,
                         LatexRunParams const & runparams) const
 {
        string s_pos;
@@ -321,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);
 
@@ -353,5 +350,5 @@ InsetMinipageMailer::params2string(InsetMinipage::Params const & params)
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-       return STRCONV(data.str());
+       return data.str();
 }