Replace LString.h with support/std_string.h,

[features.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index fce517e7bec9c3af95c0fee49842704ea80fd448..2a8b930534a313e101c64aecfaaa98aa052ef8a1 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -1,9 +1,16 @@
 // -*- C++ -*-
 /**
- *  \file paragraph.h
- *  Copyright 1995 Matthias Ettrich
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file paragraph.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PARAGRAPH_H
@@ -17,8 +24,9 @@
 
 #include "support/types.h"
 #include "changes.h"
+#include "RowList.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class BufferParams;
@@ -71,13 +79,13 @@ public:
        bool isMultiLingual(BufferParams const &);
 
        ///
-       string const asString(Buffer const *, bool label) const;
+       string const asString(Buffer const &, bool label) const;
        ///
-       string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
+       string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
                              bool label) const;
 
        ///
-       void write(Buffer const *, std::ostream &, BufferParams const &,
+       void write(Buffer const &, std::ostream &, BufferParams const &,
                       depth_type & depth) const;
        ///
        void validate(LaTeXFeatures &) const;
@@ -95,7 +103,7 @@ public:
 
 
        ///
-       bool simpleTeXOnePar(Buffer const *, BufferParams const &,
+       bool simpleTeXOnePar(Buffer const &, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, LatexRunParams const &);
 
@@ -111,8 +119,6 @@ public:
        void setInsetOwner(UpdatableInset * inset);
        ///
        void deleteInsetsLyXText(BufferView *);
-       ///
-       void resizeInsetsLyXText(BufferView *);
 
        ///
        lyx::pos_type size() const;
@@ -295,6 +301,11 @@ public:
        ///
        InsetList insetlist;
 
+       ///
+       mutable RowList rows;
+       /// last draw y position (baseline of top row)
+       int y;
+
 private:
        ///
        LyXLayout_ptr layout_;