fix #832

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index ab4d2dc727a31fa045ade32f578ebf5598a7a84c..1cb80029f30f2c309ad92aaff0855dff14ee0d04 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -7,8 +7,8 @@
  *
  * Full author contact details are available in file CREDITS
  */
-#include <config.h>
 
+#include <config.h>
 
 #include "insetinclude.h"
 #include "buffer.h"
@@ -18,8 +18,10 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "Lsstream.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
+#include "Lsstream.h"
 
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
@@ -28,7 +30,8 @@
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/FileMonitor.h"
-#include "support/lstrings.h"
+#include "support/lstrings.h" // contains
+#include "support/tostr.h"
 
 #include "graphics/PreviewedInset.h"
 #include "graphics/PreviewImage.h"
@@ -37,7 +40,6 @@
 
 #include <cstdlib>
 
-
 using std::ostream;
 using std::endl;
 using std::vector;
@@ -80,12 +82,7 @@ namespace {
 string const uniqueID()
 {
        static unsigned int seed = 1000;
-
-       ostringstream ost;
-       ost << "file" << ++seed;
-
-       // Needed if we use lyxstring.
-       return STRCONV(ost.str());
+       return "file" + tostr(++seed);
 }
 
 } // namespace anon
@@ -115,38 +112,31 @@ InsetInclude::~InsetInclude()
 
 dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
 {
-       dispatch_result result = UNDISPATCHED;
-
        switch (cmd.action) {
+
        case LFUN_INSET_MODIFY: {
                InsetInclude::Params p;
                InsetIncludeMailer::string2params(cmd.argument, p);
-               if (p.cparams.getCmdName().empty())
-                       break;
-
-               set(p);
-               params_.masterFilename_ = cmd.view()->buffer()->fileName();
-
-               cmd.view()->updateInset(this);
-               result = DISPATCHED;
+               if (!p.cparams.getCmdName().empty()) {
+                       set(p);
+                       params_.masterFilename_ = cmd.view()->buffer()->fileName();
+                       cmd.view()->updateInset(this);
+               }
+               return DISPATCHED;
        }
-       break;
 
-       case LFUN_INSET_DIALOG_UPDATE: {
-               InsetIncludeMailer mailer(*this);
-               mailer.updateDialog(cmd.view());
-       }
-       break;
+       case LFUN_INSET_DIALOG_UPDATE: 
+               InsetIncludeMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
 
        case LFUN_MOUSE_RELEASE:
-               edit(cmd.view(), cmd.x, cmd.y, cmd.button());
-               break;
+       case LFUN_INSET_EDIT:
+               InsetIncludeMailer(*this).showDialog(cmd.view());
+               return DISPATCHED;
 
        default:
-               break;
+               return UNDISPATCHED;
        }
-
-       return result;
 }
 
 
@@ -158,11 +148,8 @@ InsetInclude::Params const & InsetInclude::params() const
 
 bool InsetInclude::Params::operator==(Params const & o) const
 {
-       if (cparams == o.cparams && flag == o.flag &&
-           masterFilename_ == o.masterFilename_)
-               return true;
-
-       return false;
+       return cparams == o.cparams && flag == o.flag &&
+           masterFilename_ == o.masterFilename_;
 }
 
 
@@ -177,7 +164,7 @@ void InsetInclude::set(Params const & p)
        params_ = p;
 
        string command;
- 
+
        switch (params_.flag) {
                case INCLUDE:
                        command="include";
@@ -192,9 +179,9 @@ void InsetInclude::set(Params const & p)
                        command="verbatiminput*";
                        break;
        }
- 
-       params_.cparams.setCmdName(command); 
- 
+
+       params_.cparams.setCmdName(command);
+
        if (preview_->monitoring())
                preview_->stopMonitoring();
 
@@ -212,19 +199,6 @@ Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 }
 
 
-void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
-{
-       InsetIncludeMailer mailer(*this);
-       mailer.showDialog(bv);
-}
-
-
-void InsetInclude::edit(BufferView * bv, bool)
-{
-       edit(bv, 0, 0, mouse_button::none);
-}
-
-
 void InsetInclude::write(Buffer const *, ostream & os) const
 {
        os << "Include " << params_.cparams.getCommand() << '\n'
@@ -277,12 +251,6 @@ string const InsetInclude::getScreenLabel(Buffer const *) const
 }
 
 
-string const InsetInclude::getRelFileBaseName() const
-{
-       return OnlyFilename(ChangeExtension(params_.cparams.getContents(), string()));
-}
-
-
 string const InsetInclude::getFileName() const
 {
        return MakeAbsPath(params_.cparams.getContents(),
@@ -312,7 +280,7 @@ bool InsetInclude::loadIfNeeded() const
        if (!finfo.isOK())
                return false;
 
-       return bufferlist.loadLyXFile(getFileName(), false) != 0;
+       return bufferlist.loadLyXFile(getFileName(), false) != 0;
 }
 
 
@@ -647,7 +615,10 @@ void InsetIncludeMailer::string2params(string const & in,
 {
        params = InsetInclude::Params();
 
-       istringstream data(in);
+       if (in.empty())
+               return;
+       
+       istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -668,7 +639,7 @@ void InsetIncludeMailer::string2params(string const & in,
        }
 
        if (lex.isOK()) {
-               InsetInclude inset(params);     
+               InsetInclude inset(params);
                inset.read(0, lex);
                params = inset.params();
        }
@@ -684,6 +655,5 @@ InsetIncludeMailer::params2string(InsetInclude::Params const & params)
        data << name_ << ' ';
        inset.write(0, data);
        data << "\\end_inset\n";
-
-       return data.str();
+       return STRCONV(data.str());
 }