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 9e9c3107292c563fc7286b4d3d2db4f9dc1aa10b..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;
 
 
 //
@@ -125,15 +119,16 @@ string alignmentToCSS(LyXAlignment)
 // Dummy FontMetrics (needed by Length)
 //
 
-
+namespace frontend {
 class FontMetrics {
        int em() const { return 0; };
 };
+}
 
 class FontInfo;
 
-FontMetrics const & theFontMetrics(FontInfo const &) {
-       static FontMetrics dummy;
+frontend::FontMetrics const & theFontMetrics(FontInfo const &) {
+       static frontend::FontMetrics dummy;
        return dummy;
 }