@openui5/sap.m 1.111.3 → 1.111.5

package/src/sap/m/ObjectNumber.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectStatus.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbar.js

@@ -129,7 +129,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbarAssociativePopover.js

@@ -30,7 +30,7 @@ sap.ui.define(['./Popover', './OverflowToolbarAssociativePopoverControls', './Ov
 	 * @extends sap.m.Popover
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/OverflowToolbarButton.js

@@ -27,7 +27,7 @@ sap.ui.define(['sap/m/Button', 'sap/m/ButtonRenderer'],
 	 * @implements sap.f.IShellBar
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbarLayoutData.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/m/ToolbarLayoutData', 'sap/m/library', "sap/base/Log"],
 	 * Holds layout data for the {@link sap.m.OverflowToolbar} items.
 	 * @extends sap.m.ToolbarLayoutData
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbarMenuButton.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/m/MenuButton', 'sap/m/MenuButtonRenderer', 'sap/ui/core/Icon
 		 * @extends sap.m.MenuButton
 		 *
 		 * @author SAP SE
-		 * @version 1.111.3
+		 * @version 1.111.5
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/OverflowToolbarToggleButton.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/m/ToggleButton', 'sap/m/ToggleButtonRenderer'],
 		 * @extends sap.m.ToggleButton
 		 *
 		 * @author SAP SE
-		 * @version 1.111.3
+		 * @version 1.111.5
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/P13nAnyFilterItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>filterItems</code> aggregation in P13nFilterPanel control.
 	 * @extends sap.m.P13nFilterItem
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/m/P13nColumnsItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>columnsItems</code> aggregation in <code>P13nColumnsPanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @author SAP SE
 	 * @public

package/src/sap/m/P13nColumnsPanel.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class The <code>P13nColumnsPanel</code> control is used to define column-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @deprecated as of version 1.98. Use the {@link sap.m.p13n.SelectionPanel} instead.
 	 * @public

package/src/sap/m/P13nConditionPanel.js

@@ -112,7 +112,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The ConditionPanel Control will be used to implement the Sorting, Filtering and Grouping panel of the new Personalization dialog.
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nDialog.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 *        tables.
 	 * @extends sap.m.Dialog
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @deprecated as of version 1.98. Use the {@link sap.m.p13n.Popup} instead.
 	 * @public

package/src/sap/m/P13nDimMeasureItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>columnsItems</code> aggregation in <code>P13nDimMeasurePanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @author SAP SE
 	 * @public

package/src/sap/m/P13nDimMeasurePanel.js

@@ -89,7 +89,7 @@ sap.ui.define([
 	 *        dimensions and measures for table personalization.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.34.0

package/src/sap/m/P13nFilterItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>filterItems</code> aggregation in P13nFilterPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nFilterPanel.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nFilterPanel control is used to define filter-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nGroupItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>groupItems</code> aggregation in P13nGroupPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.28.0

package/src/sap/m/P13nGroupPanel.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nGroupPanel control is used to define group-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @deprecated as of version 1.98. Use the {@link sap.m.p13n.GroupPanel} instead.
 	 * @public

package/src/sap/m/P13nItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Base type for <code>items</code> aggregation in <code>P13nPanel</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nPanel.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class An abstract base type for <code>panels</code> aggregation in <code>P13nDialog</code> control.
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @abstract

package/src/sap/m/P13nSelectionItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>selectionItems</code> aggregation in <code>P13nSelectionPanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @author SAP SE
 	 * @private

package/src/sap/m/P13nSelectionPanel.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @class The P13nSelectionPanel control is used to define selection settings like the visibility or the order of items.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @private
 	 * @since 1.46.0

package/src/sap/m/P13nSortItem.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>sortItems</code> aggregation in P13nSortPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nSortPanel.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nSortPanel control is used to define settings for sorting in table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 * @constructor
 	 * @deprecated as of version 1.98. Use the {@link sap.m.p13n.SortPanel} instead.
 	 * @public

package/src/sap/m/PDFViewer.js

@@ -47,7 +47,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.111.3
+		 * @version 1.111.5
 		 * @since 1.48
 		 *
 		 * @constructor

package/src/sap/m/Page.js

@@ -91,7 +91,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 * @mixes sap.ui.core.ContextMenuSupport
 		 * @author SAP SE
-		 * @version 1.111.3
+		 * @version 1.111.5
 		 *
 		 * @public
 		 * @alias sap.m.Page

package/src/sap/m/PageAccessibleLandmarkInfo.js

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

package/src/sap/m/PagingButton.js

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

package/src/sap/m/Panel.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PlanningCalendar.js

@@ -193,7 +193,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public
@@ -871,7 +871,7 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._updateHeader = function () {
-		this._getHeader().setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
+		this._getHeader().setProperty("_primaryCalendarType", this._getPrimaryCalendarType());
 		if (this._getSecondaryCalendarType()) {
 			this.setShowDayNamesLine(true);
 			this._getHeader().setProperty("_secondaryCalendarType", this.getSecondaryCalendarType());
@@ -960,9 +960,9 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype._applyArrowsLogic = function(bBackwards) {
 		if (bBackwards) {
-			this._dateNav.previous(this.getPrimaryCalendarType());
+			this._dateNav.previous(this._getPrimaryCalendarType());
 		} else {
-			this._dateNav.next(this.getPrimaryCalendarType());
+			this._dateNav.next(this._getPrimaryCalendarType());
 		}
 
 		if (this.getMinDate() && this._dateNav.getStart().getTime() <= this.getMinDate().getTime()) {
@@ -1013,7 +1013,7 @@ sap.ui.define([
 
 		switch (sViewType) {
 			case CalendarIntervalType.Hour:
-				oDateFormat = DateFormat.getDateInstance({format: "yMMMMd", calendarType: this.getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "yMMMMd", calendarType: this._getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 				if (oStartDate.getDate() !== oEndDate.getDate()) {
 					sEndResult = oDateFormat.format(oEndDate);
@@ -1039,7 +1039,7 @@ sap.ui.define([
 					var iEndingParameter = this._getRelativeInfo().iIntervalSize === 1 ? iBeginning + iEnding : iBeginning + iEnding - 1;
 					sEndResult = fnIntervalLabelFormatter ? fnIntervalLabelFormatter(iEndingParameter) : iBeginning + iEnding;
 				} else {
-					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this.getPrimaryCalendarType() });
+					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this._getPrimaryCalendarType() });
 					sBeginningResult = oDateFormat.format(oStartDate);
 					sEndResult = oDateFormat.format(oEndDate);
 					if (this._getSecondaryCalendarType()) {
@@ -1053,7 +1053,7 @@ sap.ui.define([
 
 			case CalendarIntervalType.OneMonth:
 			case "OneMonth":
-				oDateFormat = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "yMMMM", calendarType: this._getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 				if (this._getSecondaryCalendarType()) {
 					oDateFormatInSecType = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getSecondaryCalendarType()});
@@ -1062,7 +1062,7 @@ sap.ui.define([
 				break;
 
 			case CalendarIntervalType.Month:
-				oDateFormat = DateFormat.getDateInstance({format: "y", calendarType: this.getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "y", calendarType: this._getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 
 				if (this._getSecondaryCalendarType()) {
@@ -1112,6 +1112,10 @@ sap.ui.define([
 		return { primaryType: sResult, secondaryType: sResultInSecType };
 	};
 
+    PlanningCalendar.prototype._getPrimaryCalendarType = function(){
+		return this.getProperty("primaryCalendarType") || Configuration.getCalendarType();
+	};
+
 	/**
 	 * Calculates the first and the last date of the range to be displayed. The size of the range depends on the
 	 * currently selected view.
@@ -1119,8 +1123,8 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._getFirstAndLastRangeDate = function () {
-		var oUniStartDate = CalendarUtils._createUniversalUTCDate(this.getStartDate(), this.getPrimaryCalendarType(), true),
-			oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this.getPrimaryCalendarType(), true);
+		var oUniStartDate = CalendarUtils._createUniversalUTCDate(this.getStartDate(), this._getPrimaryCalendarType(), true),
+			oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this._getPrimaryCalendarType(), true);
 
 		return {
 			oStartDate: oUniStartDate,
@@ -1185,7 +1189,7 @@ sap.ui.define([
 	 * @public
 	 */
 	PlanningCalendar.prototype.getEndDate = function () {
-		return this._dateNav.getEnd(this.getPrimaryCalendarType());
+		return this._dateNav.getEnd(this._getPrimaryCalendarType());
 	};
 
 	/**
@@ -1519,14 +1523,10 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._getSecondaryCalendarType = function() {
-		var sSecondaryCalendarType;
-
-		if (this._bSecondaryCalendarTypeSet) {
-			sSecondaryCalendarType = this.getSecondaryCalendarType();
+		var sSecondaryCalendarType = this.getSecondaryCalendarType();
 
-			if (sSecondaryCalendarType === this.getPrimaryCalendarType()) {
-				sSecondaryCalendarType = undefined;
-			}
+		if (sSecondaryCalendarType === this._getPrimaryCalendarType()) {
+			return undefined;
 		}
 
 		return sSecondaryCalendarType;
@@ -1540,7 +1540,7 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype.setSecondaryCalendarType = function (sSecondaryCalendarType) {
 		this.setProperty("secondaryCalendarType", sSecondaryCalendarType);
-		this._bSecondaryCalendarTypeSet = true;
+
 		if (this._getHeader()) {
 			this._getHeader().setProperty("_secondaryCalendarType", sSecondaryCalendarType);
 		}
@@ -1863,7 +1863,7 @@ sap.ui.define([
 							months: iIntervals,
 							legend: this.getLegend()
 						});
-						this._oMonthsRow.setProperty("primaryCalendarType", this.getPrimaryCalendarType());
+						this._oMonthsRow.setProperty("primaryCalendarType", this._getPrimaryCalendarType());
 						if (sSecondaryCalendarType) {
 							this._oMonthsRow.setProperty("secondaryCalendarType", sSecondaryCalendarType);
 						}
@@ -1895,9 +1895,9 @@ sap.ui.define([
 			var oContent = this.getAggregation("table").getInfoToolbar().getContent()[1];
 
 			if (oContent.getMetadata().hasProperty("_primaryCalendarType")) {
-				oContent.setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
+				oContent.setProperty("_primaryCalendarType", this._getPrimaryCalendarType());
 			} else if (oContent.getMetadata().hasProperty("primaryCalendarType")) {
-				oContent.setPrimaryCalendarType(this.getPrimaryCalendarType());
+				oContent.setPrimaryCalendarType(this._getPrimaryCalendarType());
 			}
 
 			if (sSecondaryCalendarType && oContent.getMetadata().hasProperty("_secondaryCalendarType") ) {
@@ -1907,7 +1907,7 @@ sap.ui.define([
 			}
 
 			if (this._oOneMonthsRow) {
-				this._oOneMonthsRow.setPrimaryCalendarType(this.getPrimaryCalendarType());
+				this._oOneMonthsRow.setPrimaryCalendarType(this._getPrimaryCalendarType());
 			}
 
 			if (oContent.setFirstDayOfWeek) {
@@ -1945,7 +1945,7 @@ sap.ui.define([
 		if (this._oOneMonthsRow && (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth")) {
 			this._oOneMonthsRow.setMode(this._iSize);
 			this._oOldStartDate = new Date(this.getStartDate().getTime());
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate, this.getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate, this._getPrimaryCalendarType()));
 
 			if (this._iSize < 2) {
 				this._setRowsStartDate(oOldStartDate);
@@ -2042,7 +2042,7 @@ sap.ui.define([
 			oStart,
 			oCurrent;
 
-		this._dateNav.toDate(oDate, this.getPrimaryCalendarType());
+		this._dateNav.toDate(oDate, this._getPrimaryCalendarType());
 
 		oStart = this._dateNav.getStart();
 		oCurrent = this._dateNav.getCurrent();
@@ -2112,7 +2112,7 @@ sap.ui.define([
 			 * CalendarUtils.getFirstDateOfMonth works with UTC dates (this is because the dates are timezone irrelevant),
 			 * it should be called with the local datetime values presented as UTC ones.
 			 */
-			var oFirstDateOfMonth = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oStartDate, this.getPrimaryCalendarType()));
+			var oFirstDateOfMonth = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oStartDate, this._getPrimaryCalendarType()));
 			var oJSDate = oFirstDateOfMonth.toLocalJSDate();
 			oJSDate.setHours(oStartDate.getHours(), oStartDate.getMinutes(), oStartDate.getSeconds());
 			//CalendarUtils.getFirstDateOfMonth works with UTC based date values, restore the result back in local timezone.
@@ -2976,7 +2976,7 @@ sap.ui.define([
 			sViewKey = this.getViewKey(),
 			oFocusMonthDelegate = {
 				onAfterRendering: function() {
-					this._focusDate(CalendarDate.fromLocalJSDate(new Date(), this.getPrimaryCalendarType()));
+					this._focusDate(CalendarDate.fromLocalJSDate(new Date(), this._getPrimaryCalendarType()));
 					this.removeDelegate(oFocusMonthDelegate);
 				}
 			};
@@ -2984,8 +2984,8 @@ sap.ui.define([
 		// if the OneMonth view is selected and Today btn is pressed,
 		// the calendar should start from the 1st date of the current month
 		if (sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth") {
-			oStartDate = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oDate, this.getPrimaryCalendarType()));
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate, this.getPrimaryCalendarType()));
+			oStartDate = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
 
 			oDate = oStartDate.toLocalJSDate();
 		}
@@ -3087,9 +3087,9 @@ sap.ui.define([
 		}
 
 		var oEvtSelectedStartDate = new Date(aSelectedDates[0].getStartDate());
-		var oEvtSelectedStartCalendarDate = CalendarDate.fromLocalJSDate(oEvtSelectedStartDate, this.getPrimaryCalendarType());
+		var oEvtSelectedStartCalendarDate = CalendarDate.fromLocalJSDate(oEvtSelectedStartDate, this._getPrimaryCalendarType());
 		// calculate end date
-		var oEndDate = CalendarUtils._createUniversalUTCDate(oEvtSelectedStartDate, this.getPrimaryCalendarType(), true);
+		var oEndDate = CalendarUtils._createUniversalUTCDate(oEvtSelectedStartDate, this._getPrimaryCalendarType(), true);
 		var sKey = this.getViewKey();
 		var oView = this._getView(sKey);
 		var sIntervalType = oView.getIntervalType();
@@ -3120,7 +3120,7 @@ sap.ui.define([
 						this._getHeader().updatePickerText(this._formatPickerText());
 					}
 					this._setRowsStartDate(oFocusedDate);
-					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this.getPrimaryCalendarType()), true);
+					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this._getPrimaryCalendarType()), true);
 				} else if (CalendarUtils._isNextMonth(oEvtSelectedStartCalendarDate.toLocalJSDate(), this.getStartDate())) {
 					this.shiftToDate(oEvtSelectedStartCalendarDate);
 					this._addMonthFocusDelegate(this._getRowInstanceByViewKey(this.getViewKey()));
@@ -3280,7 +3280,7 @@ sap.ui.define([
 			oSelectedDate = (this._getSelectedDates().length && this._getSelectedDates()[0].getStartDate()) ?
 				this._getSelectedDates()[0].getStartDate() : this.getStartDate();
 			this._oOneMonthsRow.setMode(this._iSize);
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oSelectedDate, this.getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oSelectedDate, this._getPrimaryCalendarType()));
 		}
 
 		// Call _updateStickyHeader only if the property stickyHeader is set to true

package/src/sap/m/PlanningCalendarHeader.js

@@ -96,7 +96,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/PlanningCalendarLegend.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/unified/CalendarLegend', 'sap/ui/unified/CalendarAppointm
 		 * @extends sap.ui.unified.CalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.111.3
+		 * @version 1.111.5
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/PlanningCalendarRow.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * The <code>sap.m.PlanningCalendarRow</code> allows you to modify appointments at row level.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PlanningCalendarView.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 	 * The <code>PlanningCalendarView</code> defines the type of the intervals (hours, days, months)
 	 * and how many intervals are displayed.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Popover.js

@@ -120,7 +120,7 @@ sap.ui.define([
 		* @extends sap.ui.core.Control
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.111.3
+		* @version 1.111.5
 		*
 		* @public
 		* @alias sap.m.Popover

package/src/sap/m/ProgressIndicator.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PullToRefresh.js

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

package/src/sap/m/QuickView.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewCard.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.3
+	 * @version 1.111.5
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.111.3
+	* @version 1.111.5
 	*
 	* @constructor
 	* @public

package/src/sap/m/QuickViewGroupElement.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.111.3
+	* @version 1.111.5
 	*
 	* @constructor
 	* @public