diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-22 10:16:39 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-03-26 01:30:31 +0100 |
| commit | d3922a93a096e07ab54e91fd0dd7c86302f33b78 (patch) | |
| tree | 7469ce6ac7ad379d39b9c38bb0b9bd590b7b54b2 /vcl/qa/cppunit/widgetdraw | |
| parent | 068880d65081ec2db1af7643fcb9a3680b3119c0 (diff) | |
Rename DrawCommand* to WidgetDrawAction*, remove unused circ draw
Change-Id: Icef900e75255d477812a198fdb29e0cdebba35b8
Reviewed-on: https://gerrit.libreoffice.org/69654
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/qa/cppunit/widgetdraw')
| -rw-r--r-- | vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx | 13 | ||||
| -rw-r--r-- | vcl/qa/cppunit/widgetdraw/data/definition1.xml | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx index 75dc559067fc..843f449b7901 100644 --- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx +++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx @@ -62,10 +62,11 @@ void WidgetDefinitionReaderTest::testRead() CPPUNIT_ASSERT_EQUAL(size_t(2), aStates.size()); - CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpDrawCommands.size()); - CPPUNIT_ASSERT_EQUAL(vcl::DrawCommandType::RECTANGLE, - aStates[0]->mpDrawCommands[0]->maType); - CPPUNIT_ASSERT_EQUAL(vcl::DrawCommandType::CIRCLE, aStates[0]->mpDrawCommands[1]->maType); + CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpWidgetDrawActions.size()); + CPPUNIT_ASSERT_EQUAL(vcl::WidgetDrawActionType::RECTANGLE, + aStates[0]->mpWidgetDrawActions[0]->maType); + CPPUNIT_ASSERT_EQUAL(vcl::WidgetDrawActionType::LINE, + aStates[0]->mpWidgetDrawActions[1]->maType); } // Radiobutton @@ -75,7 +76,7 @@ void WidgetDefinitionReaderTest::testRead() ->getStates(ControlType::Radiobutton, ControlPart::Entire, ControlState::NONE, ImplControlValue(ButtonValue::On)); CPPUNIT_ASSERT_EQUAL(size_t(1), aStates.size()); - CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpDrawCommands.size()); + CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpWidgetDrawActions.size()); } { @@ -84,7 +85,7 @@ void WidgetDefinitionReaderTest::testRead() ->getStates(ControlType::Radiobutton, ControlPart::Entire, ControlState::NONE, ImplControlValue(ButtonValue::Off)); CPPUNIT_ASSERT_EQUAL(size_t(1), aStates.size()); - CPPUNIT_ASSERT_EQUAL(size_t(1), aStates[0]->mpDrawCommands.size()); + CPPUNIT_ASSERT_EQUAL(size_t(1), aStates[0]->mpWidgetDrawActions.size()); } } diff --git a/vcl/qa/cppunit/widgetdraw/data/definition1.xml b/vcl/qa/cppunit/widgetdraw/data/definition1.xml index 4fb1c4230853..041e8fc24754 100644 --- a/vcl/qa/cppunit/widgetdraw/data/definition1.xml +++ b/vcl/qa/cppunit/widgetdraw/data/definition1.xml @@ -56,7 +56,7 @@ <part value="Entire"> <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any"> <rect stroke="#808080" fill="#FFFFFF" stroke-width="1.0" rx="5" ry="5" margin="1"/> - <circ stroke="#808080" fill="#808080" stroke-width="1.0" margin="1"/> + <line stroke="#808080" fill="#808080" stroke-width="1.0"/> </state> <state enabled="true" focused="any" pressed="any" rollover="true" default="true" selected="any" button-value="any"> <rect stroke="#808080" fill="#808080" stroke-width="1.0" rx="5" ry="5" margin="1"/> @@ -71,11 +71,11 @@ <radiobutton> <part value="Entire"> <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="false"> - <circ stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/> + <rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/> </state> <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="true"> - <circ stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/> - <circ stroke="#007AFF" fill="#007AFF" stroke-width="1" margin="3"/> + <rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/> + <rect stroke="#007AFF" fill="#007AFF" stroke-width="1" margin="3"/> </state> </part> </radiobutton> |