Commit Graph

4 Commits

Author SHA1 Message Date
85f072ef33 Resolves: #i121577# Allow setting toolbar name in Addons.xcu
(cherry picked from commit 37894067213a63c51c7a73083d7b0ace5f5c40da)

Conflicts:
	framework/inc/framework/addonsoptions.hxx
	framework/source/fwe/classes/addonsoptions.cxx
	framework/source/layoutmanager/toolbarlayoutmanager.cxx
	officecfg/registry/schema/org/openoffice/Office/Addons.xcs

Change-Id: Icc8ed1bb5ac2cfecd6c03c53c137c503dc78bc66
2013-06-24 11:49:53 +01:00
1768904fd9 Related: #i121442# Read Statusbar merging configuration
(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882)

Conflicts:
	framework/inc/framework/addonsoptions.hxx
	framework/source/fwe/classes/addonsoptions.cxx

Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
2013-05-21 14:01:17 +01:00
cb6d67c21f Spelling "separate" (etc) correctly is hard 2013-05-15 11:14:28 +03:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00