openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-986827 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #986827 in OpenLP: "Importing and then trying to pull up a imported  presentation reports error"
  https://bugs.launchpad.net/openlp/+bug/986827

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-986827/+merge/103018

Fixed bug #986827: We imported an exception from UNO, and used it in the code, but it doesn't exist on Windows. Created an empty exception.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-986827/+merge/103018
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-986827 into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2012-04-20 19:33:43 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2012-04-22 18:23:19 +0000
@@ -42,6 +42,9 @@
 if os.name == u'nt':
     from win32com.client import Dispatch
     import pywintypes
+    # Declare an empty exception to match the exception imported from UNO
+    class ErrorCodeIOException(Exception):
+        pass
 else:
     try:
         import uno