summaryrefslogtreecommitdiff
path: root/include/framework
AgeCommit message (Collapse)AuthorFilesLines
2013-09-19remove dead definitionsNoel Grandin1-1/+0
Change-Id: I69d2df6cb0a7f994339972a23a913938307e5791
2013-07-24fdo#66691: Revert fix for i#121577 Allow setting toolbar name in Addons.xcuStephan Bergmann1-7/+0
...which incompatibly changed Addons.xcs and breaks extensions (and LibreLogo, which adds to Addons.xcu even though it is not an extension). See the mail thread starting at <http://lists.freedesktop.org/archives/libreoffice/2013-July/054612.html> "[Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in Addons.xcu" for details. This reverts commit 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2 "Resolves: #i121577# Allow setting toolbar name in Addons.xcu" plus follow-up af572d9fbb744c9691abe465815d7927a9d11510 "Related: #i121577# Allow setting toolbar name in Addons.xcu," f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c "various .xcus are gone now," and 37d9921797a3ad3be8257fbfee11326549fcd987 "odk/examples/python/toolpanel/CalcWindowState.xcu is still in use," plus those parts of f97ca6f65182efc6542c53ac5e973b3ff398a5d1 "Resolves: #i116455# Make toolbar style settings persistent" that apparently belong to the fix for i#121577 rather than i#116455. Change-Id: Ib744566f3d8da7d9008d7dad8bec60f1bf32e743
2013-06-24Resolves: #i121577# Allow setting toolbar name in Addons.xcuAriel Constenla-Haile1-0/+7
(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-05-21Related: #i121442# Read Statusbar merging configurationAriel Constenla-Haile1-0/+22
(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882) Conflicts: framework/inc/framework/addonsoptions.hxx framework/source/fwe/classes/addonsoptions.cxx Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-04-23execute move of global headersBjoern Michaelsen21-0/+2208
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a