Limit the nopassthurchars case in beamer to URL

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 72b212b10cde88f924d0da585396452f8d2d6e2d..e1284b0e80b81c6daced3d87cf0dcb23b318621b 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -22,34 +22,17 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Counters.h"
-#include "Encoding.h"
-#include "Language.h"
-#include "LaTeXFeatures.h"
-#include "Layout.h"
 #include "Font.h"
-#include "LyXRC.h"
-#include "Row.h"
-#include "OutputParams.h"
-#include "xml.h"
+#include "Layout.h"
+#include "LayoutEnums.h"
+#include "Paragraph.h"
 #include "TextClass.h"
-#include "TexRow.h"
 
 #include "frontends/FontMetrics.h"
 
-#include "insets/InsetBibitem.h"
-#include "insets/InsetArgument.h"
-
 #include "support/lassert.h"
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/textutils.h"
-
-#include <algorithm>
-#include <list>
-#include <stack>
+
 #include <sstream>
 
 using namespace std;
@@ -57,9 +40,10 @@ using namespace lyx::support;
 
 namespace lyx {
 
+const int pm_npos = -10000;
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
-       position_(-1), par_(&par)
+       position_(pm_npos), id_(par.id()), par_(&par)
 {}
 
 
@@ -78,7 +62,14 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
        par_ = &par;
        dim_ = Dimension();
-       //position_ = -1;
+       //position_ = pm_npos;
+}
+
+
+int ParagraphMetrics::position() const
+{
+       LASSERT(hasPosition(), return pm_npos);
+       return position_;
 }
 
 
@@ -88,6 +79,18 @@ void ParagraphMetrics::setPosition(int position)
 }
 
 
+void ParagraphMetrics::resetPosition()
+{
+       position_ = pm_npos;
+}
+
+
+bool ParagraphMetrics::hasPosition() const
+{
+       return position_ != pm_npos;
+}
+
+
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
        LBUFERR(!rows().empty());