Skip to content

C
core
Kaydet (Commit) 8bd418a6 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky
Dosyalara gözat
Seçenekler

rptui::OToolboxController becomes unused, tdf#106762 related 

It was a wrapper around the color controller, because the latter
used sfx2 registration. This will no longer be an issue, as we're
moving to officecfg based registration.

Change-Id: I45e1d8aeefdb62f5bd9b3dfac29910c77f0cd103
üst 8f1e01fc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 304 deletions
reportdesign/Library_rptui.mk
Dosyayı görüntüle @ 8bd418a6
......@@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,rptui,\
reportdesign/source/ui/misc/rptuiservices \
reportdesign/source/ui/misc/RptUndo \
reportdesign/source/ui/misc/statusbarcontroller \
reportdesign/source/ui/misc/toolboxcontroller \
reportdesign/source/ui/misc/UITools \
reportdesign/source/ui/report/DesignView \
reportdesign/source/ui/report/dlgedclip \
......
reportdesign/source/ui/inc/toolboxcontroller.hxx deleted 100644 → 0
Dosyayı görüntüle @ 8f1e01fc
/* -*- 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_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
#define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
#include <sal/config.h>
#include <map>
#include <rtl/ref.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <cppuhelper/implbase2.hxx>
class SvxColorToolBoxControl;
namespace rptui
{
typedef ::cppu::ImplHelper2 < css::lang::XServiceInfo,
css::frame::XSubToolbarController> TToolboxController_BASE;
typedef rtl::Reference<SvxColorToolBoxControl> TToolbarHelper;
class OToolboxController : public ::svt::ToolboxController
,public TToolboxController_BASE
{
typedef std::map<OUString, sal_Bool> TCommandState;
TCommandState m_aStates;
TToolbarHelper m_pToolbarController;
OToolboxController(const OToolboxController&) = delete;
void operator =(const OToolboxController&) = delete;
public:
OToolboxController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
virtual ~OToolboxController() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
// need by registration
/// @throws css::uno::RuntimeException
static OUString getImplementationName_Static();
/// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static css::uno::Reference< css::uno::XInterface > SAL_CALL
create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XToolbarController
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
// XSubToolbarController
virtual sal_Bool SAL_CALL opensSubToolbar( ) override;
virtual OUString SAL_CALL getSubToolbarName( ) override;
virtual void SAL_CALL functionSelected( const OUString& aCommand ) override;
virtual void SAL_CALL updateImage( ) override;
};
} // rptui
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
reportdesign/source/ui/misc/rptuiservices.cxx
Dosyayı görüntüle @ 8bd418a6
......@@ -19,7 +19,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include "ReportController.hxx"
#include "toolboxcontroller.hxx"
#include "statusbarcontroller.hxx"
#include "DefaultInspection.hxx"
#include "ReportComponentHandler.hxx"
......@@ -41,8 +40,6 @@ namespace
cppu::ImplementationEntry entries[] = {
{ &OReportController::create, &OReportController::getImplementationName_Static, &OReportController::getSupportedServiceNames_Static,
&cppu::createSingleComponentFactory, nullptr, 0 },
{ &OToolboxController::create, &OToolboxController::getImplementationName_Static, &OToolboxController::getSupportedServiceNames_Static,
&cppu::createSingleComponentFactory, nullptr, 0 },
{ &OStatusbarController::create, &OStatusbarController::getImplementationName_Static, &OStatusbarController::getSupportedServiceNames_Static,
&cppu::createSingleComponentFactory, nullptr, 0 },
{ &DefaultComponentInspectorModel::create, &DefaultComponentInspectorModel::getImplementationName_Static, &DefaultComponentInspectorModel::getSupportedServiceNames_static,
......
reportdesign/source/ui/misc/toolboxcontroller.cxx deleted 100644 → 0
Dosyayı görüntüle @ 8f1e01fc
/* -*- 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 "toolboxcontroller.hxx"
#include <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/menu.hxx>
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XImageManager.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/util/Color.hpp>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/menuoptions.hxx>
#include <osl/mutex.hxx>
#include <svx/svxids.hrc>
#include <svx/tbcontrl.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace rptui
{
using namespace svt;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace frame;
using namespace util;
using namespace ui;
OUString SAL_CALL OToolboxController::getImplementationName()
{
return getImplementationName_Static();
}
OUString OToolboxController::getImplementationName_Static()
{
return OUString("com.sun.star.report.comp.ReportToolboxController");
}
Sequence< OUString> OToolboxController::getSupportedServiceNames_Static()
{
Sequence<OUString> aSupported { "com.sun.star.report.ReportToolboxController" };
return aSupported;
}
sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames()
{
return getSupportedServiceNames_Static();
}
Reference< XInterface > OToolboxController::create(Reference< XComponentContext > const & xContext)
{
return * new OToolboxController(xContext);
}
OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB)
: m_pToolbarController(nullptr)
{
osl_atomic_increment(&m_refCount);
m_xContext = _rxORB;
osl_atomic_decrement(&m_refCount);
}
OToolboxController::~OToolboxController()
{
}
// XInterface
Any SAL_CALL OToolboxController::queryInterface( const Type& _rType )
{
Any aReturn = ToolboxController::queryInterface(_rType);
if (!aReturn.hasValue())
aReturn = TToolboxController_BASE::queryInterface(_rType);
return aReturn;
}
void SAL_CALL OToolboxController::acquire() throw ()
{
ToolboxController::acquire();
}
void SAL_CALL OToolboxController::release() throw ()
{
ToolboxController::release();
}
void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments )
{
ToolboxController::initialize(_rArguments);
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
sal_uInt16 nToolBoxId = 1;
VclPtr< ToolBox > pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()).get());
if ( pToolBox )
{
const ToolBox::ImplToolItems::size_type nCount = pToolBox->GetItemCount();
for (ToolBox::ImplToolItems::size_type nPos = 0; nPos < nCount; ++nPos)
{
const sal_uInt16 nItemId = pToolBox->GetItemId(nPos);
if ( pToolBox->GetItemCommand(nItemId) == m_aCommandURL )
{
nToolBoxId = nItemId;
break;
}
}
if ( m_aCommandURL == ".uno:FontColor" || m_aCommandURL == ".uno:Color" )
{
m_aStates.emplace(OUString(".uno:FontColor"),true);
m_aStates.emplace(OUString(".uno:Color"),true);
m_pToolbarController = new SvxColorToolBoxControl(SID_ATTR_CHAR_COLOR2,nToolBoxId,*pToolBox);
}
else
{
m_aStates.emplace(OUString(".uno:BackgroundColor"),true);
m_pToolbarController = new SvxColorToolBoxControl(SID_BACKGROUND_COLOR,nToolBoxId,*pToolBox);
}
TCommandState::const_iterator aIter = m_aStates.begin();
for (; 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(nToolBoxId,pToolBox->GetItemBits(nToolBoxId) | ToolBoxItemBits::DROPDOWN);
}
}
void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event )
{
::osl::MutexGuard aGuard(m_aMutex);
TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete );
if ( aFind != m_aStates.end() && m_pToolbarController.is() )
m_pToolbarController->statusChanged( Event );
}
Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow()
{
// execute the menu
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
Reference< awt::XWindow > xRet;
if ( m_pToolbarController.is() )
xRet = m_pToolbarController->createPopupWindow();
return xRet;
}
void SAL_CALL OToolboxController::execute( sal_Int16 KeyModifier )
{
if ( m_pToolbarController.is() )
m_pToolbarController->execute( KeyModifier );
}
sal_Bool SAL_CALL OToolboxController::opensSubToolbar()
{
return true;
}
OUString SAL_CALL OToolboxController::getSubToolbarName()
{
return OUString();
}
void SAL_CALL OToolboxController::functionSelected( const OUString& /*rCommand*/ )
{
}
void SAL_CALL OToolboxController::updateImage( )
{
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
if ( m_pToolbarController.is() )
m_pToolbarController->updateImage();
}
} // rptui
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
reportdesign/util/rptui.component
Dosyayı görüntüle @ 8bd418a6
......@@ -34,9 +34,6 @@
<implementation name="com.sun.star.report.comp.ReportDesign">
<service name="com.sun.star.sdb.ReportDesign"/>
</implementation>
<implementation name="com.sun.star.report.comp.ReportToolboxController">
<service name="com.sun.star.report.ReportToolboxController"/>
</implementation>
<implementation name="com.sun.star.report.comp.StatusbarController">
<service name="com.sun.star.frame.StatusbarController"/>
</implementation>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment