Revert "Objective-C compililation support with cmake and C++11"

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 46035513c7bd163a28d15c6505941f48c2001d12..b7b7d1db8236bab800b734eca351295314b99beb 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -775,6 +775,8 @@ void Layout::readLabelType(Lexer & lex)
 
 void Layout::readEndLabelType(Lexer & lex)
 {
+       // this should be const, but can't be because
+       // of PushPopHelper.
        static LexerKeyword endlabelTypeTags[] = {
                { "box",              END_LABEL_BOX },
                { "filled_box", END_LABEL_FILLED_BOX },
@@ -1505,14 +1507,11 @@ void Layout::makeDefaultCSS() const
                htmldefaultstyle_ += from_ascii(tmp);
        }
 
-// tex2lyx does not see output_xhtml.cpp
-#ifndef NO_LAYOUT_CSS
        // alignment
        string where = alignmentToCSS(align);
        if (!where.empty()) {
                htmldefaultstyle_ += from_ascii("text-align: " + where + ";\n");
        }
-#endif
 
        // wrap up what we have, if anything
        if (!htmldefaultstyle_.empty())