[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - pyuno/Package_python_scripts.mk pyuno/source scripting/Pyuno_mailmerge.mk scripting/source

[Michael Stahl]

 pyuno/Package_python_scripts.mk         |    1 
 pyuno/source/officehelper.py            |   84 ++++++++++++++++++++++++++++++++
 scripting/Pyuno_mailmerge.mk            |    1 
 scripting/source/pyprov/officehelper.py |   84 --------------------------------
 4 files changed, 85 insertions(+), 85 deletions(-)

New commits:
commit 4c461ee4e0b04c780ec729ec541f7a995156ab2c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 19 16:26:50 2014 +0100

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 8eb37e74fff1806608563ee49489b8a1f71fc6b0)

diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 80af459..0588af3 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
similarity index 100%
rename from scripting/source/pyprov/officehelper.py
rename to pyuno/source/officehelper.py
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index fd1e56d..6984547 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: