1 files changed, 5 insertions, 9 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index a54c78d0d774..68598a2a4ef6 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+#include <comphelper/propertyvalue.hxx>
 #include <vcl/InterimItemWindow.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/svapp.hxx>
@@ -29,9 +30,7 @@
 using namespace ::com::sun::star;
 using namespace css::uno;
 using namespace css::beans;
-using namespace css::lang;
 using namespace css::frame;
-using namespace css::util;
 
 namespace framework
 {
@@ -178,14 +177,11 @@ void SAL_CALL ComboboxToolbarController::dispose()
 
 Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
-    Sequence<PropertyValue> aArgs( 2 );
     OUString aSelectedText = m_pComboBox->get_active_text();
 
     // Add key modifier to argument list
-    aArgs[0].Name = "KeyModifier";
-    aArgs[0].Value <<= KeyModifier;
-    aArgs[1].Name = "Text";
-    aArgs[1].Value <<= aSelectedText;
+    Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue("KeyModifier", KeyModifier),
+                                   comphelper::makePropertyValue("Text", aSelectedText) };
     return aArgs;
 }
 
@@ -247,11 +243,11 @@ void ComboboxToolbarController::executeControlCommand( const css::frame::Control
                 m_pComboBox->clear();
 
                 rArg.Value >>= aList;
-                for (OUString const & rName : std::as_const(aList))
+                for (OUString const& rName : aList)
                     m_pComboBox->append_text(rName);
 
                 // send notification
-                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
+                uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::Any(aList) } };
                 addNotifyInfo( "ListChanged",
                                getDispatchFromCommand( m_aCommandURL ),
                                aInfo );