8 files changed, 40 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index edf6b520fb9f..b8bade9b3e4f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -128,6 +128,11 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:CommandWindow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Command Window</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ElementsDockingWindow" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Elements</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index d6c0fbfade10..e903532e9c8f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -45,6 +45,12 @@
         <value>true</value>
       </prop>
     </node>
+    <!-- SID_CMDBOXWINDOW -->
+    <node oor:name="smath/30378" oor:op="replace">
+      <prop oor:name="Visible" oor:type="xs:boolean">
+        <value>false</value>
+      </prop>
+    </node>
     <node oor:name="swriter/10336" oor:op="replace">
       <prop oor:name="Visible" oor:type="xs:boolean">
         <value>true</value>
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 3f998e8b182b..64586466cea1 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -265,8 +265,8 @@ interface FormulaView
     //idlpp no menu entry, so no texts
     SID_CMDBOXWINDOW //idlpp ole : no , status : no
     [
-        ExecMethod = NoExec ;
-        StateMethod = NoState ;
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
     ]
     SID_ELEMENTSDOCKINGWINDOW
     [
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c9a6303ba0e1..eb7074c2d811 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -2039,6 +2039,13 @@ void SmViewShell::Execute(SfxRequest& rReq)
         }
         break;
 
+        case SID_CMDBOXWINDOW:
+        {
+            GetViewFrame().ToggleChildWindow(SID_CMDBOXWINDOW);
+            GetViewFrame().GetBindings().Invalidate(SID_CMDBOXWINDOW);
+        }
+        break;
+
         case SID_UNICODE_NOTATION_TOGGLE:
         {
             EditEngine* pEditEngine = nullptr;
@@ -2202,6 +2209,15 @@ void SmViewShell::GetState(SfxItemSet &rSet)
                 rSet.Put(SfxBoolItem(SID_ELEMENTSDOCKINGWINDOW, bState));
             }
             break;
+        case SID_CMDBOXWINDOW:
+            {
+                bool bState = false;
+                auto pCmdWin = GetViewFrame().GetChildWindow(SID_CMDBOXWINDOW);
+                if (pCmdWin)
+                    bState = pCmdWin->IsVisible();
+                rSet.Put(SfxBoolItem(SID_CMDBOXWINDOW, bState));
+            }
+            break;
         case SID_ATTR_PARA_LEFT_TO_RIGHT:
             rSet.Put(SfxBoolItem(nWh, !GetDoc()->GetFormat().IsRightToLeft()));
             break;
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index b9ed1026283a..c3b7865f6449 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -87,6 +87,7 @@
       <menu:menuitem menu:id=".uno:AvailableToolbars"/>
       <menu:menuitem menu:id=".uno:StatusBarVisible"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:CommandWindow"/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:ElementsDockingWindow"/>
       <menu:menuseparator/>
diff --git a/uitest/math_tests/start.py b/uitest/math_tests/start.py
index 7504387a16f7..0d085374f6b4 100644
--- a/uitest/math_tests/start.py
+++ b/uitest/math_tests/start.py
@@ -19,6 +19,7 @@ class SimpleMathTest(UITestCase):
     def test_math_unoCommand(self):
         with self.ui_test.create_doc_in_start_center("math"):
 
+            self.xUITest.executeCommand(".uno:CommandWindow")
             xMathDoc = self.xUITest.getTopFocusWindow()
 
             # tdf#140386
@@ -27,10 +28,12 @@ class SimpleMathTest(UITestCase):
             xEditView = xMathDoc.getChild("editview")
 
             self.assertEqual("backepsilon", get_state_as_dict(xEditView)["Text"])
+            self.xUITest.executeCommand(".uno:CommandWindow")
 
     def test_math_edit(self):
         with self.ui_test.create_doc_in_start_center("math"):
 
+            self.xUITest.executeCommand(".uno:CommandWindow")
             xMathDoc = self.xUITest.getTopFocusWindow()
 
             xEditView = xMathDoc.getChild("editview")
@@ -38,10 +41,12 @@ class SimpleMathTest(UITestCase):
             type_text(xEditView, "E=mc^2")
 
             self.assertEqual("E=mc^2", get_state_as_dict(xEditView)["Text"])
+            self.xUITest.executeCommand(".uno:CommandWindow")
 
     def test_complete_math(self):
         with self.ui_test.create_doc_in_start_center("math"):
 
+            self.xUITest.executeCommand(".uno:CommandWindow")
             xMathDoc = self.xUITest.getTopFocusWindow()
 
             xList = xMathDoc.getChild("categorylist")
@@ -63,5 +68,6 @@ class SimpleMathTest(UITestCase):
             type_text(xEditView, "2")
 
             self.assertEqual("{ 1 <> 2 }", get_state_as_dict(xEditView)["Text"])
+            self.xUITest.executeCommand(".uno:CommandWindow")
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/math_tests/tdf128610.py b/uitest/math_tests/tdf128610.py
index 29b7d5ac4564..efb008f7bb45 100644
--- a/uitest/math_tests/tdf128610.py
+++ b/uitest/math_tests/tdf128610.py
@@ -20,6 +20,7 @@ class Tdf128610(UITestCase):
 
         with self.ui_test.load_empty_file("math"):
 
+            self.xUITest.executeCommand(".uno:CommandWindow")
             self.xUITest.executeCommand('.uno:ImportMathMLClipboard')
 
             xMathDoc = self.xUITest.getTopFocusWindow()
@@ -28,5 +29,6 @@ class Tdf128610(UITestCase):
             # Without the fix in place, this test would have failed with
             # AssertionError: '{ f _ c = frac { 1 } { K _ m } }' != ''
             self.assertEqual("{ f _ c = { frac { 1 } { K _ m } } }", get_state_as_dict(xEditView)["Text"])
+            self.xUITest.executeCommand(".uno:CommandWindow")
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/math_tests/tdf147755.py b/uitest/math_tests/tdf147755.py
index 755efbe6b51d..a53e255092d6 100644
--- a/uitest/math_tests/tdf147755.py
+++ b/uitest/math_tests/tdf147755.py
@@ -22,11 +22,13 @@ class Tdf147755(UITestCase):
                 xOk = xDialog.getChild("ok")
                 xOk.executeAction("CLICK", tuple())
 
+            self.xUITest.executeCommand(".uno:CommandWindow")
             xMathDoc = self.xUITest.getTopFocusWindow()
             xEditView = xMathDoc.getChild("editview")
 
             # Without the fix in place, this test would have failed with
             # AssertionError: '%ALPHA' != ''
             self.assertEqual("%ALPHA", get_state_as_dict(xEditView)["Text"])
+            self.xUITest.executeCommand(".uno:CommandWindow")
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: