Russian layouttranslations reviewed by Yuriy, Dec 13 2017.

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 20ff63e22a41463ddd65efa4dc261cb8a9fb89d1..e105ae2333576d80dc84e59ea1e17b8a0e831bb6 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -162,25 +162,18 @@ Row::Row()
        : separator(0), label_hfill(0), left_margin(0), right_margin(0),
          sel_beg(-1), sel_end(-1),
          begin_margin_sel(false), end_margin_sel(false),
-         changed_(false), crc_(0),
+         changed_(true),
          pit_(0), pos_(0), end_(0),
          right_boundary_(false), flushed_(false), rtl_(false),
          changebar_(false)
 {}
 
 
-void Row::setCrc(size_type crc) const
-{
-       changed_ = crc != crc_;
-       crc_ = crc;
-}
-
-
-bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
+bool Row::isMarginSelected(bool left, DocIterator const & beg,
                DocIterator const & end) const
 {
-       pos_type const sel_pos = left_margin ? sel_beg : sel_end;
-       pos_type const margin_pos = left_margin ? pos_ : end_;
+       pos_type const sel_pos = left ? sel_beg : sel_end;
+       pos_type const margin_pos = left ? pos_ : end_;
 
        // Is the chosen margin selected ?
        if (sel_pos == margin_pos) {
@@ -210,8 +203,8 @@ void Row::setSelectionAndMargins(DocIterator const & beg,
        setSelection(beg.pos(), end.pos());
 
        if (selection()) {
-               end_margin_sel = isMarginSelected(false, beg, end);
-               begin_margin_sel = isMarginSelected(true, beg, end);
+               change(end_margin_sel, isMarginSelected(false, beg, end));
+               change(begin_margin_sel, isMarginSelected(true, beg, end));
        }
 }
 
@@ -219,18 +212,18 @@ void Row::setSelectionAndMargins(DocIterator const & beg,
 void Row::setSelection(pos_type beg, pos_type end) const
 {
        if (pos_ >= beg && pos_ <= end)
-               sel_beg = pos_;
+               change(sel_beg, pos_);
        else if (beg > pos_ && beg <= end_)
-               sel_beg = beg;
+               change(sel_beg, beg);
        else
-               sel_beg = -1;
+               change(sel_beg, -1);
 
        if (end_ >= beg && end_ <= end)
-               sel_end = end_;
+               change(sel_end,end_);
        else if (end < end_ && end >= pos_)
-               sel_end = end;
+               change(sel_end, end);
        else
-               sel_end = -1;
+               change(sel_end, -1);
 }