Merge branch 'master' into biblatex2

[lyx.git] / src / tex2lyx / dummy_impl.cpp

diff --git a/src/tex2lyx/dummy_impl.cpp b/src/tex2lyx/dummy_impl.cpp
index 6fb1a84b7611a68e0b91dc8613e54a06b90c579c..8ad5b7985908c109ea3e7494e4a2f8999dbb9f63 100644 (file)
--- a/src/tex2lyx/dummy_impl.cpp
+++ b/src/tex2lyx/dummy_impl.cpp
@@ -48,16 +48,10 @@ namespace Alert {
 
 
 //
-// Dummy TexRow support (needed by docstream)
+// Dummy verbose support
 //
 
-
-void TexRow::newline()
-{}
-
-
-void TexRow::newlines(int)
-{}
+bool verbose = false;
 
 
 //
@@ -121,6 +115,23 @@ string alignmentToCSS(LyXAlignment)
        return string();
 }
 
+//
+// Dummy FontMetrics (needed by Length)
+//
+
+namespace frontend {
+class FontMetrics {
+       int em() const { return 0; };
+};
+}
+
+class FontInfo;
+
+frontend::FontMetrics const & theFontMetrics(FontInfo const &) {
+       static frontend::FontMetrics dummy;
+       return dummy;
+}
+
 //
 // Keep the linker happy on Windows
 //