From d9f1ebdc76767cb17da614c623878456b07c4fa9 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Tue, 17 Sep 2019 11:03:34 +0300
Subject: [PATCH] Fix bug 42608

---
 slide/api.js | 10 ++++++++++
 word/api.js  | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/slide/api.js b/slide/api.js
index 68e6807cff..06222af832 100644
--- a/slide/api.js
+++ b/slide/api.js
@@ -580,6 +580,7 @@
 		this.tmpTextArtDiv = null;
 		this.tmpViewRulers = null;
 		this.tmpZoomType   = null;
+        this.tmpDocumentUnits = null;
 
         this.DocumentUrl     = "";
 		this.bNoSendComments = false;
@@ -5460,6 +5461,10 @@ background-repeat: no-repeat;\
 			this.WordControl.UpdateHorRulerBack(true);
 			this.WordControl.UpdateVerRulerBack(true);
 		}
+		else
+		{
+            this.tmpDocumentUnits = _units;
+		}
 	};
 
 	asc_docs_api.prototype.GoToHeader = function(pageNumber)
@@ -7008,6 +7013,11 @@ background-repeat: no-repeat;\
 					break;
 			}
 		}
+        if (null != this.tmpDocumentUnits)
+        {
+            this.asc_SetDocumentUnits(this.tmpDocumentUnits);
+            this.tmpDocumentUnits = null;
+        }
 
 		this.asc_setViewMode(this.isViewMode);
 
diff --git a/word/api.js b/word/api.js
index ea9731169d..c610f01531 100644
--- a/word/api.js
+++ b/word/api.js
@@ -793,6 +793,7 @@
 		this.tmpCoMarksDraw = false;
 		this.tmpViewRulers  = null;
 		this.tmpZoomType    = null;
+		this.tmpDocumentUnits = null;
 
 		// это чтобы сразу показать ридер, без возможности вернуться в редактор/вьюер
 		this.isOnlyReaderMode = false;
@@ -7037,6 +7038,10 @@ background-repeat: no-repeat;\
 			this.WordControl.UpdateHorRulerBack(true);
 			this.WordControl.UpdateVerRulerBack(true);
 		}
+		else
+		{
+            this.tmpDocumentUnits = _units;
+		}
 	};
 
 	asc_docs_api.prototype.GoToHeader = function(pageNumber)
@@ -7844,6 +7849,11 @@ background-repeat: no-repeat;\
 					break;
 			}
 		}
+		if (null != this.tmpDocumentUnits)
+		{
+			this.asc_SetDocumentUnits(this.tmpDocumentUnits);
+			this.tmpDocumentUnits = null;
+		}
 
 		this.asc_setViewMode(this.isViewMode);
 		this.asc_setDrawCollaborationMarks(this.tmpCoMarksDraw);