]> git.lyx.org Git - features.git/commitdiff
configure.py: partly revert previous commit
authorUwe Stöhr <uwestoehr@lyx.org>
Sun, 31 May 2015 01:03:29 +0000 (03:03 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Sun, 31 May 2015 01:03:29 +0000 (03:03 +0200)
This should not have gone in.

lib/configure.py

index 4f06e133c25ecbd5393dd44af2e7c3065e425153..6e3d37b367e719c69acb9b866c948dc352db14d6 100644 (file)
@@ -678,8 +678,7 @@ def checkFormatEntries(dtl_tools):
         rc_entry = [r'\Format noteedit   not     Noteedit               "" "%%"        "%%"    "vector"        ""'])
     #
     checkViewerEditor('an OpenDocument viewer', ['libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', 'abiword'],
-        rc_entry = [r'''\Format odt        odt     "OpenDocument (eLyXer)"  "" "%%"    "%%"    "document,vector,menu=export"   "application/vnd.oasis.opendocument.text"
-\Format odt2       odt    "OpenDocument (tex4ht)"  "" "%%"     "%%"    "document,vector,menu=export"   "application/vnd.oasis.opendocument.text"
+        rc_entry = [r'''\Format odt        odt     "OpenDocument"  "" "%%"     "%%"    "document,vector,menu=export"   "application/vnd.oasis.opendocument.text"
 \Format sxw        sxw    "OpenOffice.Org (sxw)"  "" ""        ""      "document,vector"       "application/vnd.sun.xml.writer"'''])
     #
     checkViewerEditor('a Rich Text and Word viewer', ['libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', 'abiword'],