ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

support submenu entries of menus in vcl builder

Browse Source 
Change-Id: Ia6f80871ccf56527bb1338a288554bc37cd699e2
This commit is contained in:
Caolán McNamara
2017-02-17 15:34:09 +00:00
parent fbaec92d43
commit b64bdb8d75
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/source/window/builder.cxx
+24 -6
View File
@@ -2592,6 +2592,8 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
if (!sCustomProperty.isEmpty())
aProperties[OString("customproperty")] = sCustomProperty;
bool bInserted = false;
while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
@@ -2602,11 +2604,22 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
if (res == xmlreader::XmlReader::Result::Begin)
{
++nLevel;
if (name.equals("property"))
collectProperty(reader, sID, aProperties);
else if (name.equals("accelerator"))
collectAccelerator(reader, aAccelerators);
if (name.equals("child"))
{
insertMenuObject(pParent, sClass, sID, aProperties, aAccelerators);
VclPtr<PopupMenu> xSubMenu = VclPtr<PopupMenu>::Create();
pParent->SetPopupMenu(pParent->GetItemCount(), xSubMenu);
handleMenuChild(xSubMenu, reader);
bInserted = true;
}
else
{
++nLevel;
if (name.equals("property"))
collectProperty(reader, sID, aProperties);
else if (name.equals("accelerator"))
collectAccelerator(reader, aAccelerators);
}
}
if (res == xmlreader::XmlReader::Result::End)
@@ -2618,6 +2631,9 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
break;
}
if (bInserted)
return;
insertMenuObject(pParent, sClass, sID, aProperties, aAccelerators);
}
@@ -2722,6 +2738,9 @@ namespace
void VclBuilder::insertMenuObject(PopupMenu *pParent, const OString &rClass, const OString &rID,
stringmap &rProps, accelmap &rAccels)
{
if (rClass == "GtkMenu")
return;
sal_uInt16 nOldCount = pParent->GetItemCount();
sal_uInt16 nNewId = nOldCount + 1;
@@ -2746,7 +2765,6 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, const OString &rClass, con
pParent->InsertItem(nNewId, sLabel, MenuItemBits::CHECKABLE | MenuItemBits::RADIOCHECK, rID);
pParent->SetItemCommand(nNewId, aCommand);
}
else if (rClass == "GtkSeparatorMenuItem")
{
pParent->InsertSeparator(rID);