diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-19 08:47:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-19 17:18:42 +0100 |
| commit | 21dd05a2a2909470f4bba76b0b10b3889043a10b (patch) | |
| tree | 0891aab70b6695105d557ef63202c24a6f6b47e7 /framework | |
| parent | 3dd1948e791e511557bc7be25aa3306439c9e94c (diff) | |
cid#1557601 COPY_INSTEAD_OF_MOVE
and
cid#1546498 COPY_INSTEAD_OF_MOVE
cid#1546384 COPY_INSTEAD_OF_MOVE
cid#1546376 COPY_INSTEAD_OF_MOVE
cid#1546374 COPY_INSTEAD_OF_MOVE
cid#1546373 COPY_INSTEAD_OF_MOVE
cid#1546368 COPY_INSTEAD_OF_MOVE
cid#1546365 COPY_INSTEAD_OF_MOVE
cid#1546356 COPY_INSTEAD_OF_MOVE
cid#1546340 COPY_INSTEAD_OF_MOVE
cid#1546266 COPY_INSTEAD_OF_MOVE
cid#1546236 COPY_INSTEAD_OF_MOVE
cid#1546188 COPY_INSTEAD_OF_MOVE
cid#1546178 COPY_INSTEAD_OF_MOVE
cid#1546166 COPY_INSTEAD_OF_MOVE
cid#1546156 COPY_INSTEAD_OF_MOVE
cid#1546144 COPY_INSTEAD_OF_MOVE
cid#1546143 COPY_INSTEAD_OF_MOVE
cid#1546100 COPY_INSTEAD_OF_MOVE
cid#1546078 COPY_INSTEAD_OF_MOVE
cid#1546041 COPY_INSTEAD_OF_MOVE
cid#1546036 COPY_INSTEAD_OF_MOVE
cid#1546033 COPY_INSTEAD_OF_MOVE
Change-Id: Ib3586d93198992e206baf5c2de5a663d5574aa3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160979
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 827991f7226d..3c5923396cfc 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -155,9 +155,6 @@ void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) css::util::URL aTargetURL; - // Add key modifier to argument list - Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue("KeyModifier", KeyModifier) }; - // handle also command aliases auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(m_aCommandURL, vcl::CommandInfoProvider::GetModuleIdentifier(m_xFrame)); @@ -171,7 +168,9 @@ void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; - pExecuteInfo->aArgs = aArgs; + // Add key modifier to argument list + pExecuteInfo->aArgs = { comphelper::makePropertyValue("KeyModifier", KeyModifier) }; + Application::PostUserEvent( LINK(nullptr, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } |