diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/builder.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 541471a2b5bd..c91fe95bd0f5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -3767,11 +3767,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, stringmap *pA } if (!aItems.empty()) - { - // try to fill-in the items - if (!insertItems<ComboBox>(pCurrentChild, aProperties, m_aUserData, aItems)) - insertItems<ListBox>(pCurrentChild, aProperties, m_aUserData, aItems); - } + insertComboBoxOrListBoxItems(pCurrentChild, aProperties, aItems); return pCurrentChild; } @@ -4349,6 +4345,14 @@ void VclBuilder::mungeModel(SvTabListBox& rTarget, const ListStore &rStore, sal_ } } +void VclBuilder::insertComboBoxOrListBoxItems(vcl::Window *pWindow, VclBuilder::stringmap &rMap, + const std::vector<ComboBoxTextItem>& rItems) +{ + // try to fill-in the items + if (!insertItems<ComboBox>(pWindow, rMap, m_aUserData, rItems)) + insertItems<ListBox>(pWindow, rMap, m_aUserData, rItems); +} + void VclBuilder::mungeAdjustment(NumericFormatter &rTarget, const Adjustment &rAdjustment) { int nMul = rtl_math_pow10Exp(1, rTarget.GetDecimalDigits()); |