sync with libreoffice-4-2-5 branch

Change-Id: If1342ba3187a7a5bd036e9a6ffc3ca9c74d15a75