diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-13 20:42:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-14 09:13:07 +0100 |
commit | 6fc33b576eddc1ee2a4362243f7f891a13597613 (patch) | |
tree | 21ab28bfa262912ecf1b1c52e75d647bf7750d19 /vcl | |
parent | 403a75a275d9be8b3cc192b0653b4af3533f1ecc (diff) |
convert envelope printer page to .ui
Change-Id: I0d57f816abd05d8bb190fe47804b5a8db07ca6b5
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/builder.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 7295c318fdda..9d31230c28d1 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1430,18 +1430,28 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri { OUString aCommand(OStringToOUString(extractActionName(rMap), RTL_TEXTENCODING_UTF8)); + sal_uInt16 nItemId = 0; ToolBoxItemBits nBits = 0; if (name == "GtkMenuToolButton") nBits |= TIB_DROPDOWN; - if (!aCommand.isEmpty()) + if (!aCommand.isEmpty() && m_xFrame.is()) { pToolBox->InsertItem(aCommand, m_xFrame, nBits, extractSizeRequest(rMap)); - - OUString aTooltip(OStringToOUString(extractTooltipText(rMap), RTL_TEXTENCODING_UTF8)); - if (!aTooltip.isEmpty()) - pToolBox->SetQuickHelpText(pToolBox->GetItemId(aCommand), aTooltip); + nItemId = pToolBox->GetItemId(aCommand); } + else + { + const sal_uInt16 COMMAND_ITEMID_START = 30000; + nItemId = COMMAND_ITEMID_START + pToolBox->GetItemCount(); + pToolBox->InsertItem(nItemId, + OStringToOUString(extractLabel(rMap), RTL_TEXTENCODING_UTF8), nBits); + pToolBox->SetItemCommand(nItemId, aCommand); + } + + OUString sTooltip(OStringToOUString(extractTooltipText(rMap), RTL_TEXTENCODING_UTF8)); + if (!sTooltip.isEmpty()) + pToolBox->SetQuickHelpText(nItemId, sTooltip); return NULL; // no widget to be created } |