summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-11-05 10:12:14 +0200
committerAron Budea <aron.budea@collabora.com>2023-07-07 01:33:02 +0200
commit70974255a94eb9e91c266261d329bce53ba79556 (patch)
tree5703df1345dbeabbaf85bde8d699c7d0a0f45984
parent3d3d016e29532df7639752b72e2adf797028cd11 (diff)
[-Werror=nonnull] ‘this’ pointer is null
gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 is now complaining about a double-unlock Which has been there ever since commit fb6c93aed8d3d7468e4c9b412e432633c36e68fc Date: Wed Dec 13 14:05:51 2006 +0000 INTEGRATION: CWS fwk54 (1.1.2); FILE ADDED 2006/11/10 12:54:27 cd 1.1.2.1: #i65187# Protocol handler for vnd.sun.star.popup URLs to support dispatch by popup menu controller Change-Id: I87206bb7313b69babb16859808868ffa00707faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124731 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 03b476c0da596545bd9b99cc744a5fb56bfb797a)
-rw-r--r--framework/source/dispatch/popupmenudispatcher.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 1b845347454f..89fbcb939cf7 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -137,7 +137,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
// Find popup menu controller using the base URL
xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
- aGuard.clear();
// Ask popup menu dispatch provider for dispatch object
if ( xDispatchProvider.is() )