clear()->erase() ; lots of using directives for cxx

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index eed1888a8f6edab0e299fd209a73c1da7ee40c42..1d28e3347b4e8ab3b3389c3a5a03c663182e5127 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -23,6 +23,7 @@
 #include "layout.h"
 #include "lyxfunc.h"
 
+using std::ostream;
 using std::endl;
 
 extern BufferView * current_view;
@@ -283,6 +284,12 @@ void InsetInclude::Read(LyXLex & lex)
 }
 
 
+bool InsetInclude::display() const 
+{
+       return !isInput();
+}
+
+
 string InsetInclude::getScreenLabel() const
 {
        string temp;
@@ -303,6 +310,14 @@ string InsetInclude::getScreenLabel() const
 }
 
 
+void InsetInclude::setContents(string const & c)
+{
+       InsetCommand::setContents(c);
+       filename = MakeAbsPath(contents, 
+                              OnlyPath(getMasterFilename())); 
+}
+
+
 bool InsetInclude::loadIfNeeded() const
 {
        if (isNoLoad() || isVerb()) return false;
@@ -318,7 +333,7 @@ bool InsetInclude::loadIfNeeded() const
 
 
 int InsetInclude::Latex(ostream & os,
-                       signed char /*fragile*/, bool /*fs*/) const
+                       bool /*fragile*/, bool /*fs*/) const
 {
        // Do nothing if no file name has been specified
        if (contents.empty())