mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove code duplication in WidgetDefinitionReader

Browse Source 
Change-Id: Iec4694344d324b4d4d7e55efdedf8520dd914d63
Reviewed-on: https://gerrit.libreoffice.org/68656
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-01-24 17:56:44 +01:00
committed by Tomaž Vajngerl
parent b07a71e09a
commit be999e2ec2
2 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/inc/widgetdraw/WidgetDefinitionReader.hxx
View File

@@ -106,6 +106,12 @@ class VCL_DLLPUBLIC WidgetDefinitionReader
private: private:
OUString m_rFilePath; OUString m_rFilePath;
static void
readDefinition(tools::XmlWalker& rWalker,
std::unordered_map<OString, std::shared_ptr<WidgetDefinition>>& rDefinition);
static void readPart(tools::XmlWalker& rWalker, std::shared_ptr<WidgetDefinition> rpPart);
void readPushButton(tools::XmlWalker& rWalker); void readPushButton(tools::XmlWalker& rWalker);
void readRadioButton(tools::XmlWalker& rWalker); void readRadioButton(tools::XmlWalker& rWalker);
static void readDrawingDefinition(tools::XmlWalker& rWalker, static void readDrawingDefinition(tools::XmlWalker& rWalker,

67
vcl/source/gdi/WidgetDefinitionReader.cxx
View File

@@ -119,7 +119,9 @@ void WidgetDefinitionReader::readDrawingDefinition(tools::XmlWalker& rWalker,
rWalker.parent(); rWalker.parent();
} }
void WidgetDefinitionReader::readPushButton(tools::XmlWalker& rWalker) void WidgetDefinitionReader::readDefinition(
tools::XmlWalker& rWalker,
std::unordered_map<OString, std::shared_ptr<WidgetDefinition>>& rDefinition)
{ {
rWalker.children(); rWalker.children();
while (rWalker.isValid()) while (rWalker.isValid())
@@ -128,7 +130,17 @@ void WidgetDefinitionReader::readPushButton(tools::XmlWalker& rWalker)
{ {
OString sPart = rWalker.attribute("value"); OString sPart = rWalker.attribute("value");
std::shared_ptr<WidgetDefinition> pPart = std::make_shared<WidgetDefinition>(); std::shared_ptr<WidgetDefinition> pPart = std::make_shared<WidgetDefinition>();
maPushButtonDefinitions.emplace(sPart, pPart); rDefinition.emplace(sPart, pPart);
readPart(rWalker, pPart);
}
rWalker.next();
}
rWalker.parent();
}
void WidgetDefinitionReader::readPart(tools::XmlWalker& rWalker,
std::shared_ptr<WidgetDefinition> rpPart)
{
rWalker.children(); rWalker.children();
while (rWalker.isValid()) while (rWalker.isValid())
{ {
@@ -142,59 +154,24 @@ void WidgetDefinitionReader::readPushButton(tools::XmlWalker& rWalker)
OString sSelected = rWalker.attribute("selected"); OString sSelected = rWalker.attribute("selected");
OString sButtonValue = rWalker.attribute("button-value"); OString sButtonValue = rWalker.attribute("button-value");
std::shared_ptr<WidgetDefinitionState> pState std::shared_ptr<WidgetDefinitionState> pState = std::make_shared<WidgetDefinitionState>(
= std::make_shared<WidgetDefinitionState>(sEnabled, sFocused, sPressed, sEnabled, sFocused, sPressed, sRollover, sDefault, sSelected, sButtonValue);
sRollover, sDefault, sSelected, rpPart->maStates.push_back(pState);
sButtonValue);
pPart->maStates.push_back(pState);
readDrawingDefinition(rWalker, pState); readDrawingDefinition(rWalker, pState);
} }
rWalker.next(); rWalker.next();
} }
rWalker.parent(); rWalker.parent();
} }
rWalker.next();
} void WidgetDefinitionReader::readPushButton(tools::XmlWalker& rWalker)
rWalker.parent(); {
readDefinition(rWalker, maPushButtonDefinitions);
} }
void WidgetDefinitionReader::readRadioButton(tools::XmlWalker& rWalker) void WidgetDefinitionReader::readRadioButton(tools::XmlWalker& rWalker)
{ {
rWalker.children(); readDefinition(rWalker, maRadioButtonDefinitions);
while (rWalker.isValid())
{
if (rWalker.name() == "part")
{
OString sPart = rWalker.attribute("value");
std::shared_ptr<WidgetDefinition> pPart = std::make_shared<WidgetDefinition>();
maRadioButtonDefinitions.emplace(sPart, pPart);
rWalker.children();
while (rWalker.isValid())
{
if (rWalker.name() == "state")
{
OString sEnabled = rWalker.attribute("enabled");
OString sFocused = rWalker.attribute("focused");
OString sPressed = rWalker.attribute("pressed");
OString sRollover = rWalker.attribute("rollover");
OString sDefault = rWalker.attribute("default");
OString sSelected = rWalker.attribute("selected");
OString sButtonValue = rWalker.attribute("button-value");
sButtonValue = sButtonValue.isEmpty() ? "any" : sButtonValue;
std::shared_ptr<WidgetDefinitionState> pState
= std::make_shared<WidgetDefinitionState>(sEnabled, sFocused, sPressed,
sRollover, sDefault, sSelected,
sButtonValue);
pPart->maStates.push_back(pState);
readDrawingDefinition(rWalker, pState);
}
rWalker.next();
}
rWalker.parent();
}
rWalker.next();
}
rWalker.parent();
} }
bool WidgetDefinitionReader::read() bool WidgetDefinitionReader::read()