framework/source/dispatch/popupmenudispatcher.cxx | 92 +++++++++++-----------
1 file changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 9ffbbd9dba5f12be2914ebbf01ebdd303b695e46
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 5 10:16:47 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 5 10:41:03 2021 +0100
flatten PopupMenuDispatcher::queryDispatch
Change-Id: I8dce031913a4ed40faa8d7994b1da8990d684091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124732
Tested-by: Jenkins
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx
b/framework/source/dispatch/popupmenudispatcher.cxx
index a79ffe35e6b8..0333c0698fe6 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -98,57 +98,57 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
const OUString& sTarget ,
sal_Int32 nFlags )
{
- css::uno::Reference< css::frame::XDispatch > xDispatch;
+ if ( !rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
+ return {};
- if ( rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
- {
- // --- SAFE ---
- SolarMutexClearableGuard aGuard;
- impl_RetrievePopupControllerQuery();
- if ( !m_xUriRefFactory.is() )
- m_xUriRefFactory = css::uri::UriReferenceFactory::create(
m_xContext );
+ // --- SAFE ---
+ SolarMutexClearableGuard aGuard;
+ impl_RetrievePopupControllerQuery();
+ if ( !m_xUriRefFactory.is() )
+ m_xUriRefFactory = css::uri::UriReferenceFactory::create( m_xContext );
+
+ css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery(
m_xPopupCtrlQuery );
+ aGuard.clear();
+ // --- SAFE ---
+
+ if ( !xPopupCtrlQuery.is() )
+ return {};
- css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery(
m_xPopupCtrlQuery );
- aGuard.clear();
- // --- SAFE ---
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
- if ( xPopupCtrlQuery.is() )
+ try
+ {
+ // Just use the main part of the URL for popup menu controllers
+ sal_Int32 nSchemePart( 0 );
+ OUString aBaseURL( "vnd.sun.star.popup:" );
+ OUString aURL( rURL.Complete );
+
+ nSchemePart = aURL.indexOf( ':' );
+ if (( nSchemePart > 0 ) &&
+ ( aURL.getLength() > ( nSchemePart+1 )))
{
- try
- {
- // Just use the main part of the URL for popup menu controllers
- sal_Int32 nSchemePart( 0 );
- OUString aBaseURL( "vnd.sun.star.popup:" );
- OUString aURL( rURL.Complete );
-
- nSchemePart = aURL.indexOf( ':' );
- if (( nSchemePart > 0 ) &&
- ( aURL.getLength() > ( nSchemePart+1 )))
- {
- sal_Int32 nQueryPart = aURL.indexOf( '?', nSchemePart );
- if ( nQueryPart > 0 )
- aBaseURL += aURL.subView( nSchemePart+1,
nQueryPart-(nSchemePart+1) );
- else if ( nQueryPart == -1 )
- aBaseURL += aURL.subView( nSchemePart+1 );
- }
-
- css::uno::Reference< css::frame::XDispatchProvider >
xDispatchProvider;
-
- // Find popup menu controller using the base URL
- xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
-
- // Ask popup menu dispatch provider for dispatch object
- if ( xDispatchProvider.is() )
- xDispatch = xDispatchProvider->queryDispatch( rURL,
sTarget, nFlags );
- }
- catch ( const RuntimeException& )
- {
- throw;
- }
- catch ( const Exception& )
- {
- }
+ sal_Int32 nQueryPart = aURL.indexOf( '?', nSchemePart );
+ if ( nQueryPart > 0 )
+ aBaseURL += aURL.subView( nSchemePart+1,
nQueryPart-(nSchemePart+1) );
+ else if ( nQueryPart == -1 )
+ aBaseURL += aURL.subView( nSchemePart+1 );
}
+
+ css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider;
+
+ // Find popup menu controller using the base URL
+ xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
+
+ // Ask popup menu dispatch provider for dispatch object
+ if ( xDispatchProvider.is() )
+ xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget,
nFlags );
+ }
+ catch ( const RuntimeException& )
+ {
+ throw;
+ }
+ catch ( const Exception& )
+ {
}
return xDispatch;
}
