fix build, thesaurus

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 6014dea5cb5f8a9fadfdf49c747179c0dd949ce5..30dd365a8f9696bff178414e6aea46d11375e96b 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -21,14 +21,12 @@
 using std::ios;
 using std::ostream;
 
-/// how can I put this inside of Spacing (class)
-static
-char const * spacing_string[] = {"single", "onehalf", "double", "other"};
-
-
+string const Spacing::spacing_string[]
+       = {"single", "onehalf", "double", "other"};
+ 
 float Spacing::getValue() const 
 {
-       switch(space) {
+       switch (space) {
        case Default: // nothing special should happen with this...
        case Single: return 1.0;
        case Onehalf: return 1.25;
@@ -43,7 +41,7 @@ void Spacing::set(Spacing::Space sp, float val)
 {
        space = sp;
        if (sp == Other) {
-               switch(int(val * 1000 + 0.5)) {
+               switch (int(val * 1000 + 0.5)) {
                case 1000: space = Single; break;
                case 1250: space = Onehalf; break;
                case 1667: space = Double; break;
@@ -55,8 +53,8 @@ void Spacing::set(Spacing::Space sp, float val)
 
 void Spacing::set(Spacing::Space sp, string const & val)
 {
-       float fval;
-       istringstream istr(val);
+       float fval = 0.0;
+       istringstream istr(val.c_str());
        istr >> fval;
        set(sp, fval);
 }
@@ -81,7 +79,7 @@ void Spacing::writeFile(ostream & os, bool para) const
 
 string const Spacing::writeEnvirBegin() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\begin{singlespace}";
@@ -103,7 +101,7 @@ string const Spacing::writeEnvirBegin() const
 
 string const Spacing::writeEnvirEnd() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\end{singlespace}";