Initialize recently added forceownlines_ bool

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index bb8602c3dfec5fd9cfe7445d92dceb97c54b83e7..c96a7c9e7d11375d5a2fac0ec9537743a63fe0c1 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -78,14 +78,14 @@ BoxTranslatorLoc initBoxtranslatorLoc()
 
 BoxTranslator const & boxtranslator()
 {
-       static BoxTranslator translator = initBoxtranslator();
+       static BoxTranslator const translator = initBoxtranslator();
        return translator;
 }
 
 
 BoxTranslatorLoc const & boxtranslator_loc()
 {
-       static BoxTranslatorLoc translator = initBoxtranslatorLoc();
+       static BoxTranslatorLoc const translator = initBoxtranslatorLoc();
        return translator;
 }
 
@@ -162,7 +162,7 @@ void InsetBox::setButtonLabel()
 
 bool InsetBox::hasFixedWidth() const
 {
-       return from_ascii(params_.width.asLatexString()) != "-9.99\\columnwidth";
+       return !params_.width.empty();
 }
 
 
@@ -273,6 +273,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 
        string width_string = params_.width.asLatexString();
        bool stdwidth = false;
+       // FIXME: do not test explicitely values of width_string
        if (params_.inner_box &&
                        (width_string.find("1.0\\columnwidth") != string::npos
                        || width_string.find("1.0\\textwidth") != string::npos)) {
@@ -316,10 +317,9 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                os << "\\begin{framed}%\n";
                break;
        case Boxed:
-               // "-999col%" is the code for no width
-               if (from_ascii(width_string) != "-9.99\\columnwidth") {
-                       os << "\\framebox";
+               if (!width_string.empty()) {
                        if (!params_.inner_box) {
+                               os << "\\framebox";
                                // Special widths, see usrguide sec. 3.5
                                // FIXME UNICODE
                                if (params_.special != "none") {
@@ -331,7 +331,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                                           << ']';
                                if (params_.hor_pos != 'c')
                                        os << "[" << params_.hor_pos << "]";
-                       }
+                       } else
+                               os << "\\fbox";
                } else
                        os << "\\fbox";
                os << "{";
@@ -358,8 +359,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
                if (params_.use_parbox)
                        os << "\\parbox";
                else if (params_.use_makebox) {
-                       // "-999col%" is the code for no width
-                       if (from_ascii(width_string) != "-9.99\\columnwidth") {
+                       if (!width_string.empty()) {
                                os << "\\makebox";
                                // FIXME UNICODE
                                // output the width and horizontal position