strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/framework/source/uielement/subtoolbarcontroller.cxx
Stephan Bergmann f853ec317f Extend loplugin:external to warn about classes 
...following up on 314f15bff0 "Extend
loplugin:external to warn about enums".

Cases where free functions were moved into an unnamed namespace along with a
class, to not break ADL, are in:

  filter/source/svg/svgexport.cxx
  sc/source/filter/excel/xelink.cxx
  sc/source/filter/excel/xilink.cxx
  svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx

All other free functions mentioning moved classes appear to be harmless and not
give rise to (silent, even) ADL breakage.  (One remaining TODO in
compilerplugins/clang/external.cxx is that derived classes are not covered by
computeAffectedTypes, even though they could also be affected by ADL-breakage---
but don't seem to be in any acutal case across the code base.)

For friend declarations using elaborate type specifiers, like

  class C1 {};
  class C2 { friend class C1; };

* If C2 (but not C1) is moved into an unnamed namespace, the friend declaration
must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see
C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither
qualified nor a template-id and the declaration is a function or an
elaborated-type-specifier, the lookup to determine whether the entity has been
previously declared shall not consider any scopes outside the innermost
enclosing namespace.")

* If C1 (but not C2) is moved into an unnamed namespace, the friend declaration
must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"elaborated-type-specifier friend not looked up in unnamed namespace".

Apart from that, to keep changes simple and mostly mechanical (which should help
avoid regressions), out-of-line definitions of class members have been left in
the enclosing (named) namespace.  But explicit specializations of class
templates had to be moved into the unnamed namespace to appease
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of
template from unnamed namespace using unqualified-id in enclosing namespace".

Also, accompanying declarations (of e.g. typedefs or static variables) that
could arguably be moved into the unnamed namespace too have been left alone.

And in some cases, mention of affected types in blacklists in other loplugins
needed to be adapted.

And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which
is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is
not moved into an unnamed namespace (because it is declared in
sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is.  GCC warns about
such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler
doesn’t give this warning for types defined in the main .C file, as those are
unlikely to have multiple definitions."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>)  The
warned-about classes also don't have multiple definitions in the given test, so
disable the warning when including the .cxx.

Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4
Reviewed-on: https://gerrit.libreoffice.org/83239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-22 12:57:32 +01:00

447 lines
15 KiB
C++
Raw Blame History

/* -*- 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 <comphelper/propertysequence.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/gen.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <com/sun/star/awt/XDockableWindow.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <com/sun/star/frame/status/Visibility.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/theUIElementFactoryManager.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
typedef cppu::ImplInheritanceHelper< svt::ToolboxController,
css::frame::XSubToolbarController,
css::awt::XDockableWindowListener,
css::lang::XServiceInfo > ToolBarBase;
namespace {
class SubToolBarController : public ToolBarBase
{
OUString m_aSubTbName;
OUString m_aLastCommand;
css::uno::Reference< css::ui::XUIElement > m_xUIElement;
void disposeUIElement();
public:
explicit SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs );
virtual ~SubToolBarController() override;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) override;
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XToolbarController
virtual void SAL_CALL execute( sal_Int16 nKeyModifier ) override;
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
// XSubToolbarController
virtual sal_Bool SAL_CALL opensSubToolbar() override;
virtual OUString SAL_CALL getSubToolbarName() override;
virtual void SAL_CALL functionSelected( const OUString& rCommand ) override;
virtual void SAL_CALL updateImage() override;
// XDockableWindowListener
virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) override;
virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) override;
virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) override;
virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) override;
virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) override;
virtual void SAL_CALL closed( const css::lang::EventObject& e ) override;
virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& e ) override;
// XComponent
virtual void SAL_CALL dispose() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
}
SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs )
{
css::beans::PropertyValue aPropValue;
for ( sal_Int32 i = 0; i < rxArgs.getLength(); ++i )
{
rxArgs[i] >>= aPropValue;
if ( aPropValue.Name == "Value" )
{
sal_Int32 nIdx{ 0 };
OUString aValue;
aPropValue.Value >>= aValue;
m_aSubTbName = aValue.getToken(0, ';', nIdx);
m_aLastCommand = aValue.getToken(0, ';', nIdx);
break;
}
}
if ( !m_aLastCommand.isEmpty() )
addStatusListener( m_aLastCommand );
}
SubToolBarController::~SubToolBarController()
{
disposeUIElement();
m_xUIElement = nullptr;
}
void SubToolBarController::disposeUIElement()
{
if ( m_xUIElement.is() )
{
css::uno::Reference< css::lang::XComponent > xComponent( m_xUIElement, css::uno::UNO_QUERY );
xComponent->dispose();
}
}
void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& Event )
{
SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
return;
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
{
ToolBoxItemBits nItemBits = pToolBox->GetItemBits( nId );
nItemBits &= ~ToolBoxItemBits::CHECKABLE;
TriState eTri = TRISTATE_FALSE;
if ( Event.FeatureURL.Complete == m_aCommandURL )
{
pToolBox->EnableItem( nId, Event.IsEnabled );
OUString aStrValue;
css::frame::status::Visibility aItemVisibility;
if ( Event.State >>= aStrValue )
{
// Enum command, such as the current custom shape,
// toggle checked state.
if ( m_aLastCommand == ( m_aCommandURL + "." + aStrValue ) )
{
eTri = TRISTATE_TRUE;
nItemBits |= ToolBoxItemBits::CHECKABLE;
}
}
else if ( Event.State >>= aItemVisibility )
{
pToolBox->ShowItem( nId, aItemVisibility.bVisible );
}
}
else
{
bool bValue;
if ( Event.State >>= bValue )
{
// Boolean, treat it as checked/unchecked
if ( bValue )
eTri = TRISTATE_TRUE;
nItemBits |= ToolBoxItemBits::CHECKABLE;
}
}
pToolBox->SetItemState( nId, eTri );
pToolBox->SetItemBits( nId, nItemBits );
}
}
void SubToolBarController::execute( sal_Int16 nKeyModifier )
{
if ( !m_aLastCommand.isEmpty() )
{
auto aArgs( comphelper::InitPropertySequence( {
{ "KeyModifier", css::uno::makeAny( nKeyModifier ) }
} ) );
dispatchCommand( m_aLastCommand, aArgs );
}
}
css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow()
{
SolarMutexGuard aGuard;
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
{
css::uno::Reference< css::frame::XFrame > xFrame ( getFrameInterface() );
// create element with factory
static css::uno::WeakReference< css::ui::XUIElementFactoryManager > xWeakUIElementFactory;
css::uno::Reference< css::ui::XUIElement > xUIElement;
css::uno::Reference< css::ui::XUIElementFactoryManager > xUIElementFactory = xWeakUIElementFactory;
if ( !xUIElementFactory.is() )
{
xUIElementFactory = css::ui::theUIElementFactoryManager::get( m_xContext );
xWeakUIElementFactory = xUIElementFactory;
}
auto aPropSeq( comphelper::InitPropertySequence( {
{ "Frame", css::uno::makeAny( xFrame ) },
{ "ParentWindow", css::uno::makeAny( m_xParentWindow ) },
{ "Persistent", css::uno::makeAny( false ) },
{ "PopupMode", css::uno::makeAny( true ) }
} ) );
try
{
xUIElement = xUIElementFactory->createUIElement( "private:resource/toolbar/" + m_aSubTbName, aPropSeq );
}
catch ( css::container::NoSuchElementException& )
{}
catch ( css::lang::IllegalArgumentException& )
{}
if ( xUIElement.is() )
{
css::uno::Reference< css::awt::XWindow > xSubToolBar( xUIElement->getRealInterface(), css::uno::UNO_QUERY );
if ( xSubToolBar.is() )
{
css::uno::Reference< css::awt::XDockableWindow > xDockWindow( xSubToolBar, css::uno::UNO_QUERY );
xDockWindow->addDockableWindowListener( css::uno::Reference< css::awt::XDockableWindowListener >(
static_cast< OWeakObject * >( this ), css::uno::UNO_QUERY ) );
xDockWindow->enableDocking( true );
// keep reference to UIElement to avoid its destruction
disposeUIElement();
m_xUIElement = xUIElement;
VclPtr<vcl::Window> pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
if ( pTbxWindow && pTbxWindow->GetType() == WindowType::TOOLBOX )
{
ToolBox* pToolBar = static_cast< ToolBox* >( pTbxWindow.get() );
// calc and set size for popup mode
Size aSize = pToolBar->CalcPopupWindowSizePixel();
pToolBar->SetSizePixel( aSize );
// open subtoolbox in popup mode
vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pToolBar );
}
}
}
}
return css::uno::Reference< css::awt::XWindow >();
}
sal_Bool SubToolBarController::opensSubToolbar()
{
return !m_aLastCommand.isEmpty();
}
OUString SubToolBarController::getSubToolbarName()
{
return m_aSubTbName;
}
void SubToolBarController::functionSelected( const OUString& rCommand )
{
if ( !m_aLastCommand.isEmpty() && m_aLastCommand != rCommand )
{
removeStatusListener( m_aLastCommand );
m_aLastCommand = rCommand;
addStatusListener( m_aLastCommand );
updateImage();
}
}
void SubToolBarController::updateImage()
{
SolarMutexGuard aGuard;
if ( !m_aLastCommand.isEmpty() )
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
{
vcl::ImageType eImageType = pToolBox->GetImageSize();
Image aImage = vcl::CommandInfoProvider::GetImageForCommand(m_aLastCommand, getFrameInterface(), eImageType);
if ( !!aImage )
pToolBox->SetItemImage( nId, aImage );
}
}
}
void SubToolBarController::startDocking( const css::awt::DockingEvent& )
{
}
css::awt::DockingData SubToolBarController::docking( const css::awt::DockingEvent& )
{
return css::awt::DockingData();
}
void SubToolBarController::endDocking( const css::awt::EndDockingEvent& )
{
}
sal_Bool SubToolBarController::prepareToggleFloatingMode( const css::lang::EventObject& )
{
return false;
}
void SubToolBarController::toggleFloatingMode( const css::lang::EventObject& )
{
}
void SubToolBarController::closed( const css::lang::EventObject& )
{
}
void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
{
SolarMutexGuard aGuard;
OUString aSubToolBarResName;
if ( m_xUIElement.is() )
{
css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xUIElement, css::uno::UNO_QUERY );
if ( xPropSet.is() )
{
try
{
xPropSet->getPropertyValue("ResourceURL") >>= aSubToolBarResName;
}
catch ( css::beans::UnknownPropertyException& )
{}
catch ( css::lang::WrappedTargetException& )
{}
}
disposeUIElement();
}
m_xUIElement = nullptr;
// if the toolbar was teared-off recreate it and place it at the given position
if( e.bTearoff )
{
css::uno::Reference< css::ui::XUIElement > xUIElement;
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager = getLayoutManager();
if ( !xLayoutManager.is() )
return;
xLayoutManager->createElement( aSubToolBarResName );
xUIElement = xLayoutManager->getElement( aSubToolBarResName );
if ( xUIElement.is() )
{
css::uno::Reference< css::awt::XWindow > xSubToolBar( xUIElement->getRealInterface(), css::uno::UNO_QUERY );
css::uno::Reference< css::beans::XPropertySet > xProp( xUIElement, css::uno::UNO_QUERY );
if ( xSubToolBar.is() && xProp.is() )
{
OUString aPersistentString( "Persistent" );
try
{
VclPtr<vcl::Window> pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
if ( pTbxWindow && pTbxWindow->GetType() == WindowType::TOOLBOX )
{
css::uno::Any a = xProp->getPropertyValue( aPersistentString );
xProp->setPropertyValue( aPersistentString, css::uno::makeAny( false ) );
xLayoutManager->hideElement( aSubToolBarResName );
xLayoutManager->floatWindow( aSubToolBarResName );
xLayoutManager->setElementPos( aSubToolBarResName, e.FloatingPosition );
xLayoutManager->showElement( aSubToolBarResName );
xProp->setPropertyValue("Persistent", a );
}
}
catch ( css::uno::RuntimeException& )
{
throw;
}
catch ( css::uno::Exception& )
{}
}
}
}
}
void SubToolBarController::disposing( const css::lang::EventObject& e )
{
svt::ToolboxController::disposing( e );
}
void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
{
svt::ToolboxController::initialize( rxArgs );
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( getToolboxId( nId, &pToolBox ) )
{
if ( m_aLastCommand.isEmpty() )
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
else
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWN );
}
updateImage();
}
void SubToolBarController::dispose()
{
if ( m_bDisposed )
return;
svt::ToolboxController::dispose();
disposeUIElement();
m_xUIElement = nullptr;
}
OUString SubToolBarController::getImplementationName()
{
return "com.sun.star.comp.framework.SubToolBarController";
}
sal_Bool SubToolBarController::supportsService( const OUString& rServiceName )
{
return cppu::supportsService( this, rServiceName );
}
css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames()
{
return {"com.sun.star.frame.ToolbarController"};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_framework_SubToolBarController_get_implementation(
css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const & rxArgs )
{
return cppu::acquire( new SubToolBarController( rxArgs ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue View git blame Copy permalink