diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-10 09:34:10 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-10 14:50:59 +0200 |
commit | fbc038cc4f4a12f8302ce5b3bd7d739bd66a674e (patch) | |
tree | d6cc189748e5980420cc0611b44b28ec4183ea25 /pyuno | |
parent | Resolves: tdf#125197 duplicate column checkbox position (diff) | |
download | core-fbc038cc4f4a12f8302ce5b3bd7d739bd66a674e.tar.gz core-fbc038cc4f4a12f8302ce5b3bd7d739bd66a674e.zip |
an uno -> a uno
Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d
Reviewed-on: https://gerrit.libreoffice.org/72105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'pyuno')
-rw-r--r-- | pyuno/inc/pyuno.hxx | 2 | ||||
-rw-r--r-- | pyuno/source/module/uno.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx index a8680b6c4d3a..1d1fa7750879 100644 --- a/pyuno/inc/pyuno.hxx +++ b/pyuno/inc/pyuno.hxx @@ -215,7 +215,7 @@ public: */ static bool isInitialized(); - /** converts something contained in an UNO Any to a Python object + /** converts something contained in a UNO Any to a Python object preconditions: python has been initialized before, the global interpreter lock is held and pyuno::Runtime diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py index 6d671e620f21..bd894a0eea4e 100644 --- a/pyuno/source/module/uno.py +++ b/pyuno/source/module/uno.py @@ -359,7 +359,7 @@ def _uno_import(name, *optargs, **kwargs): globals, locals, fromlist = list(optargs)[:3] + [kwargs.get('globals', {}), kwargs.get('locals', {}), kwargs.get('fromlist', [])][len(optargs):] - # from import form only, but skip if an uno lookup has already failed + # from import form only, but skip if a uno lookup has already failed if not fromlist or hasattr(e, '_uno_import_failed'): raise |