Revert "XHTML: remove DOCTYPE, as the document is then understood as HTML4/XHTML1...

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 214f25cc7f7d6dee5b45abf3c8934902a4c2eab2..68bd632d2d2bce02c65189eb5c2bf078a65312b8 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -233,8 +233,8 @@ public:
        Impl(Compare const & compare)
                : abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
                  odd_offset_(0), compare_(compare),
-                 old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0),
-                 recursion_level_(0), nested_inset_level_(0), D_(0)
+                 old_buf_(nullptr), new_buf_(nullptr), dest_buf_(nullptr),
+                 dest_pars_(nullptr), recursion_level_(0), nested_inset_level_(0), D_(0)
        {}
 
        ///
@@ -439,8 +439,8 @@ static void getParagraphList(DocRange const & range,
        pit_type startpit = range.from.pit();
        pit_type endpit = range.to.pit();
        ParagraphList const & ps_ = range.text()->paragraphs();
-       ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
-               lyx::next(ps_.begin(), endpit + 1));
+       ParagraphList tmp_pars(ps_.iterator_at(startpit),
+               ps_.iterator_at(endpit + 1));
 
        // Remove the end of the last paragraph; afterwards, remove the
        // beginning of the first paragraph. Keep this order - there may only