mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:mergeclasses

Browse Source 
Change-Id: If918532fcc860e3deacd9c86dd7a2d554e4f748d
This commit is contained in:
Noel Grandin
2015-10-06 11:48:40 +02:00
parent 2b57de8bb0
commit 05e61719e2
5 changed files with 9 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/main/UndoActions.hxx
View File

@@ -19,8 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_UNDOACTIONS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_UNDOACTIONS_HXX
#include "ConfigItemListener.hxx"
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/document/XUndoAction.hpp>
#include <com/sun/star/uno/Sequence.hxx>

8
chart2/source/inc/ConfigColorScheme.hxx
View File

@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX
#define INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX
#include "ConfigItemListener.hxx"
#include "charttoolsdllapi.hxx"
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
@@ -42,7 +41,6 @@ class ChartConfigItem;
}
class ConfigColorScheme :
public ConfigItemListener,
public ::cppu::WeakImplHelper<
::com::sun::star::chart2::XColorScheme,
::com::sun::star::lang::XServiceInfo >
@@ -64,14 +62,14 @@ public:
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ ConfigItemListener ____
SAL_DLLPRIVATE void notify( const OUString & rPropertyName );
protected:
// ____ XColorScheme ____
SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ____ ConfigItemListener ____
SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ) SAL_OVERRIDE;
private:
SAL_DLLPRIVATE void retrieveConfigColors();

42
chart2/source/inc/ConfigItemListener.hxx
View File

@@ -1,42 +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_CHART2_SOURCE_INC_CONFIGITEMLISTENER_HXX
#define INCLUDED_CHART2_SOURCE_INC_CONFIGITEMLISTENER_HXX
#include <rtl/ustring.hxx>
#include "charttoolsdllapi.hxx"
namespace chart
{
class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener
{
public:
virtual void notify( const OUString & rPropertyName ) = 0;
protected:
~ConfigItemListener() {}
};
} // namespace chart
// INCLUDED_CHART2_SOURCE_INC_CONFIGITEMLISTENER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

16
chart2/source/tools/ConfigColorScheme.cxx
View File

@@ -52,31 +52,27 @@ namespace impl
class ChartConfigItem : public ::utl::ConfigItem
{
public:
explicit ChartConfigItem( ConfigItemListener & rListener );
virtual ~ChartConfigItem();
explicit ChartConfigItem( ConfigColorScheme & rListener );
virtual ~ChartConfigItem() {}
void addPropertyNotification( const OUString & rPropertyName );
uno::Any getProperty( const OUString & aPropertyName );
protected:
// ____ ::utl::ConfigItem ____
virtual void ImplCommit() SAL_OVERRIDE;
virtual void ImplCommit() SAL_OVERRIDE;
virtual void Notify( const Sequence< OUString > & aPropertyNames ) SAL_OVERRIDE;
private:
ConfigItemListener & m_rListener;
::std::set< OUString > m_aPropertiesToNotify;
ConfigColorScheme & m_rListener;
::std::set< OUString > m_aPropertiesToNotify;
};
ChartConfigItem::ChartConfigItem( ConfigItemListener & rListener ) :
ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) :
::utl::ConfigItem( "Office.Chart/DefaultColor" ),
m_rListener( rListener )
{}
ChartConfigItem::~ChartConfigItem()
{}
void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
{
for( sal_Int32 nIdx=0; nIdx<aPropertyNames.getLength(); ++nIdx )

1
compilerplugins/clang/mergeclasses.results
View File

@@ -129,7 +129,6 @@ merge cairocanvas::DeviceHelper with cairocanvas::SpriteDeviceHelper
merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base
merge canvas::ISurfaceProxy with canvas::SurfaceProxy
merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager
merge chart::ConfigItemListener with chart::ConfigColorScheme
merge chart::ExplicitValueProvider with chart::ChartView
merge chart::LegendEntryProvider with chart::VSeriesPlotter
merge chart::MarkHandleProvider with chart::SelectionHelper