forked from amazingfate/loongoffice
209eea5457
Clicking a shape button works only for the default shape, not for the last used one. Steps to reproduce: 1) Click on the drop-down arrow of one of the shape buttons, and select a shape. Notice that the button icon updates with the last selected shape. 2) Click on another button. 3) Click on the first button, and try to draw something. The button doesn't work anymore. Only opening the sub toolbar and selecting the shape there will work. The problem is in ToolboxController::execute that requires the command to be in the listener map, but we didn't register sub commands (like .uno:SymbolShapes.sun). Instead of doing that, we'll try some generic solution. (Note that calling the corresponding method from SvxTbxCtlCustomShapes like we do in other methods here won't work, because ChartController::queryDispatch checks for the "_self" target, but SfxToolBoxControl::Dispatch doesn't provide it.) Change-Id: I5be3dfd3ee3ca9ab9d8080929173dbe5984f61a0
300 lines
11 KiB
C++
300 lines
11 KiB
C++
/* -*- 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 "ShapeToolbarController.hxx"
|
|
|
|
#include <osl/mutex.hxx>
|
|
#include <cppuhelper/supportsservice.hxx>
|
|
#include <vcl/svapp.hxx>
|
|
#include <vcl/toolbox.hxx>
|
|
#include <toolkit/helper/vclunohelper.hxx>
|
|
#include <svx/svxids.hrc>
|
|
#include <svx/tbxcustomshapes.hxx>
|
|
|
|
using namespace com::sun::star;
|
|
|
|
using ::com::sun::star::uno::Reference;
|
|
using ::com::sun::star::uno::Sequence;
|
|
|
|
namespace chart
|
|
{
|
|
|
|
OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
return getImplementationName_Static();
|
|
}
|
|
|
|
OUString ShapeToolbarController::getImplementationName_Static() throw (uno::RuntimeException)
|
|
{
|
|
return OUString( "com.sun.star.comp.chart2.ShapeToolbarController" );
|
|
}
|
|
|
|
Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() throw (uno::RuntimeException)
|
|
{
|
|
Sequence< OUString > aSupported(1);
|
|
aSupported.getArray()[0] = "com.sun.star.chart2.ShapeToolbarController";
|
|
return aSupported;
|
|
}
|
|
|
|
sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
|
|
{
|
|
return cppu::supportsService( this, ServiceName );
|
|
}
|
|
|
|
Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
return getSupportedServiceNames_Static();
|
|
}
|
|
|
|
Reference< uno::XInterface > ShapeToolbarController::create( const Reference< uno::XComponentContext >& xContext )
|
|
{
|
|
return * new ShapeToolbarController( xContext );
|
|
}
|
|
|
|
ShapeToolbarController::ShapeToolbarController( const Reference< uno::XComponentContext >& xContext )
|
|
:m_pToolbarController( NULL )
|
|
,m_nToolBoxId( 1 )
|
|
,m_nSlotId( 0 )
|
|
{
|
|
osl_atomic_increment( &m_refCount );
|
|
m_xContext = xContext;
|
|
osl_atomic_decrement( &m_refCount );
|
|
}
|
|
|
|
ShapeToolbarController::~ShapeToolbarController()
|
|
{
|
|
}
|
|
|
|
// ::com::sun::star::uno::XInterface
|
|
uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException, std::exception)
|
|
{
|
|
uno::Any aReturn = ToolboxController::queryInterface( rType );
|
|
if ( !aReturn.hasValue() )
|
|
{
|
|
aReturn = ShapeToolbarController_Base::queryInterface( rType );
|
|
}
|
|
return aReturn;
|
|
}
|
|
|
|
void ShapeToolbarController::acquire() throw ()
|
|
{
|
|
ToolboxController::acquire();
|
|
}
|
|
|
|
void ShapeToolbarController::release() throw ()
|
|
{
|
|
ToolboxController::release();
|
|
}
|
|
|
|
// ::com::sun::star::lang::XInitialization
|
|
void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
|
|
{
|
|
ToolboxController::initialize( rArguments );
|
|
SolarMutexGuard aSolarMutexGuard;
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
|
|
if ( pToolBox )
|
|
{
|
|
const sal_uInt16 nCount = pToolBox->GetItemCount();
|
|
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
|
|
{
|
|
const sal_uInt16 nItemId = pToolBox->GetItemId( nPos );
|
|
if ( pToolBox->GetItemCommand( nItemId ) == m_aCommandURL )
|
|
{
|
|
m_nToolBoxId = nItemId;
|
|
break;
|
|
}
|
|
}
|
|
if ( m_aCommandURL == ".uno:BasicShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:BasicShapes", sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_BASIC;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
|
|
}
|
|
else if ( m_aCommandURL == ".uno:SymbolShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:SymbolShapes", sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
|
|
}
|
|
else if ( m_aCommandURL == ".uno:ArrowShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:ArrowShapes", sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_ARROW;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
|
|
}
|
|
else if ( m_aCommandURL == ".uno:FlowChartShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:FlowChartShapes", sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
|
|
}
|
|
else if ( m_aCommandURL == ".uno:CalloutShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:CalloutShapes", sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
|
|
}
|
|
else if ( m_aCommandURL == ".uno:StarShapes" )
|
|
{
|
|
m_aStates.insert( TCommandState::value_type( ".uno:StarShapes" , sal_True ) );
|
|
m_nSlotId = SID_DRAWTBX_CS_STAR;
|
|
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
|
|
}
|
|
|
|
for ( TCommandState::iterator aIter( m_aStates.begin() ); aIter != m_aStates.end(); ++aIter )
|
|
{
|
|
addStatusListener( aIter->first );
|
|
}
|
|
|
|
if ( m_pToolbarController.is() )
|
|
{
|
|
m_pToolbarController->initialize( rArguments );
|
|
}
|
|
|
|
// check if paste special is allowed, when not don't add DROPDOWN
|
|
pToolBox->SetItemBits( m_nToolBoxId, pToolBox->GetItemBits( m_nToolBoxId ) | TIB_DROPDOWN );
|
|
}
|
|
}
|
|
|
|
// ::com::sun::star::frame::XStatusListener
|
|
void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception )
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete );
|
|
if ( aFind != m_aStates.end() )
|
|
{
|
|
aFind->second = Event.IsEnabled;
|
|
if ( m_pToolbarController.is() )
|
|
{
|
|
bool bCheckmark = false;
|
|
ToolBox& rTb = m_pToolbarController->GetToolBox();
|
|
|
|
for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); ++i )
|
|
{
|
|
sal_uInt16 nId = rTb.GetItemId( i );
|
|
if ( nId == 0 )
|
|
{
|
|
continue;
|
|
}
|
|
OUString aCmd = rTb.GetItemCommand( nId );
|
|
if ( aCmd == Event.FeatureURL.Complete )
|
|
{
|
|
rTb.EnableItem( nId, Event.IsEnabled );
|
|
if ( Event.State >>= bCheckmark )
|
|
{
|
|
rTb.CheckItem( nId, bCheckmark );
|
|
}
|
|
else
|
|
{
|
|
OUString aItemText;
|
|
if ( Event.State >>= aItemText )
|
|
{
|
|
rTb.SetItemText( nId, aItemText );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// ::com::sun::star::frame::XToolbarController
|
|
Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
SolarMutexGuard aSolarMutexGuard;
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
Reference< awt::XWindow > xRet;
|
|
if ( m_pToolbarController.is() )
|
|
{
|
|
xRet = m_pToolbarController.getRef()->createPopupWindow();
|
|
}
|
|
|
|
return xRet;
|
|
}
|
|
|
|
void ShapeToolbarController::execute( sal_Int16 KeyModifier ) throw (uno::RuntimeException, std::exception)
|
|
{
|
|
uno::Sequence< beans::PropertyValue > aArgs( 1 );
|
|
aArgs[0].Name = "KeyModifier";
|
|
aArgs[0].Value <<= KeyModifier;
|
|
dispatchCommand( m_aCommandURL, aArgs );
|
|
}
|
|
|
|
// ::com::sun::star::frame::XSubToolbarController
|
|
sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
return ( m_nSlotId == SID_DRAWTBX_CS_BASIC ||
|
|
m_nSlotId == SID_DRAWTBX_CS_SYMBOL ||
|
|
m_nSlotId == SID_DRAWTBX_CS_ARROW ||
|
|
m_nSlotId == SID_DRAWTBX_CS_FLOWCHART ||
|
|
m_nSlotId == SID_DRAWTBX_CS_CALLOUT ||
|
|
m_nSlotId == SID_DRAWTBX_CS_STAR );
|
|
}
|
|
|
|
OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
SolarMutexGuard aSolarMutexGuard;
|
|
::osl::MutexGuard aGuard(m_aMutex);
|
|
uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
|
|
if ( xSub.is() )
|
|
{
|
|
return xSub->getSubToolbarName();
|
|
}
|
|
return OUString();
|
|
}
|
|
|
|
void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException, std::exception)
|
|
{
|
|
SolarMutexGuard aSolarMutexGuard;
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
|
|
if ( xSub.is() )
|
|
{
|
|
m_aCommandURL = rCommand;
|
|
xSub->functionSelected( rCommand );
|
|
}
|
|
}
|
|
|
|
void ShapeToolbarController::updateImage() throw (uno::RuntimeException, std::exception)
|
|
{
|
|
SolarMutexGuard aSolarMutexGuard;
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
|
|
if ( xSub.is() )
|
|
{
|
|
xSub->updateImage();
|
|
}
|
|
}
|
|
|
|
} // namespace chart
|
|
|
|
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
|
|
com_sun_star_comp_chart2_ShapeToolbarController_get_implementation(css::uno::XComponentContext *context,
|
|
css::uno::Sequence<css::uno::Any> const &)
|
|
{
|
|
return cppu::acquire(new ::chart::ShapeToolbarController(context));
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|