Remove the inset and view member functions from PreviewedInset.

[lyx.git] / src / ParagraphParameters.C

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 37dd3352b563246808d4d16dad75438f74a73cbb..cd9bd49bc0c99c76c7d426dce711a3d36f6ba7e1 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -15,26 +15,29 @@
 #include <config.h>
 
 #include "ParagraphParameters.h"
-#include "tex-strings.h"
-#include "lyxlex.h"
 
 #include "buffer.h"
 #include "BufferView.h"
-#include "support/std_sstream.h"
 #include "gettext.h"
+#include "lyxlayout.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "ParameterStruct.h"
+#include "tex-strings.h"
 
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
 
+#include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::rtrim;
 
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
+using std::string;
 
 
 // Initialize static member var.
@@ -67,6 +70,12 @@ void ParagraphParameters::clear()
 }
 
 
+ParagraphParameters::depth_type ParagraphParameters::depth() const
+{
+       return param->depth;
+}
+
+
 bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const
 {
        return param->align == pp.param->align &&
@@ -438,7 +447,7 @@ void ParagraphParameters::write(ostream & os) const
 
 void setParagraphParams(BufferView & bv, string const & data)
 {
-       istringstream is(STRCONV(data));
+       istringstream is(data);
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -487,5 +496,5 @@ void params2string(Paragraph const & par, string & data)
        /// is paragraph in inset
        os << "\\ininset " << (par.inInset()?1:0) << '\n';
 
-       data = STRCONV(os.str());
+       data = os.str();
 }