[Libreoffice-commits] core.git: basic/source chart2/source configmgr/source dbaccess/source extensions/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Sun Sep 17 05:43:27 UTC 2017
basic/source/sbx/sbxvar.cxx | 6 ---
chart2/source/view/axes/VAxisProperties.cxx | 30 ---------------
chart2/source/view/axes/VAxisProperties.hxx | 1
chart2/source/view/charttypes/CategoryPositionHelper.cxx | 8 ----
chart2/source/view/charttypes/CategoryPositionHelper.hxx | 1
configmgr/source/localizedvaluenode.cxx | 4 --
configmgr/source/localizedvaluenode.hxx | 2 -
configmgr/source/propertynode.cxx | 7 ---
configmgr/source/propertynode.hxx | 2 -
dbaccess/source/ui/dlg/optionalboolitem.cxx | 6 ---
dbaccess/source/ui/dlg/optionalboolitem.hxx | 1
extensions/source/abpilot/datasourcehandling.cxx | 11 -----
12 files changed, 2 insertions(+), 77 deletions(-)
New commits:
commit 7315f325ff7ada3d6bd85a471058fdaeaff8cdb0
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sat Aug 12 00:30:32 2017 +0200
use more default copy ctors
if ctor should be private or protected explicitly default them.
boost::optional has copy ctors, so use them.
Change-Id: If1855626b297e739afef0dc5ad57958f7ad199bc
Reviewed-on: https://gerrit.libreoffice.org/42363
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index df30aad6ebe8..5da7a1667242 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -49,12 +49,6 @@ class SbxVariableImpl
SbxVariableImpl()
: m_pComListenerParentBasic( nullptr )
{}
- SbxVariableImpl( const SbxVariableImpl& r )
- : m_aDeclareClassName( r.m_aDeclareClassName )
- , m_xComListener( r.m_xComListener )
- , m_pComListenerParentBasic( r.m_pComListenerParentBasic )
- {
- }
};
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 43ef2d33ea12..c3cdbcde5f97 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -177,36 +177,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
{
}
-AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
- : m_xAxisModel( rAxisProperties.m_xAxisModel )
- , m_nDimensionIndex( rAxisProperties.m_nDimensionIndex )
- , m_bIsMainAxis( rAxisProperties.m_bIsMainAxis )
- , m_bSwapXAndY( rAxisProperties.m_bSwapXAndY )
- , m_eCrossoverType( rAxisProperties.m_eCrossoverType )
- , m_eLabelPos( rAxisProperties.m_eLabelPos )
- , m_eTickmarkPos( rAxisProperties.m_eTickmarkPos )
- , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection )
- , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes )
- , maLabelAlignment( rAxisProperties.maLabelAlignment )
- , m_bDisplayLabels( rAxisProperties.m_bDisplayLabels )
- , m_bTryStaggeringFirst( rAxisProperties.m_bTryStaggeringFirst )
- , m_nNumberFormatKey( rAxisProperties.m_nNumberFormatKey )
- , m_nMajorTickmarks( rAxisProperties.m_nMajorTickmarks )
- , m_nMinorTickmarks( rAxisProperties.m_nMinorTickmarks )
- , m_aTickmarkPropertiesList( rAxisProperties.m_aTickmarkPropertiesList )
- , m_aLineProperties( rAxisProperties.m_aLineProperties )
- //for category axes
- , m_nAxisType( rAxisProperties.m_nAxisType )
- , m_bComplexCategories( rAxisProperties.m_bComplexCategories )
- , m_pExplicitCategoriesProvider( rAxisProperties.m_pExplicitCategoriesProvider )
- , m_xAxisTextProvider( rAxisProperties.m_xAxisTextProvider )
-{
- if( rAxisProperties.m_pfMainLinePositionAtOtherAxis )
- m_pfMainLinePositionAtOtherAxis.reset(*rAxisProperties.m_pfMainLinePositionAtOtherAxis);
- if( rAxisProperties.m_pfExrtaLinePositionAtOtherAxis )
- m_pfExrtaLinePositionAtOtherAxis.reset(*rAxisProperties.m_pfExrtaLinePositionAtOtherAxis);
-}
-
LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties )
{
LabelAlignment aRet( LABEL_ALIGN_RIGHT );
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 8948a91fe073..29414cda6bc7 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -141,7 +141,6 @@ struct AxisProperties final
AxisProperties( const css::uno::Reference< css::chart2::XAxis >& xAxisModel
, ExplicitCategoriesProvider* pExplicitCategoriesProvider );
- AxisProperties( const AxisProperties& rAxisProperties );
void init(bool bCartesian=false);//init from model data (m_xAxisModel)
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 1e6ef85b81ef..d7412d3cbe85 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -30,14 +30,6 @@ CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCat
{
}
-CategoryPositionHelper::CategoryPositionHelper( const CategoryPositionHelper& rSource )
- : m_fSeriesCount( rSource.m_fSeriesCount )
- , m_fCategoryWidth( rSource.m_fCategoryWidth )
- , m_fInnerDistance( rSource.m_fInnerDistance )
- , m_fOuterDistance( rSource.m_fOuterDistance )
-{
-}
-
CategoryPositionHelper::~CategoryPositionHelper()
{
}
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
index 63a77b8e68b5..6b7491b47285 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
@@ -27,7 +27,6 @@ class CategoryPositionHelper
{
public:
CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0);
- CategoryPositionHelper( const CategoryPositionHelper& rSource );
virtual ~CategoryPositionHelper();
double getScaledSlotWidth() const;
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index 3c7bbdce5d25..a0772979e19d 100644
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -53,10 +53,6 @@ void LocalizedValueNode::setValue(int layer, css::uno::Any const & value)
value_ = value;
}
-LocalizedValueNode::LocalizedValueNode(LocalizedValueNode const & other):
- Node(other), value_(other.value_)
-{}
-
LocalizedValueNode::~LocalizedValueNode() {}
Node::Kind LocalizedValueNode::kind() const {
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 441d32bbb6ca..7a23ac1c0928 100644
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -49,7 +49,7 @@ public:
void setValue(int layer, css::uno::Any const & value);
private:
- LocalizedValueNode(LocalizedValueNode const & other);
+ LocalizedValueNode(LocalizedValueNode const&) = default;
virtual ~LocalizedValueNode() override;
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 6dcc1bad18b4..39ddccfa11ff 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -81,13 +81,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) {
externalDescriptor_ = descriptor;
}
-
-PropertyNode::PropertyNode(PropertyNode const & other):
- Node(other), staticType_(other.staticType_), nillable_(other.nillable_),
- extension_(other.extension_), externalDescriptor_(other.externalDescriptor_),
- value_(other.value_)
-{}
-
PropertyNode::~PropertyNode() {}
Node::Kind PropertyNode::kind() const {
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 0a442a1d21f8..2760df946110 100644
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
@@ -55,7 +55,7 @@ public:
bool isExtension() const { return extension_;}
private:
- PropertyNode(PropertyNode const & other);
+ PropertyNode(PropertyNode const&) = default;
virtual ~PropertyNode() override;
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx
index 08acf1c5e51c..6c4455828d8e 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.cxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx
@@ -29,12 +29,6 @@ namespace dbaui
{
}
- OptionalBoolItem::OptionalBoolItem( const OptionalBoolItem& _rSource )
- :SfxPoolItem( _rSource )
- ,m_aValue( _rSource.m_aValue )
- {
- }
-
bool OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const
{
const OptionalBoolItem* pCompare = dynamic_cast<const OptionalBoolItem*>( &_rItem );
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index 16fb49b3125f..0ddd9a99da9d 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -34,7 +34,6 @@ namespace dbaui
public:
explicit OptionalBoolItem( sal_Int16 nWhich );
- OptionalBoolItem( const OptionalBoolItem& _rSource );
virtual bool operator==( const SfxPoolItem& _rItem ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index bb3eae445187..5acd30aa226e 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -304,20 +304,9 @@ namespace abp
: xORB(_rxORB)
{
}
-
- ODataSourceImpl( const ODataSourceImpl& _rSource );
};
- ODataSourceImpl::ODataSourceImpl( const ODataSourceImpl& _rSource )
- :xORB( _rSource.xORB )
- ,xDataSource( _rSource.xDataSource )
- ,xConnection( _rSource.xConnection )
- ,aTables( _rSource.aTables )
- ,sName( _rSource.sName )
- {
- }
-
ODataSource::ODataSource( const ODataSource& _rSource )
:m_pImpl( nullptr )
{
More information about the Libreoffice-commits
mailing list