(cherry picked from commit 06b91eb4)

Conflicts:
	framework/inc/uielement/logoimagestatusbarcontroller.hxx
	framework/inc/uielement/logotextstatusbarcontroller.hxx
	framework/inc/uielement/simpletextstatusbarcontroller.hxx
	framework/source/classes/resource.src
	framework/source/register/registerservices.cxx
	framework/source/uielement/logoimagestatusbarcontroller.cxx
	framework/source/uielement/logotextstatusbarcontroller.cxx
	framework/source/uielement/simpletextstatusbarcontroller.cxx
	officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

Change-Id: I799bd0fa29191efce4fe9a09f74247e38d8f8873