* pl.po remerge by autotools

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 8c8383b24f94af61fe9d73d1a307aaa2cf9b8870..66b1726d89bd04e09af044f9977cd945e755803e 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -4,10 +4,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -28,15 +28,9 @@ namespace lyx {
 
 Row::Row()
        : separator(0), label_hfill(0), x(0),
-       sel_beg(-1), sel_end(-1), changed_(false), crc_(0), 
-       pos_(0), end_(0), left_margin_sel(false), right_margin_sel(false)
-{}
-
-
-Row::Row(pos_type pos)
-       : separator(0), label_hfill(0), x(0),
-       sel_beg(-1), sel_end(-1), changed_(false), crc_(0), 
-       pos_(0), end_(0), left_margin_sel(false), right_margin_sel(false)
+       sel_beg(-1), sel_end(-1),
+       begin_margin_sel(false), end_margin_sel(false), 
+       changed_(false), crc_(0), pos_(0), end_(0)
 {}
 
 
@@ -65,11 +59,11 @@ void Row::endpos(pos_type p)
 }
 
 
-bool Row::isMarginSelected(bool margin_begin, DocIterator const & beg, 
-                                                                DocIterator const & end) const
+bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
+               DocIterator const & end) const
 {
-       pos_type const sel_pos = margin_begin ? sel_beg : sel_end;
-       pos_type const margin_pos = margin_begin ? pos_ : end_;
+       pos_type const sel_pos = left_margin ? sel_beg : sel_end;
+       pos_type const margin_pos = left_margin ? pos_ : end_;
 
        // Is the chosen margin selected ?
        if (sel_pos == margin_pos) {
@@ -94,13 +88,13 @@ bool Row::isMarginSelected(bool margin_begin, DocIterator const & beg,
 
 
 void Row::setSelectionAndMargins(DocIterator const & beg, 
-                                                                DocIterator const & end) const
+               DocIterator const & end) const
 {
        setSelection(beg.pos(), end.pos());
        
        if (selection()) {
-               right_margin_sel = isMarginSelected(false, beg, end);
-               left_margin_sel = isMarginSelected(true, beg, end);
+               end_margin_sel = isMarginSelected(false, beg, end);
+               begin_margin_sel = isMarginSelected(true, beg, end);
        }
 }