fixed OpenOffice import being available even if OpenOffice is not installed

2011-04-11 16:17:43 +02:00 · 2011-04-11 16:17:43 +02:00 · de616b9d1a
parent 2060fecbca
commit de616b9d1a
1 changed files with 2 additions and 6 deletions
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@ -39,12 +39,8 @@ if os.name == u'nt':
    PAGE_AFTER = 5
    PAGE_BOTH = 6
 else:
-    try:
-        import uno
-        from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, \
-            PAGE_BOTH
-    except ImportError:
-        pass
+    import uno
+    from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH

 class OooImport(SongImport):
    """