diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-19 16:26:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-02 14:44:09 +0100 |
| commit | 4c461ee4e0b04c780ec729ec541f7a995156ab2c (patch) | |
| tree | fa18f207a77ee168aef2dddf0f3af36d6a2a5043 | |
| parent | 6254fa3ee4310f2fc421d95294d1f1e902196463 (diff) | |
pyuno: move "officehelper.py" from scripting to pyuno
... because at least in Fedora packages with system python it's a pain
to use officehelper.bootstrap() because unlike pyuno it is not installed
in the standard python directories but in libreoffice/program.
You might think that bootstrap() is not appropriate functionality for a
UNO langauge binding, but then why does ::cppu::bootstrap() exist?
Change-Id: I5fd4b344a811c087d32fb6304e55105ab3cb137e
Reviewed-on: https://gerrit.libreoffice.org/12968
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 8eb37e74fff1806608563ee49489b8a1f71fc6b0)
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 1 | ||||
| -rwxr-xr-x | pyuno/source/officehelper.py (renamed from scripting/source/pyprov/officehelper.py) | 0 | ||||
| -rw-r--r-- | scripting/Pyuno_mailmerge.mk | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 80af45922d43..0588af3705a7 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER) loader/pythonloader.py \ module/uno.py \ module/unohelper.py \ + officehelper.py \ )) # vim: set noet sw=4 ts=4: diff --git a/scripting/source/pyprov/officehelper.py b/pyuno/source/officehelper.py index 0b0bb68af5e5..0b0bb68af5e5 100755 --- a/scripting/source/pyprov/officehelper.py +++ b/pyuno/source/officehelper.py diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk index fd1e56dbcee8..69845477b51f 100644 --- a/scripting/Pyuno_mailmerge.mk +++ b/scripting/Pyuno_mailmerge.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailm $(eval $(call gb_Pyuno_add_files,mailmerge,,\ mailmerge.py \ msgbox.py \ - officehelper.py \ )) # vim: set noet sw=4 ts=4: |