diff options
Diffstat (limited to 'framework/source/uielement/edittoolbarcontroller.cxx')
-rw-r--r-- | framework/source/uielement/edittoolbarcontroller.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 8bde909c703d..c05651664961 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -20,6 +20,8 @@ #include <uielement/edittoolbarcontroller.hxx> #include <com/sun/star/beans/PropertyValue.hpp> + +#include <comphelper/propertyvalue.hxx> #include <vcl/InterimItemWindow.hxx> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> @@ -66,7 +68,7 @@ EditControl::EditControl(vcl::Window* pParent, EditToolbarController* pEditToolb , m_xWidget(m_xBuilder->weld_entry("entry")) , m_pEditToolbarController(pEditToolbarController) { - OString sEmpty; + OUString sEmpty; m_xWidget->set_help_id(sEmpty); m_xContainer->set_help_id(sEmpty); @@ -160,14 +162,11 @@ void SAL_CALL EditToolbarController::dispose() Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { - Sequence<PropertyValue> aArgs( 2 ); OUString aSelectedText = m_pEditControl->get_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; } |