g++: correct some warnings...

Change-Id: I62abbbd9acf9cea91bdfa142d0363c7453951cdc

2 files changed, 17 insertions, 2 deletions

diff --git a/src/lib/IWORKFormula.cpp b/src/lib/IWORKFormula.cpp
index ceea0aa..3221c84 100644
--- a/src/lib/IWORKFormula.cpp
+++ b/src/lib/IWORKFormula.cpp
@@ -65,6 +65,11 @@ std::ostream &operator<<(std::ostream &s, IWORKFormula::Token const &dt)
   case IWORKFormula::Token::String:
     s << "\"" << dt.m_string << "\"";
     break;
+#if !defined(__clang__)
+  default:
+    ETONYEK_DEBUG_MSG(("IWORKFormula::Token::operator<<: unexpected token\n"));
+    break;
+#endif
   }
   return s;
 }
@@ -444,6 +449,11 @@ struct Printer : public boost::static_visitor<void>
     case IWORKFormula::Token::String:
       m_out << val.m_string;
       break;
+#if !defined(__clang__)
+    default:
+      ETONYEK_DEBUG_MSG(("IWORKFormula::Printer::operator(): unexpected token\n"));
+      break;
+#endif
     }
   }
 
@@ -703,6 +713,11 @@ struct Collector : public boost::static_visitor<>
       props.insert("librevenge:text", val.m_string.c_str());
       m_propsVector.append(props);
       break;
+#if !defined(__clang__)
+    default:
+      ETONYEK_DEBUG_MSG(("IWORKFormula::Collector::operator(): unexpected token\n"));
+      break;
+#endif
     }
   }
   void operator()(const recursive_wrapper<PrefixOp> &val) const
diff --git a/src/lib/IWORKTable.cpp b/src/lib/IWORKTable.cpp
index a327c65..425708e 100644
--- a/src/lib/IWORKTable.cpp
+++ b/src/lib/IWORKTable.cpp
@@ -867,12 +867,12 @@ void IWORKTable::draw(const librevenge::RVNGPropertyList &tableProps, IWORKOutpu
                 librevenge::RVNGPropertyList frameProps;
                 for (int wh=0; wh<2; ++wh)
                 {
-                  unsigned dim=0;
+                  double dim=0;
                   bool ok=true;
                   auto const &sizes=wh==0 ? m_columnSizes : m_rowSizes;
                   for (size_t rr=(wh==0 ? c : r); ok && rr<std::min(size_t(wh==0 ? cMax : rMax),sizes.size()); ++rr)
                   {
-                    if (sizes[rr].m_size)
+                    if (sizes[rr].m_size>0)
                       dim+=*sizes[rr].m_size;
                     else
                       ok=false;