(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882) Conflicts: framework/inc/framework/addonsoptions.hxx framework/source/fwe/classes/addonsoptions.cxx Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a