fix multirow/column logic in table dialog

[lyx.git] / src / Author.h

diff --git a/src/Author.h b/src/Author.h
index 21f479da124ce6fe6c799b154c8b2992667522e5..7d9f3ddf8e04f911b09283d08771094c13e5c0da 100644 (file)
--- a/src/Author.h
+++ b/src/Author.h
@@ -14,7 +14,7 @@
 
 #include "support/docstring.h"
 
-#include <map>
+#include <vector>
 
 
 namespace lyx {
@@ -24,32 +24,33 @@ public:
        ///
        Author() {}
        ///
-       Author(docstring const & name, docstring const & email)
-               : name_(name), email_(email), used_(true), buffer_id_(0) {}
+       Author(docstring const & name, docstring const & email);
        ///
        docstring name() const { return name_; }
        ///
        docstring email() const { return email_; }
        ///
-       unsigned int buffer_id() const { return buffer_id_; }
+       int bufferId() const { return buffer_id_; }
        ///
-       void setBufferId(unsigned int buffer_id) const { buffer_id_ = buffer_id; }
+       void setBufferId(int buffer_id) const { buffer_id_ = buffer_id; }
        ///
        void setUsed(bool u) const { used_ = u; }
        ///
        bool used() const { return used_; }
        ///
        friend std::istream & operator>>(std::istream & os, Author & a);
+       ///
+       friend std::ostream & operator<<(std::ostream & os, Author const & a);
 
 private:
        /// The author's name
        docstring name_;
        /// The author's email address
        docstring email_;
-       /// The id of the author in the lyx-file
-       mutable unsigned int buffer_id_;
        ///
        mutable bool used_;
+       /// The id of the author in the lyx-file
+       mutable int buffer_id_;
 };
 
 
@@ -62,6 +63,8 @@ public:
        ///
        void record(int id, Author const & a);
        ///
+       void recordCurrentAuthor(Author const & a);
+       ///
        Author const & get(int id) const;
        ///
        typedef std::vector<Author> Authors;