8 files changed, 25 insertions, 30 deletions
diff --git a/sc/qa/uitest/chart2/tdf101894.py b/sc/qa/uitest/chart2/tdf101894.py
index 086f84d934a9..83b91540c4fc 100644
--- a/sc/qa/uitest/chart2/tdf101894.py
+++ b/sc/qa/uitest/chart2/tdf101894.py
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from libreoffice.calc.document import get_cell_by_position
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_url_for_data_file
-from uitest.uihelper.common import get_state_as_dict
+
 
 class tdf101894(UITestCase):
 
diff --git a/sc/qa/uitest/chart2/tdf120348.py b/sc/qa/uitest/chart2/tdf120348.py
index abe9963e02cf..9f3a6483705d 100644
--- a/sc/qa/uitest/chart2/tdf120348.py
+++ b/sc/qa/uitest/chart2/tdf120348.py
@@ -7,10 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.calc import enter_text_to_cell
+from uitest.uihelper.common import get_url_for_data_file
+
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_url_for_data_file
+
 
 class tdf120348(UITestCase):
 
diff --git a/sc/qa/uitest/chart2/tdf122398.py b/sc/qa/uitest/chart2/tdf122398.py
index d5126cd21636..dc054c190f4e 100644
--- a/sc/qa/uitest/chart2/tdf122398.py
+++ b/sc/qa/uitest/chart2/tdf122398.py
@@ -7,14 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, type_text, get_url_for_data_file
 
-# Bug 122398 - UI: Cannot specify min/max in axis scale or axis position. Limited between 0 and 100
 
+# Bug 122398 - UI: Cannot specify min/max in axis scale or axis position. Limited between 0 and 100
 class tdf122398(UITestCase):
    def test_tdf122398_chart_min_max_x_axis(self):
     with self.ui_test.load_file(get_url_for_data_file("tdf122398.ods")) as calc_doc:
diff --git a/sc/qa/uitest/chart2/tdf123013.py b/sc/qa/uitest/chart2/tdf123013.py
index 38238b004d24..4f8e104ba8de 100644
--- a/sc/qa/uitest/chart2/tdf123013.py
+++ b/sc/qa/uitest/chart2/tdf123013.py
@@ -7,14 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, type_text
 
-#Bug 123013 - Can not change Trendline name in charts
 
+# Bug 123013 - Can not change Trendline name in charts
 class tdf123013(UITestCase):
    def test_tdf96432_chart_trendline_name(self):
     with self.ui_test.load_file(get_url_for_data_file("tdf123013.ods")) as calc_doc:
diff --git a/sc/qa/uitest/chart2/tdf123231.py b/sc/qa/uitest/chart2/tdf123231.py
index 539bc944c406..d850abc2ec7f 100644
--- a/sc/qa/uitest/chart2/tdf123231.py
+++ b/sc/qa/uitest/chart2/tdf123231.py
@@ -7,14 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, type_text
 
-#Bug 123231 - Chart set trendline format regression type Power twice
 
+# Bug 123231 - Chart set trendline format regression type Power twice
 class tdf123231(UITestCase):
    def test_tdf123231_chart_trendline_dialog_power(self):
     with self.ui_test.load_file(get_url_for_data_file("tdf93506.ods")) as calc_doc:
diff --git a/sc/qa/uitest/chart2/tdf123520.py b/sc/qa/uitest/chart2/tdf123520.py
index 1e36b89864b5..b3ac7a3b13e4 100644
--- a/sc/qa/uitest/chart2/tdf123520.py
+++ b/sc/qa/uitest/chart2/tdf123520.py
@@ -7,15 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.common import select_by_text
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.common import select_by_text, select_pos
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, type_text
 
-#Bug 123520 - Y axis - positioning tab, textbox "Cross other axis at" date changed
 
+# Bug 123520 - Y axis - positioning tab, textbox "Cross other axis at" date changed
 class tdf123520(UITestCase):
    def test_tdf123520_chart_y_cross_other_axis(self):
     with self.ui_test.load_file(get_url_for_data_file("tdf123520.ods")) as calc_doc:
diff --git a/sc/qa/uitest/chart2/tdf124111.py b/sc/qa/uitest/chart2/tdf124111.py
index 50d4dcae9402..9ec377898090 100644
--- a/sc/qa/uitest/chart2/tdf124111.py
+++ b/sc/qa/uitest/chart2/tdf124111.py
@@ -7,14 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, type_text
 
-#Bug 124111 - Cannot enter negative number for cross other axis at value
 
+# Bug 124111 - Cannot enter negative number for cross other axis at value
 class tdf124111(UITestCase):
    def test_tdf124111_chart_x_negative_cross(self):
     with self.ui_test.load_file(get_url_for_data_file("tdf124111.ods")) as calc_doc:
diff --git a/sc/qa/uitest/chart2/tdf136011.py b/sc/qa/uitest/chart2/tdf136011.py
index 557d4fdfa9e1..973d24707860 100644
--- a/sc/qa/uitest/chart2/tdf136011.py
+++ b/sc/qa/uitest/chart2/tdf136011.py
@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
-from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_url_for_data_file
 
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+
 class tdf136011(UITestCase):
 
    def test_tdf136011(self):