Fix crash on OS-switch of dark/light mode (#12786)

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 77e126eed279caf63b933ba35188589bac45653e..31b31a2d0158a156117835fb3af784369c398acd 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -22,37 +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 "sgml.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 "support/bind.h"
-#include <boost/crc.hpp>
-
-#include <algorithm>
-#include <list>
-#include <stack>
 #include <sstream>
 
 using namespace std;
@@ -62,7 +42,7 @@ namespace lyx {
 
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
-       position_(-1), par_(&par)
+       position_(-1), id_(par.id()), par_(&par)
 {}
 
 
@@ -85,77 +65,12 @@ void ParagraphMetrics::reset(Paragraph const & par)
 }
 
 
-size_t ParagraphMetrics::computeRowSignature(Row const & row,
-               BufferParams const & bparams) const
-{
-       boost::crc_32_type crc;
-       for (pos_type i = row.pos(); i < row.endpos(); ++i) {
-               char_type const b[] = { par_->getChar(i) };
-               crc.process_bytes(b, sizeof(char_type));
-               if (bparams.track_changes) {
-                       Change change = par_->lookupChange(i);
-                       char_type const b[] = { static_cast<char_type>(change.type) };
-                       // 1 byte is enough to encode Change::Type
-                       crc.process_bytes(b, 1);
-               }
-       }
-
-       Dimension const & d = row.dimension();
-       char_type const b[] = { static_cast<char_type>(row.sel_beg),
-                               static_cast<char_type>(row.sel_end),
-                               row.begin_margin_sel,
-                               row.end_margin_sel,
-                               d.wid, d.asc, d.des };
-       crc.process_bytes(b, sizeof(b));
-       crc.process_bytes(&row.separator, sizeof(row.separator));
-
-       return crc.checksum();
-}
-
-
 void ParagraphMetrics::setPosition(int position)
 {
        position_ = position;
 }
 
 
-Dimension const & ParagraphMetrics::insetDimension(Inset const * inset) const
-{
-       InsetDims::const_iterator it = inset_dims_.find(inset);
-       if (it != inset_dims_.end())
-               return it->second;
-
-       static Dimension dummy;
-       return dummy;
-}
-
-
-void ParagraphMetrics::setInsetDimension(Inset const * inset,
-               Dimension const & dim)
-{
-       inset_dims_[inset] = dim;
-}
-
-
-Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
-{
-       LBUFERR(!rows().empty());
-
-       // If boundary is set we should return the row on which
-       // the character before is inside.
-       if (pos > 0 && boundary)
-               --pos;
-
-       RowList::iterator rit = rows_.end();
-       RowList::iterator const begin = rows_.begin();
-
-       for (--rit; rit != begin && rit->pos() > pos; --rit)
-               ;
-
-       return *rit;
-}
-
-
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
        LBUFERR(!rows().empty());
@@ -212,25 +127,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
 }
 
 
-int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
-{
-       // The most special cases are handled first.
-       if (Inset const * inset = par_->getInset(pos))
-               return insetDimension(inset).wid;
-
-       char_type const c = par_->getChar(pos);
-
-       if (c == '\t')
-               return 4 * theFontMetrics(font).width(' ');
-
-       // Note that this function is only called in
-       // RowPainter::paintText, and only used for characters that do
-       // not require handling of compose chars or ligatures. It can
-       // therefore be kept simple.
-       return theFontMetrics(font).width(c);
-}
-
-
+// FIXME: this code seems bogus. Audit and rewrite (see bug #9860).
 bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 {
        if (!par_->isHfill(pos))