diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-24 10:12:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-24 10:50:33 +0000 |
| commit | 1799f269026bf6ec81f1c5e896698bc64d3ee16d (patch) | |
| tree | c3f933ad8fe5a419b6bb695faf96482595f5654b /vcl | |
| parent | Updated core (diff) | |
| download | core-1799f269026bf6ec81f1c5e896698bc64d3ee16d.tar.gz core-1799f269026bf6ec81f1c5e896698bc64d3ee16d.zip | |
strip customproperty from name of Mnemonic Widget target
Change-Id: I64e43e472215df35872e447e381047e64002184b
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 4596a2cc660f..9d6ab86a6fe5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -792,12 +792,16 @@ bool VclBuilder::extractButtonImage(const OString &id, stringmap &rMap, bool bRa return false; } -void VclBuilder::extractMnemonicWidget(const OString &id, stringmap &rMap) +void VclBuilder::extractMnemonicWidget(const OString &rLabelID, stringmap &rMap) { VclBuilder::stringmap::iterator aFind = rMap.find(OString("mnemonic-widget")); if (aFind != rMap.end()) { - m_pParserState->m_aMnemonicWidgetMaps.push_back(MnemonicWidgetMap(id, aFind->second)); + OString sID = aFind->second; + sal_Int32 nDelim = sID.indexOf(':'); + if (nDelim != -1) + sID = sID.copy(0, nDelim); + m_pParserState->m_aMnemonicWidgetMaps.push_back(MnemonicWidgetMap(rLabelID, sID)); rMap.erase(aFind); } } |