diff options
-rw-r--r-- | chart2/Library_chartcontroller.mk | 1 | ||||
-rw-r--r-- | chart2/source/controller/chartcontroller.component | 4 | ||||
-rw-r--r-- | chart2/source/controller/inc/ChartToolbarController.hxx | 99 | ||||
-rw-r--r-- | chart2/source/controller/main/ToolbarController.cxx | 141 | ||||
-rw-r--r-- | include/sfx2/sidebar/ControllerFactory.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sidebar/PanelTitleBar.hxx | 3 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 6 | ||||
-rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 2 |
12 files changed, 275 insertions, 7 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 1dbb89a36c2b..e06edd176ba1 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -184,6 +184,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/main/SelectionHelper \ chart2/source/controller/main/ShapeController \ chart2/source/controller/main/StatusBarCommandDispatch \ + chart2/source/controller/main/ToolbarController \ chart2/source/controller/main/UndoActions \ chart2/source/controller/main/UndoCommandDispatch \ chart2/source/controller/main/UndoGuard \ diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component index 23269baf25fa..2348063d8d45 100644 --- a/chart2/source/controller/chartcontroller.component +++ b/chart2/source/controller/chartcontroller.component @@ -51,4 +51,8 @@ constructor="org_libreoffice_comp_chart2_sidebar_ChartPanelFactory"> <service name="com.sun.star.ui.UIElementFactory"/> </implementation> + <implementation name="org.libreoffice.chart2.Chart2ToolboxController" + constructor="org_libreoffice_chart2_Chart2ToolboxController"> + <service name="com.sun.star.frame.ToolbarContoller"/> + </implementation> </component> diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx new file mode 100644 index 000000000000..81e304f230c8 --- /dev/null +++ b/chart2/source/controller/inc/ChartToolbarController.hxx @@ -0,0 +1,99 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CHARTTOOLBARCONTROLLER_HXX +#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CHARTTOOLBARCONTROLLER_HXX + +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> + +#include <com/sun/star/frame/XToolbarController.hpp> +#include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/util/XUpdatable.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/frame/XFramesSupplier.hpp> + +#include <boost/noncopyable.hpp> + +namespace chart { + +namespace { + +typedef cppu::WeakComponentImplHelper< + css::frame::XToolbarController, css::frame::XStatusListener, + css::util::XUpdatable, css::lang::XInitialization, + css::lang::XServiceInfo> ChartToolbarControllerBase; + +} + +class ChartToolbarController : private boost::noncopyable, + private cppu::BaseMutex, + public ChartToolbarControllerBase +{ +public: + ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties); + virtual ~ChartToolbarController(); + + // XToolbarContoller + virtual void SAL_CALL execute(sal_Int16 nKeyModifier) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL click() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL doubleClick() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL + createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // XStatusListener + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // XInitialization + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; + + // XUpdatable + virtual void SAL_CALL update() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + using cppu::WeakComponentImplHelperBase::disposing; + +private: + + css::uno::Reference<css::frame::XFramesSupplier> mxFramesSupplier; +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx new file mode 100644 index 000000000000..3d76caf00d78 --- /dev/null +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -0,0 +1,141 @@ +/* -*- 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/. + */ + +#include "ChartToolbarController.hxx" + +#include <rtl/ref.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XFramesSupplier.hpp> +#include <comphelper/namedvaluecollection.hxx> +#include <cppuhelper/supportsservice.hxx> + +namespace chart { + +ChartToolbarController::ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties): + ChartToolbarControllerBase(m_aMutex) +{ + css::uno::Reference<css::frame::XFrame> xFrame; + sal_Int32 nLength = rProperties.getLength(); + for (sal_Int32 i = 0; i < nLength; ++i) + { + css::beans::PropertyValue aPropValue; + rProperties[i] >>= aPropValue; + if (aPropValue.Name == "Frame") + aPropValue.Value >>= xFrame; + } + + css::uno::Reference<css::frame::XFramesSupplier> xFramesSupplier(xFrame, css::uno::UNO_QUERY); + mxFramesSupplier = xFramesSupplier; +} + +ChartToolbarController::~ChartToolbarController() +{ +} + +void ChartToolbarController::execute(sal_Int16 /*nKeyModifier*/) + throw (css::uno::RuntimeException, std::exception) +{ +} + +void ChartToolbarController::click() + throw (css::uno::RuntimeException, std::exception) +{ + css::uno::Reference<css::frame::XFrame> xActiveFrame = mxFramesSupplier->getActiveFrame(); + if (!xActiveFrame.is()) + return; + + css::uno::Reference<css::frame::XController> xActiveController = xActiveFrame->getController(); + if (!xActiveController.is()) + return; + + css::uno::Reference<css::frame::XDispatch> xDispatch(xActiveController, css::uno::UNO_QUERY); + if (!xDispatch.is()) + return; + + css::util::URL aURL; + aURL.Path = "FormatSelection"; + xDispatch->dispatch(aURL, css::uno::Sequence<css::beans::PropertyValue>()); +} + +void ChartToolbarController::doubleClick() + throw (css::uno::RuntimeException, std::exception) +{ + SAL_INFO("chart2", "double clicked"); +} + + +css::uno::Reference<css::awt::XWindow> ChartToolbarController::createPopupWindow() + throw (css::uno::RuntimeException, std::exception) +{ + return css::uno::Reference<css::awt::XWindow>(); +} + +css::uno::Reference<css::awt::XWindow> ChartToolbarController::createItemWindow( + const css::uno::Reference<css::awt::XWindow>& /*rParent*/) + throw (css::uno::RuntimeException, std::exception) +{ + return css::uno::Reference<css::awt::XWindow>(); +} + +void ChartToolbarController::statusChanged(const css::frame::FeatureStateEvent& /*rEvent*/) + throw (css::uno::RuntimeException, std::exception) +{ + +} + +void ChartToolbarController::disposing(const css::lang::EventObject& /*rSource*/) + throw (css::uno::RuntimeException, std::exception) +{ +} + +void ChartToolbarController::initialize(const css::uno::Sequence<css::uno::Any>& /*rAny*/) + throw (css::uno::Exception, std::exception) +{ +} + +void ChartToolbarController::update() + throw (css::uno::RuntimeException, std::exception) +{ +} + + +OUString ChartToolbarController::getImplementationName() + throw (css::uno::RuntimeException, std::exception) +{ + return OUString("org.libreoffice.chart2.ChartToolbarController"); +} + +sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) +{ + return cppu::supportsService(this, ServiceName); +} + +css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) +{ + css::uno::Sequence<OUString> aServiceNames(1); + aServiceNames[0] = "com.sun.star.frame.ToolbarController"; + return aServiceNames; +} + +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +org_libreoffice_chart2_Chart2ToolboxController(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const & rProperties) +{ + return cppu::acquire(new ::chart::ChartToolbarController(rProperties)); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx index 985ee9b5756d..feb40343afcb 100644 --- a/include/sfx2/sidebar/ControllerFactory.hxx +++ b/include/sfx2/sidebar/ControllerFactory.hxx @@ -39,6 +39,7 @@ public: const sal_uInt16 nItemId, const ::rtl::OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame, + const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const sal_Int32 nItemWidth); @@ -47,6 +48,7 @@ private: ToolBox* pToolBox, const ::rtl::OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame, + const css::uno::Reference<css::frame::XController>& rxController, const sal_Int32 nWidth); }; diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index 21cee82b1450..b8dc3698f0b8 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -36,7 +36,8 @@ public: virtual void dispose() SAL_OVERRIDE; void SetMoreOptionsCommand(const OUString& rsCommandName, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XFrame>& rxFrame, + const css::uno::Reference<css::frame::XController>& rxController); virtual void DataChanged(const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMouseEvent) SAL_OVERRIDE; diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 7566fde962fd..cb12c82e5ae3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -475,6 +475,17 @@ <value>org.libreoffice.comp.dbu.LimitBoxController</value> </prop> </node> + <node oor:name="ChartProperties" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:ChartProperties</value> + </prop> + <prop oor:name="Module"> + <value>com.sun.star.chart2.ChartDocument</value> + </prop> + <prop oor:name="Controller"> + <value>org.libreoffice.chart2.Chart2ToolboxController</value> + </prop> + </node> <node oor:name="c2" oor:op="replace"> <prop oor:name="Command"> <value>.uno:Refresh</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 56a7ec333ff9..51b030ab7343 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1264,6 +1264,9 @@ <prop oor:name="DeckId" oor:type="xs:string"> <value>ChartDeck</value> </prop> + <prop oor:name="DefaultMenuCommand"> + <value>.uno:ChartProperties</value> + </prop> <prop oor:name="ContextList"> <value oor:separator=";"> Chart, Chart, visible ; @@ -1288,6 +1291,9 @@ <prop oor:name="DeckId" oor:type="xs:string"> <value>ChartDeck</value> </prop> + <prop oor:name="DefaultMenuCommand"> + <value>.uno:ChartProperties</value> + </prop> <prop oor:name="ContextList"> <value oor:separator=";"> Chart, any, visible ; diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index ff457c298824..62523c573db6 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -42,6 +42,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( const sal_uInt16 nItemId, const OUString& rsCommandName, const Reference<frame::XFrame>& rxFrame, + const Reference<frame::XController>& rxController, const Reference<awt::XWindow>& rxParentWindow, const sal_Int32 nWidth) { @@ -49,7 +50,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( CreateToolBarController( pToolBox, rsCommandName, - rxFrame, + rxFrame, rxController, nWidth)); // Create a controller for the new item. @@ -137,13 +138,14 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController( ToolBox* pToolBox, const OUString& rsCommandName, const Reference<frame::XFrame>& rxFrame, + const Reference<frame::XController>& rxController, const sal_Int32 nWidth) { try { Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); Reference<frame::XUIControllerFactory> xFactory = frame::theToolbarControllerFactory::get( xContext ); - OUString sModuleName (Tools::GetModuleName(rxFrame->getController())); + OUString sModuleName (Tools::GetModuleName(rxController)); if (xFactory.is() && xFactory->hasController(rsCommandName, sModuleName)) { diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 479bd2e86206..4dac533bc4bf 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -69,7 +69,8 @@ void PanelTitleBar::dispose() } void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, - const css::uno::Reference<css::frame::XFrame>& rxFrame) + const css::uno::Reference<css::frame::XFrame>& rxFrame, + const css::uno::Reference<css::frame::XController>& rxController) { if (!rsCommandName.equals(msMoreOptionsCommand)) { @@ -89,7 +90,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, maToolBox.get(), mnMenuItemIndex, msMoreOptionsCommand, - rxFrame, + rxFrame, rxController, VCLUnoHelper::GetInterface(maToolBox.get()), 0)); maToolBox->SetController(mnMenuItemIndex, xController, msMoreOptionsCommand); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index c7c40f754af2..6482717b00cc 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -669,7 +669,7 @@ void SidebarController::SwitchToDeck ( { pTitleBar->SetMoreOptionsCommand( rPanelContexDescriptor.msMenuCommand, - mxFrame); + mxFrame, xController); } ++nWriteIndex; diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 18ae5db91a76..ce02e9ebb2ed 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -140,7 +140,7 @@ void SidebarToolBox::CreateController ( const OUString sCommandName (GetItemCommand(nItemId)); aDescriptor.mxController = sfx2::sidebar::ControllerFactory::CreateToolBoxController( - this, nItemId, sCommandName, rxFrame, + this, nItemId, sCommandName, rxFrame, rxFrame->getController(), VCLUnoHelper::GetInterface(this), nItemWidth); if (aDescriptor.mxController.is()) { |