tdf#99528 Use vertical tabs in para dialog

Change-Id: I7ec61c07f75e9a8aa124ac5b3d67c90077cca033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166625
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

3 files changed, 15 insertions, 19 deletions

diff --git a/cui/qa/uitest/dialogs/shortcuts.py b/cui/qa/uitest/dialogs/shortcuts.py
index ac8a0a791496..947d94b910d7 100644
--- a/cui/qa/uitest/dialogs/shortcuts.py
+++ b/cui/qa/uitest/dialogs/shortcuts.py
@@ -13,25 +13,18 @@ from uitest.uihelper.common import get_state_as_dict
 class Test(UITestCase):
 
     def test_tab_navigation(self):
-        with self.ui_test.create_doc_in_start_center("writer"):
-            xWriterDoc = self.xUITest.getTopFocusWindow()
-
-            with self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog:
-
-                xTabs = xDialog.getChild("tabcontrol")
-                select_pos(xTabs, "0")
-
-                for i in range(16):
-                    self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], str(i))
-
-                    xTabs.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
-
-                self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], "0")
-
-                for i in reversed(range(16)):
-                    xTabs.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
-
-                    self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], str(i))
+        with self.ui_test.create_doc_in_start_center("writer"),\
+                self.ui_test.execute_dialog_through_command(".uno:EditStyle") as xDialog:
+            xTabs = xDialog.getChild("tabcontrol")
+            select_pos(xTabs, "0")
+
+            for i in range(16):
+                self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], str(i))
+                xTabs.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+PAGEDOWN"}))
+
+            for i in reversed(range(16)):
+                self.assertEqual(get_state_as_dict(xTabs)["CurrPagePos"], str(i))
+                xTabs.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+PAGEUP"}))
 
 
 
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 97fde7653f39..ae467d56a486 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -122,6 +122,7 @@
             <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
+            <property name="tab-pos">left</property>
             <property name="scrollable">True</property>
             <property name="enable-popup">True</property>
             <child>
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index dca91c7d4163..a52a8634ff4b 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -220,6 +220,8 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry(size_t nPos)
 {
     pImpCursor->Clear();
     maEntries.erase(maEntries.begin() + nPos);
+    // Recalculate list positions
+    nFlags &= ~IconChoiceFlags::EntryListPosValid;
     RecalcAllBoundingRectsSmart();
 }