fix #1073

[lyx.git] / src / mathed / math_fracbase.C

diff --git a/src/mathed/math_fracbase.C b/src/mathed/math_fracbase.C
index b1137ac226ac4fcc9cbb7545ef84760f297dc82e..aca9f6fcf7ecbe212041148db59916efa77a71fa 100644 (file)
--- a/src/mathed/math_fracbase.C
+++ b/src/mathed/math_fracbase.C
@@ -1,9 +1,5 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_fracbase.h"
-#include "math_mathmlstream.h"
 
 
 MathFracbaseInset::MathFracbaseInset()
@@ -11,65 +7,25 @@ MathFracbaseInset::MathFracbaseInset()
 {}
 
 
-bool MathFracbaseInset::idxRight(MathInset::idx_type &,
-                                MathInset::pos_type &) const
+bool MathFracbaseInset::idxRight(idx_type &, pos_type &) const
 {
        return false;
 }
 
 
-bool MathFracbaseInset::idxLeft(MathInset::idx_type &,
-                               MathInset::pos_type &) const
+bool MathFracbaseInset::idxLeft(idx_type &, pos_type &) const
 {
        return false;
 }
 
 
-bool MathFracbaseInset::idxFirstUp(idx_type & idx, pos_type & pos) const
+bool MathFracbaseInset::idxUpDown(idx_type & idx, pos_type & pos, bool up,
+       int targetx) const
 {
-       idx = 0;
-       pos = 0;
-       return true;
-}
-
-
-bool MathFracbaseInset::idxFirstDown(idx_type & idx, pos_type & pos) const
-{
-       idx = 1;
-       pos = 0;
-       return true;
-}
-
-
-bool MathFracbaseInset::idxLastUp(idx_type & idx, pos_type & pos) const
-{
-       idx = 0;
-       pos = cell(0).size();
-       return true;
-}
-
-
-bool MathFracbaseInset::idxLastDown(idx_type & idx, pos_type & pos) const
-{
-       idx = 1;
-       pos = cell(1).size();
-       return true;
-}
-
-
-bool MathFracbaseInset::idxUp(idx_type & idx) const
-{
-       if (idx == 0)
-               return false;
-       idx = 0;
-       return true;
-}
-
-
-bool MathFracbaseInset::idxDown(idx_type & idx) const
-{
-       if (idx == 1)
+       MathInset::idx_type target = !up; // up ? 0 : 1, since upper cell has idx 0
+       if (idx == target)
                return false;
-       idx = 1;
+       idx = target;
+       pos = cell(idx).x2pos(targetx);
        return true;
 }