@openui5/sap.ui.layout 1.125.0 → 1.126.1

package/.reuse/dep5

@@ -384,13 +384,13 @@ Copyright: 2017 Wei Song and Oliver Nightingale
 License: MIT
 Comment: these files belong to: Elasticlunr
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
-Copyright: 2008-2017 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: DataTables
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
-Copyright: 2016 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: Buttons extension for DataTables
 

package/THIRDPARTY.txt

@@ -363,17 +363,17 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/elasticlunr.js
 
-Component: DataTables, version: 1.10.15
-Copyright: 2008-2017 SpryMedia Ltd
+Component: DataTables, version: 2.0.1
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
 
-Component: Buttons extension for DataTables, version: 1.4.0
-Copyright: 2016 SpryMedia Ltd
+Component: Buttons extension for DataTables, version: 3.0.0
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
 
 
 Library: sap.ui.integration:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.layout",
-  "version": "1.125.0",
+  "version": "1.126.1",
   "description": "OpenUI5 UI Library sap.ui.layout",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.125.0"
+    "@openui5/sap.ui.core": "1.126.1"
   }
 }

package/src/sap/ui/layout/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.125.0</version>
+  <version>1.126.1</version>
 
   <documentation>SAPUI5 library with layout controls.</documentation>
 

package/src/sap/ui/layout/AlignedFlowLayout.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/layout/AssociativeSplitter.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.Splitter
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/layout/BlockLayout.js

@@ -63,7 +63,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCell.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCellData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 * @class
 	 * Holds layout data for the BlockLayoutCells contents.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @constructor
 	 * @public
 	 * @since 1.50.0

package/src/sap/ui/layout/BlockLayoutRow.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/DynamicSideContent.js

@@ -97,7 +97,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/FixFlex.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Grid.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public
@@ -98,7 +98,7 @@ sap.ui.define([
 
 				/**
 				 * Optional. A string type that represents the span values of the <code>Grid</code> for
-				 * large, medium and small screens. Allowed values are separated by space Letters L, M or S followed
+				 * large, medium and small screens. Allowed values are separated by space with case insensitive Letters XL, L, M or S followed
 				 * by number of columns from 1 to 12 that the container has to take, for example, <code>L2 M4 S6</code>,
 				 * <code>M12</code>, <code>s10</code> or <code>l4 m4</code>.
 				 *
@@ -108,7 +108,7 @@ sap.ui.define([
 
 				/**
 				 * Optional. Defines default for the whole Grid numbers of empty columns before the current span begins.
-				 * It can be defined for large, medium and small screens. Allowed values are separated by space Letters
+				 * It can be defined for large, medium and small screens. Allowed values are separated by space with case insensitive Letters XL,
 				 * L, M or S followed by number of columns from 0 to 11 that the container has to take, for example,
 				 * <code>L2 M4 S6</code>, <code>M11</code>, <code>s10</code> or <code>l4 m4</code>.
 				 *

package/src/sap/ui/layout/GridData.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public
@@ -45,7 +45,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 			/**
 			 * A string type that represents the span values of the <code>Grid</code> for large, medium and small screens.
 			 *
-			 * Allowed values are separated by space Letters L, M or S followed by number of columns from 1 to 12
+			 * Allowed values are separated by space with case insensitive Letters XL, L, M or S followed by number of columns from 1 to 12
 			 * that the container has to take, for example: <code>L2 M4 S6</code>, <code>M12</code>,
 			 * <code>s10</code> or <code>l4 m4</code>.
 			 *
@@ -80,7 +80,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 			/**
 			 * A string type that represents the indent values of the <code>Grid</code> for large, medium and small screens.
 			 *
-			 * Allowed values are separated by space Letters L, M or S followed by number of columns from 1 to 11
+			 * Allowed values are separated by space with case insensitive Letters XL, L, M or S followed by number of columns from 1 to 11
 			 * that the container has to take, for example, <code>L2 M4 S6</code>, <code>M11</code>, <code>s10</code>
 			 * or <code>l4 m4</code>.
 			 *

package/src/sap/ui/layout/GridRenderer.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/Device", "sap/ui/layout/library"],
 	/**
 	 * @author SAP SE
 	 * @version
-	 * 1.125.0
+	 * 1.126.1
 	 * @namespace
 	 */
 	var GridRenderer = {

package/src/sap/ui/layout/HorizontalLayout.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Control', './library', "./HorizontalLayoutRenderer"]
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/PaneContainer.js

@@ -24,7 +24,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element', './AssociativeSplitter', 'sap
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayout.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayoutData.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitter.js

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitterPage.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/layout/SplitPane.js

@@ -26,7 +26,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Splitter.js

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/SplitterLayoutData.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 * Holds layout data for the splitter contents.
 
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/VerticalLayout.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/changeHandler/AddFormContainer.js

@@ -17,7 +17,7 @@ sap.ui.define([
 		* Change handler for adding a form group.
 		* @alias sap.ui.layout.changeHandler.AddFormContainer
 		* @author SAP SE
-		* @version 1.125.0
+		* @version 1.126.1
 		* @experimental Since 1.48.0
 		*/
 	var AddGroup = { };

package/src/sap/ui/layout/changeHandler/AddFormField.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @experimental Since 1.50.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/layout/changeHandler/AddSimpleFormField.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @experimental Since 1.49.0 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js

@@ -17,7 +17,7 @@ sap.ui.define([
 		* Change handler for adding a simple form group.
 		* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
 		* @author SAP SE
-		* @version 1.125.0
+		* @version 1.126.1
 		* @experimental Since 1.27.0
 		*/
 	var AddSimpleFormGroup = {};

package/src/sap/ui/layout/changeHandler/HideSimpleForm.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @experimental Since 1.27.0
 	 */
 	var HideForm = { };

package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.MoveSimpleForm
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @experimental Since 1.34.0
 	 */
 	var MoveSimpleForm = {};

package/src/sap/ui/layout/changeHandler/RenameFormContainer.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameFormContainer
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @since 1.48
 	 * @private
 	 * @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.layout.changeHandler.RenameForm
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @since 1.40
 	 * @private
 	 * @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideForm = { };

package/src/sap/ui/layout/cssgrid/CSSGrid.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.layout.cssgrid.IGridConfigurable

package/src/sap/ui/layout/cssgrid/GridBasicLayout.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridBoxLayout.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridItemLayoutData.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * Holds layout data for a grid item.
 	 *
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/cssgrid/GridLayoutBase.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/ui/layout/cssgrid/GridLayoutDelegate.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 *
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 * @alias sap.ui.layout.cssgrid.GridLayoutDelegate
 	 * @public
 	 */

package/src/sap/ui/layout/cssgrid/GridResponsiveLayout.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * Have to possibility to hold multiple sap.ui.layout.cssgrid.GridSettings and apply the currently active GridSettings.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridSettings.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Holds a set of CSS display:grid properties
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/ui/layout/cssgrid/ResponsiveColumnItemLayoutData.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Holds layout data for an item inside a responsive column layout.
 	 *
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @since 1.72
 	 * @constructor

package/src/sap/ui/layout/cssgrid/ResponsiveColumnLayout.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/form/ColumnContainerData.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/form/ColumnElementData.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/form/ColumnLayout.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * This control cannot be used stand-alone, it just renders a {@link sap.ui.layout.form.Form Form} control,
 	 * so it must be assigned to a {@link sap.ui.layout.form.Form Form} control using the <code>layout</code> aggregation.
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public
@@ -687,6 +687,16 @@ sap.ui.define([
 
 	};
 
+	ColumnLayout.prototype.hasLabelledContainers = function(oForm) {
+
+		const aContainers = oForm.getFormContainers();
+
+		// Let Form render role="region" also if FormContainer has no title.
+		// If only one FormContainer exist and it has no title let Form render role "form".
+		return aContainers.length !== 1 || this.isContainerLabelled(aContainers[0]);
+
+	};
+
 	return ColumnLayout;
 
 });

package/src/sap/ui/layout/form/ColumnLayoutRenderer.js

@@ -66,7 +66,7 @@ sap.ui.define([
 
 		oContainer._checkProperties();
 
-		oRm.openStart("section", oContainer);
+		oRm.openStart("div", oContainer);
 		oRm.class("sapUiFormCLContainer");
 		oRm.class("sapUiFormCLContainerS" + oOptions.S.Size);
 		oRm.class("sapUiFormCLContainerM" + oOptions.M.Size);
@@ -109,7 +109,9 @@ sap.ui.define([
 			oRm.attr('title', oContainer.getTooltip_AsString());
 		}
 
-		this.writeAccessibilityStateContainer(oRm, oContainer);
+		const oForm = oContainer.getParent();
+		// let every container render role, even without title (expect there is only one container). So screenreader also anounces forms structure. (Was not possible for some older layouts.)
+		this.writeAccessibilityStateContainer(oRm, oContainer, !oLayout.isContainerLabelled(oContainer) && oForm.getFormContainers().length === 1);
 
 		oRm.openEnd();
 
@@ -137,7 +139,7 @@ sap.ui.define([
 		}
 
 		oRm.close("div");
-		oRm.close("section");
+		oRm.close("div");
 
 	};
 

package/src/sap/ui/layout/form/Form.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/form/FormContainer.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @constructor
 	 * @public
@@ -361,6 +361,17 @@ sap.ui.define([
 
 	};
 
+	FormContainer.prototype.onThemeChanged = function() {
+		_setExpanderIcon.call(this);
+	};
+
+	function _getIconUrl(sParamName) {
+		return Parameters.get({
+			name: [sParamName],
+			_restrictedParseUrls: true
+		});
+	}
+
 	function _setExpanderIcon(){
 
 		if (!this._oExpandButton) {
@@ -370,13 +381,13 @@ sap.ui.define([
 		var sIcon, sIconHovered, sText, sTooltip;
 
 		if (this.getExpanded()) {
-			sIcon = Parameters._getThemeImage('_sap_ui_layout_Form_FormContainerColImageURL');
-			sIconHovered = Parameters._getThemeImage('_sap_ui_layout_Form_FormContainerColImageDownURL');
+			sIcon = _getIconUrl('_sap_ui_layout_Form_FormContainerColImageURL');
+			sIconHovered = _getIconUrl('_sap_ui_layout_Form_FormContainerColImageDownURL');
 			sText = "-";
 			sTooltip = this._rb.getText("FORM_COLLAPSE");
 		} else {
-			sIcon = Parameters._getThemeImage('_sap_ui_layout_Form_FormContainerExpImageURL');
-			sIconHovered = Parameters._getThemeImage('_sap_ui_layout_Form_FormContainerExpImageDownURL');
+			sIcon = _getIconUrl('_sap_ui_layout_Form_FormContainerExpImageURL');
+			sIconHovered = _getIconUrl('_sap_ui_layout_Form_FormContainerExpImageDownURL');
 			sText = "+";
 			sTooltip = this._rb.getText("FORM_EXPAND");
 		}