sync with libreoffice-4-2-7 branch

Change-Id: Ib3bc599420251d783ad5f583a89e2ba772619427