[Libreoffice-commits] core.git: chart2/source framework/source include/svtools svtools/Library_svt.mk svtools/source
Maxim Monastirsky
momonasmon at gmail.com
Thu Jun 9 12:54:10 UTC 2016
chart2/source/controller/main/ChartController_Window.cxx | 51 -
framework/source/uielement/resourcemenucontroller.cxx | 3
include/svtools/contextmenuhelper.hxx | 113 --
svtools/Library_svt.mk | 1
svtools/source/uno/contextmenuhelper.cxx | 611 ---------------
5 files changed, 25 insertions(+), 754 deletions(-)
New commits:
commit bdd67652b6b60164220c259b5c4dbef1aba85102
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu Jun 9 14:29:45 2016 +0300
Try to get rid of svt::ContextMenuHelper
Change-Id: I7b43e417607b20c300e3c18e7da76a6173a18b7d
Reviewed-on: https://gerrit.libreoffice.org/26098
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 639dfa8..40f196f 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -58,7 +58,6 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
-#include <svtools/contextmenuhelper.hxx>
#include <toolkit/awt/vclxmenu.hxx>
#include <svx/svxids.hrc>
@@ -962,31 +961,10 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
aPos = m_pChartWindow->GetPointerState().maPos;
}
+ OUString aMenuName;
if ( isShapeContext() )
- {
// #i12587# support for shapes in chart
- OUString aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUString( "drawtext" ) : OUString( "draw" );
- css::uno::Sequence< css::uno::Any > aArgs( 3 );
- aArgs[0] <<= comphelper::makePropertyValue( "Value", aMenuName );
- aArgs[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame );
- aArgs[2] <<= comphelper::makePropertyValue( "IsContextMenu", true );
-
- css::uno::Reference< css::frame::XPopupMenuController > xPopupController(
- m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext(
- "com.sun.star.comp.framework.ResourceMenuController", aArgs, m_xCC ), css::uno::UNO_QUERY );
-
- if ( !xPopupController.is() || !xPopupMenu.is() )
- return;
-
- xPopupController->setPopupMenu( xPopupMenu );
- xPopupMenu->execute( css::uno::Reference< css::awt::XWindowPeer >( m_xFrame->getContainerWindow(), css::uno::UNO_QUERY ),
- css::awt::Rectangle( aPos.X(), aPos.Y(), 0, 0 ),
- css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
-
- css::uno::Reference< css::lang::XComponent > xComponent( xPopupController, css::uno::UNO_QUERY );
- if ( xComponent.is() )
- xComponent->dispose();
- }
+ aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUString( "drawtext" ) : OUString( "draw" );
else
{
// todo: the context menu should be specified by an xml file in uiconfig
@@ -1236,11 +1214,30 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DataRanges" );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramData" );
lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:View3D" );
-
- ::svt::ContextMenuHelper aContextMenuHelper( m_xFrame );
- aContextMenuHelper.completeAndExecute( aPos, xPopupMenu );
}
}
+
+ css::uno::Sequence< css::uno::Any > aArgs( aMenuName.isEmpty() ? 2 : 3 );
+ aArgs[0] <<= comphelper::makePropertyValue( "IsContextMenu", true );
+ aArgs[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame );
+ if ( !aMenuName.isEmpty() )
+ aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName );
+
+ css::uno::Reference< css::frame::XPopupMenuController > xPopupController(
+ m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext(
+ "com.sun.star.comp.framework.ResourceMenuController", aArgs, m_xCC ), css::uno::UNO_QUERY );
+
+ if ( !xPopupController.is() || !xPopupMenu.is() )
+ return;
+
+ xPopupController->setPopupMenu( xPopupMenu );
+ xPopupMenu->execute( css::uno::Reference< css::awt::XWindowPeer >( m_xFrame->getContainerWindow(), css::uno::UNO_QUERY ),
+ css::awt::Rectangle( aPos.X(), aPos.Y(), 0, 0 ),
+ css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
+
+ css::uno::Reference< css::lang::XComponent > xComponent( xPopupController, css::uno::UNO_QUERY );
+ if ( xComponent.is() )
+ xComponent->dispose();
}
else if( ( rCEvt.GetCommand() == CommandEventId::StartExtTextInput ) ||
( rCEvt.GetCommand() == CommandEventId::ExtTextInput ) ||
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 57674a1..47c3f1c 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -112,8 +112,7 @@ ResourceMenuController::~ResourceMenuController()
void ResourceMenuController::updatePopupMenu()
throw ( css::uno::RuntimeException, std::exception )
{
- if ( m_xMenuContainer.is() && !m_bContextMenu )
- // Container is still valid, no need to do anything on our side.
+ if ( ( m_xMenuContainer.is() && !m_bContextMenu ) || m_aMenuURL.isEmpty() )
return;
if ( m_aModuleName.isEmpty() )
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
deleted file mode 100644
index 4a7b55f..0000000
--- a/include/svtools/contextmenuhelper.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX
-#define INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/awt/XPopupMenu.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/ui/XImageManager.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <vcl/menu.hxx>
-#include <svtools/svtdllapi.h>
-
-namespace svt
-{
-
-/**
- Context menu helper class.
-
- Fills images and labels for a provided popup menu or
- com.sun.star.awt.XPopupMenu.
-
- PRECONDITION:
- All commands must be set via SetItemCommand and are part
- of the configuration files
- (see org.openoffice.Office.UI.[Module]Commands.xcu)
-*/
-struct ExecuteInfo;
-class SVT_DLLPUBLIC ContextMenuHelper
-{
- public:
- // create context menu helper
- // ARGS: xFrame = frame defines the context of the context menu
- ContextMenuHelper( const css::uno::Reference< css::frame::XFrame >& xFrame );
- ~ContextMenuHelper();
-
- // method to complete a popup menu (set images, labels, enable/disable states)
- // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!)
- void completeAndExecute( const Point& aPos, const css::uno::Reference< css::awt::XPopupMenu >& xPopupMenu );
-
- private:
- // asynchronous link to prevent destruction while on stack
- DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void );
-
- ContextMenuHelper( const ContextMenuHelper& ) = delete;
- const ContextMenuHelper& operator=( const ContextMenuHelper& ) = delete;
-
- // show context menu and dispatch command automatically
- void executePopupMenu( const Point& aPos, PopupMenu* pMenu );
-
- // fill image and label for every menu item on the provided menu
- void completeMenuProperties( Menu* pMenu );
-
- // dispatch provided command
- bool dispatchCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL );
-
-
- // methods to retrieve a single command URL dependent value from a
- // ui configuration manager
- Image getImageFromCommandURL( const OUString& aCmdURL ) const;
- OUString getLabelFromCommandURL( const OUString& aCmdURL ) const;
-
- // creates an association between current module/controller bound to the
- // provided frame and their ui configuration managers.
- void associateUIConfigurationManagers();
-
- // resets associations to create associations again on-demand.
- // Useful for implementations which recycle frames. Normal
- // implementations can profit from caching and should set
- // auto refresh on ctor to false (default).
- void resetAssociations()
- {
- if ( m_bAutoRefresh )
- m_bUICfgMgrAssociated = false;
- }
-
- css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame;
- OUString m_aSelf;
- css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
- css::uno::Sequence< css::beans::PropertyValue > m_aDefaultArgs;
- css::uno::Reference< css::ui::XImageManager > m_xDocImageMgr;
- css::uno::Reference< css::ui::XImageManager > m_xModuleImageMgr;
- css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels;
- bool m_bAutoRefresh;
- bool m_bUICfgMgrAssociated;
-};
-
-} // namespace svt
-
-#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 9bb7f0f..5ace8ca 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -213,7 +213,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/table/cellvalueconversion \
svtools/source/table/tablegeometry \
svtools/source/uno/addrtempuno \
- svtools/source/uno/contextmenuhelper \
svtools/source/uno/fpicker \
svtools/source/uno/framestatuslistener \
svtools/source/uno/generictoolboxcontroller \
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
deleted file mode 100644
index b245c01..0000000
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ /dev/null
@@ -1,611 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <svtools/contextmenuhelper.hxx>
-#include <svtools/menuoptions.hxx>
-#include <svtools/miscopt.hxx>
-
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/frame/theUICommandDescription.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-#include <osl/conditn.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/image.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/awt/vclxmenu.hxx>
-
-using namespace ::com::sun::star;
-
-namespace svt
-{
-
-// internal helper class to retrieve status updates
-class StateEventHelper : public css::frame::XStatusListener,
- public ::cppu::OWeakObject
-{
- public:
- StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider,
- const uno::Reference< util::XURLTransformer >& xURLTransformer,
- const OUString& aCommandURL );
- virtual ~StateEventHelper();
- StateEventHelper(const StateEventHelper&) = delete;
- StateEventHelper& operator=(const StateEventHelper&) = delete;
-
- bool isCommandEnabled();
-
- // XInterface
- virtual uno::Any SAL_CALL queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
-
- // XEventListener
- virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException, std::exception ) override;
-
- // XStatusListener
- virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& Event) throw( uno::RuntimeException, std::exception ) override;
-
- private:
- bool m_bCurrentCommandEnabled;
- OUString m_aCommandURL;
- uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
- uno::Reference< util::XURLTransformer > m_xURLTransformer;
- osl::Condition m_aCondition;
-};
-
-StateEventHelper::StateEventHelper(
- const uno::Reference< frame::XDispatchProvider >& xDispatchProvider,
- const uno::Reference< util::XURLTransformer >& xURLTransformer,
- const OUString& rCommandURL ) :
- m_bCurrentCommandEnabled( true ),
- m_aCommandURL( rCommandURL ),
- m_xDispatchProvider( xDispatchProvider ),
- m_xURLTransformer( xURLTransformer )
-{
- m_aCondition.reset();
-}
-
-StateEventHelper::~StateEventHelper()
-{}
-
-uno::Any SAL_CALL StateEventHelper::queryInterface(
- const uno::Type& aType )
-throw ( uno::RuntimeException, std::exception )
-{
- uno::Any a = ::cppu::queryInterface(
- aType,
- (static_cast< XStatusListener* >(this)));
-
- if( a.hasValue() )
- return a;
-
- return ::cppu::OWeakObject::queryInterface( aType );
-}
-
-void SAL_CALL StateEventHelper::acquire()
-throw ()
-{
- ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL StateEventHelper::release()
-throw ()
-{
- ::cppu::OWeakObject::release();
-}
-
-void SAL_CALL StateEventHelper::disposing(
- const lang::EventObject& )
-throw ( uno::RuntimeException, std::exception )
-{
- SolarMutexGuard aSolarGuard;
- m_xDispatchProvider.clear();
- m_xURLTransformer.clear();
- m_aCondition.set();
-}
-
-void SAL_CALL StateEventHelper::statusChanged(
- const frame::FeatureStateEvent& Event )
-throw ( uno::RuntimeException, std::exception )
-{
- SolarMutexGuard aSolarGuard;
- m_bCurrentCommandEnabled = Event.IsEnabled;
- m_aCondition.set();
-}
-
-bool StateEventHelper::isCommandEnabled()
-{
- // Be sure that we cannot die during condition wait
- uno::Reference< frame::XStatusListener > xSelf(
- (static_cast< frame::XStatusListener* >(this)));
-
- uno::Reference< frame::XDispatch > xDispatch;
- util::URL aTargetURL;
- {
- SolarMutexGuard aSolarGuard;
- if ( m_xDispatchProvider.is() && m_xURLTransformer.is() )
- {
- OUString aSelf( "_self" );
-
- aTargetURL.Complete = m_aCommandURL;
- m_xURLTransformer->parseStrict( aTargetURL );
-
- try
- {
- xDispatch = m_xDispatchProvider->queryDispatch( aTargetURL, aSelf, 0 );
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
- }
- }
-
- bool bResult( false );
- if ( xDispatch.is() )
- {
- try
- {
- // add/remove ourself to retrieve status by callback
- xDispatch->addStatusListener( xSelf, aTargetURL );
- xDispatch->removeStatusListener( xSelf, aTargetURL );
-
- // wait for answer
- m_aCondition.wait();
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
-
- SolarMutexGuard aSolarGuard;
- bResult = m_bCurrentCommandEnabled;
- }
-
- return bResult;
-}
-
-/*************************************************************************/
-
-struct ExecuteInfo
-{
- uno::Reference< frame::XDispatch > xDispatch;
- util::URL aTargetURL;
- uno::Sequence< beans::PropertyValue > aArgs;
-};
-
-static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sal_uInt16 nItemId )
-{
- if ( pPopupMenu )
- {
- sal_uInt16 nCount = pPopupMenu->GetItemCount();
- for ( sal_uInt16 i = 0; i < nCount; i++ )
- {
- sal_uInt16 nId = pPopupMenu->GetItemId( i );
- if ( nId == nItemId )
- return pPopupMenu;
- else
- {
- const PopupMenu* pResult( nullptr );
-
- const PopupMenu* pSubPopup = pPopupMenu->GetPopupMenu( i );
- if ( pPopupMenu )
- pResult = lcl_FindPopupFromItemId( pSubPopup, nItemId );
- if ( pResult != nullptr )
- return pResult;
- }
- }
- }
-
- return nullptr;
-}
-
-static OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId )
-{
- const PopupMenu* pPopup = lcl_FindPopupFromItemId( pPopupMenu, nItemId );
- if ( pPopup )
- return pPopup->GetItemCommand( nItemId );
- else
- return OUString();
-}
-
-/*************************************************************************/
-
-ContextMenuHelper::ContextMenuHelper(
- const uno::Reference< frame::XFrame >& xFrame ) :
- m_xWeakFrame( xFrame ),
- m_aSelf( "_self" ),
- m_bAutoRefresh( true ),
- m_bUICfgMgrAssociated( false )
-{
-}
-
-ContextMenuHelper::~ContextMenuHelper()
-{
-}
-
-void
-ContextMenuHelper::completeAndExecute(
- const Point& aPos,
- const uno::Reference< awt::XPopupMenu >& xPopupMenu )
-{
- SolarMutexGuard aSolarGuard;
-
- VCLXMenu* pXMenu = VCLXMenu::GetImplementation( xPopupMenu );
- if ( pXMenu )
- {
- PopupMenu* pPopupMenu = dynamic_cast< PopupMenu* >( pXMenu->GetMenu() );
- // as dynamic_cast can return zero check pointer
- if ( pPopupMenu )
- {
- associateUIConfigurationManagers();
- completeMenuProperties( pPopupMenu );
- executePopupMenu( aPos, pPopupMenu );
- resetAssociations();
- }
- }
-}
-
-// private member
-
-void
-ContextMenuHelper::executePopupMenu(
- const Point& rPos,
- PopupMenu* pMenu )
-{
- if ( pMenu )
- {
- uno::Reference< frame::XFrame > xFrame( m_xWeakFrame );
- if ( xFrame.is() )
- {
- uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow() );
- if ( xWindow.is() )
- {
- vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow );
- sal_uInt16 nResult = pMenu->Execute( pParent, rPos );
-
- if ( nResult > 0 )
- {
- OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult );
- if ( !aCommand.isEmpty() )
- dispatchCommand( xFrame, aCommand );
- }
- }
- }
- }
-}
-
-bool
-ContextMenuHelper::dispatchCommand(
- const uno::Reference< ::frame::XFrame >& rFrame,
- const OUString& aCommandURL )
-{
- if ( !m_xURLTransformer.is() )
- {
- m_xURLTransformer = util::URLTransformer::create( ::comphelper::getProcessComponentContext() );
- }
-
- util::URL aTargetURL;
- aTargetURL.Complete = aCommandURL;
- m_xURLTransformer->parseStrict( aTargetURL );
-
- uno::Reference< frame::XDispatch > xDispatch;
- uno::Reference< frame::XDispatchProvider > xDispatchProvider(
- rFrame, uno::UNO_QUERY );
- if ( xDispatchProvider.is() )
- {
- try
- {
- xDispatch = xDispatchProvider->queryDispatch( aTargetURL, m_aSelf, 0 );
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
- }
-
- if ( xDispatch.is() )
- {
- ExecuteInfo* pExecuteInfo = new ExecuteInfo;
- pExecuteInfo->xDispatch = xDispatch;
- pExecuteInfo->aTargetURL = aTargetURL;
- pExecuteInfo->aArgs = m_aDefaultArgs;
-
- Application::PostUserEvent( LINK(nullptr, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo );
- return true;
- }
-
- return false;
-}
-
-// retrieves and stores references to our user-interface
-// configuration managers, like image manager, ui command
-// description manager.
-void
-ContextMenuHelper::associateUIConfigurationManagers()
-{
- uno::Reference< frame::XFrame > xFrame( m_xWeakFrame );
- if ( !m_bUICfgMgrAssociated && xFrame.is() )
- {
- // clear current state
- m_xDocImageMgr.clear();
- m_xModuleImageMgr.clear();
- m_xUICommandLabels.clear();
-
- try
- {
- uno::Reference < frame::XController > xController;
- uno::Reference < frame::XModel > xModel;
- xController = xFrame->getController();
- if ( xController.is() )
- xModel = xController->getModel();
-
- if ( xModel.is() )
- {
- // retrieve document image manager form model
- uno::Reference< ui::XUIConfigurationManagerSupplier > xSupplier( xModel, uno::UNO_QUERY );
- if ( xSupplier.is() )
- {
- uno::Reference< ui::XUIConfigurationManager > xDocUICfgMgr(
- xSupplier->getUIConfigurationManager(), uno::UNO_QUERY );
- m_xDocImageMgr.set( xDocUICfgMgr->getImageManager(), uno::UNO_QUERY );
- }
- }
-
- uno::Reference< frame::XModuleManager2 > xModuleManager(
- frame::ModuleManager::create( ::comphelper::getProcessComponentContext() ) );
-
- uno::Reference< ui::XImageManager > xModuleImageManager;
- OUString aModuleId;
- // retrieve module image manager
- aModuleId = xModuleManager->identify( xFrame );
-
- uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier(
- ui::theModuleUIConfigurationManagerSupplier::get(
- ::comphelper::getProcessComponentContext() ) );
- uno::Reference< ui::XUIConfigurationManager > xUICfgMgr(
- xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId ));
- if ( xUICfgMgr.is() )
- {
- m_xModuleImageMgr.set( xUICfgMgr->getImageManager(), uno::UNO_QUERY );
- }
-
- uno::Reference< container::XNameAccess > xNameAccess(
- frame::theUICommandDescription::get(
- ::comphelper::getProcessComponentContext()),
- uno::UNO_QUERY_THROW );
- try
- {
- uno::Any a = xNameAccess->getByName( aModuleId );
- a >>= m_xUICommandLabels;
- }
- catch ( container::NoSuchElementException& )
- {
- }
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
- m_bUICfgMgrAssociated = true;
- }
-}
-
-Image
-ContextMenuHelper::getImageFromCommandURL( const OUString& aCmdURL ) const
-{
- Image aImage;
- sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL|
- ui::ImageType::SIZE_DEFAULT );
-
- uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
- uno::Sequence<OUString> aImageCmdSeq { aCmdURL };
-
- if ( m_xDocImageMgr.is() )
- {
- try
- {
- aGraphicSeq = m_xDocImageMgr->getImages( nImageType, aImageCmdSeq );
- uno::Reference< graphic::XGraphic > xGraphic = aGraphicSeq[0];
- aImage = Image( xGraphic );
-
- if ( !!aImage )
- return aImage;
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
- }
-
- if ( m_xModuleImageMgr.is() )
- {
- try
- {
- aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq );
- uno::Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0];
- aImage = Image( xGraphic );
-
- if ( !!aImage )
- return aImage;
- }
- catch ( uno::RuntimeException& )
- {
- throw;
- }
- catch ( uno::Exception& )
- {
- }
- }
-
- return aImage;
-}
-
-OUString
-ContextMenuHelper::getLabelFromCommandURL(
- const OUString& aCmdURL ) const
-{
- OUString aLabel;
-
- if ( m_xUICommandLabels.is() )
- {
- try
- {
- if ( !aCmdURL.isEmpty() )
- {
- OUString aStr;
- uno::Sequence< beans::PropertyValue > aPropSeq;
- uno::Any a( m_xUICommandLabels->getByName( aCmdURL ));
- if ( a >>= aPropSeq )
- {
- for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
- {
- if ( aPropSeq[i].Name == "Label" )
- {
- aPropSeq[i].Value >>= aStr;
- break;
- }
- }
- }
- aLabel = aStr;
- }
- }
- catch ( uno::RuntimeException& )
- {
- }
- catch ( uno::Exception& )
- {
- }
- }
-
- return aLabel;
-}
-
-void
-ContextMenuHelper::completeMenuProperties(
- Menu* pMenu )
-{
- // Retrieve some settings necessary to display complete context
- // menu correctly.
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- bool bShowMenuImages( rSettings.GetUseImagesInMenus() );
-
- if ( pMenu )
- {
- uno::Reference< frame::XFrame > xFrame( m_xWeakFrame );
- uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, uno::UNO_QUERY );
-
- if ( !m_xURLTransformer.is() )
- {
- m_xURLTransformer = util::URLTransformer::create( ::comphelper::getProcessComponentContext() );
- }
-
- for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
- {
- sal_uInt16 nId = pMenu->GetItemId( nPos );
- PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nId );
- if ( pPopupMenu )
- completeMenuProperties( pPopupMenu );
- if ( pMenu->GetItemType( nPos ) != MenuItemType::SEPARATOR )
- {
- OUString aCmdURL( pMenu->GetItemCommand( nId ));
-
- if ( bShowMenuImages )
- {
- Image aImage;
- if ( !aCmdURL.isEmpty() )
- aImage = getImageFromCommandURL( aCmdURL );
- pMenu->SetItemImage( nId, aImage );
- }
- else
- pMenu->SetItemImage( nId, Image() );
-
- if (pMenu->GetItemText(nId).isEmpty())
- {
- OUString aLabel( getLabelFromCommandURL( aCmdURL ));
- pMenu->SetItemText( nId, aLabel );
- }
-
- // Use helper to retrieve state of the command URL
- StateEventHelper* pHelper = new StateEventHelper(
- xDispatchProvider,
- m_xURLTransformer,
- aCmdURL );
-
- uno::Reference< frame::XStatusListener > xHelper( pHelper );
- pMenu->EnableItem( nId, pHelper->isCommandEnabled() );
- }
- }
- }
-}
-
-
-IMPL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, p, void )
-{
- ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
- // Release solar mutex to prevent deadlocks with clipboard thread
- SolarMutexReleaser aReleaser;
- try
- {
- // Asynchronous execution as this can lead to our own destruction while we are
- // on the stack. Stack unwinding would access the destroyed context menu.
- pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
- }
- catch ( uno::Exception& )
- {
- }
-
- delete pExecuteInfo;
-}
-
-} // namespace svt
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list