|
|
@@ -321,3 +321,72 @@ diff -Naur lyx-1.3.1.orig/src/lyxlength.h lyx-1.3.1.mod/src/lyxlength.h
|
|
|
};
|
|
|
|
|
|
///
|
|
|
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C lyx-1.3.1/src/frontends/qt2/lengthcombo.C
|
|
|
+--- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.C Tue Dec 17 21:37:11 2002
|
|
|
++++ lyx-1.3.1/src/frontends/qt2/lengthcombo.C Tue Apr 29 13:21:19 2003
|
|
|
+@@ -35,9 +35,9 @@
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+-LyXLength::UNIT LengthCombo::currentLengthItem() const
|
|
|
++LyXLength::LENUNIT LengthCombo::currentLengthItem() const
|
|
|
+ {
|
|
|
+- return static_cast<LyXLength::UNIT>(currentItem());
|
|
|
++ return static_cast<LyXLength::LENUNIT>(currentItem());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+@@ -47,7 +47,7 @@
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+-void LengthCombo::setCurrentItem(LyXLength::UNIT unit)
|
|
|
++void LengthCombo::setCurrentItem(LyXLength::LENUNIT unit)
|
|
|
+ {
|
|
|
+ QComboBox::setCurrentItem(int(unit));
|
|
|
+ }
|
|
|
+diff -Naur lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h lyx-1.3.1/src/frontends/qt2/lengthcombo.h
|
|
|
+--- lyx-1.3.1.orig/src/frontends/qt2/lengthcombo.h Sun Nov 17 12:24:08 2002
|
|
|
++++ lyx-1.3.1/src/frontends/qt2/lengthcombo.h Tue Apr 29 12:43:22 2003
|
|
|
+@@ -21,7 +21,7 @@
|
|
|
+ #include "vspace.h"
|
|
|
+
|
|
|
+ /**
|
|
|
+- * A combo box for selecting LyXLength::UNIT types.
|
|
|
++ * A combo box for selecting LyXLength::LENUNIT types.
|
|
|
+ */
|
|
|
+ class LengthCombo : public QComboBox {
|
|
|
+ Q_OBJECT
|
|
|
+@@ -29,9 +29,9 @@
|
|
|
+ LengthCombo(QWidget * parent, char * name);
|
|
|
+
|
|
|
+ /// set the current item
|
|
|
+- virtual void setCurrentItem(LyXLength::UNIT unit);
|
|
|
++ virtual void setCurrentItem(LyXLength::LENUNIT unit);
|
|
|
+ /// get the current item
|
|
|
+- LyXLength::UNIT currentLengthItem() const;
|
|
|
++ LyXLength::LENUNIT currentLengthItem() const;
|
|
|
+ /// enable the widget
|
|
|
+ virtual void setEnabled(bool b);
|
|
|
+
|
|
|
+@@ -39,7 +39,7 @@
|
|
|
+ virtual void has_activated(int index);
|
|
|
+ signals:
|
|
|
+ /// the current selection has changed
|
|
|
+- void selectionChanged(LyXLength::UNIT unit);
|
|
|
++ void selectionChanged(LyXLength::LENUNIT unit);
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
+diff -Naur lyx-1.3.1.orig/src/vspace.C lyx-1.3.1/src/vspace.C
|
|
|
+--- lyx-1.3.1.orig/src/vspace.C Sun Dec 1 23:59:17 2002
|
|
|
++++ lyx-1.3.1/src/vspace.C Tue Apr 29 12:32:10 2003
|
|
|
+@@ -32,7 +32,7 @@
|
|
|
+ /// used to return numeric values in parsing vspace
|
|
|
+ double number[4] = { 0, 0, 0, 0 };
|
|
|
+ /// used to return unit types in parsing vspace
|
|
|
+-LyXLength::UNIT unit[4] = { LyXLength::UNIT_NONE,
|
|
|
++LyXLength::LENUNIT unit[4] = { LyXLength::UNIT_NONE,
|
|
|
+ LyXLength::UNIT_NONE,
|
|
|
+ LyXLength::UNIT_NONE,
|
|
|
+ LyXLength::UNIT_NONE };
|