Kaydet (Commit) 7315f325 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

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/42363Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 83288332
...@@ -49,12 +49,6 @@ class SbxVariableImpl ...@@ -49,12 +49,6 @@ class SbxVariableImpl
SbxVariableImpl() SbxVariableImpl()
: m_pComListenerParentBasic( nullptr ) : m_pComListenerParentBasic( nullptr )
{} {}
SbxVariableImpl( const SbxVariableImpl& r )
: m_aDeclareClassName( r.m_aDeclareClassName )
, m_xComListener( r.m_xComListener )
, m_pComListenerParentBasic( r.m_pComListenerParentBasic )
{
}
}; };
......
...@@ -177,36 +177,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel ...@@ -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 lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties )
{ {
LabelAlignment aRet( LABEL_ALIGN_RIGHT ); LabelAlignment aRet( LABEL_ALIGN_RIGHT );
......
...@@ -141,7 +141,6 @@ struct AxisProperties final ...@@ -141,7 +141,6 @@ struct AxisProperties final
AxisProperties( const css::uno::Reference< css::chart2::XAxis >& xAxisModel AxisProperties( const css::uno::Reference< css::chart2::XAxis >& xAxisModel
, ExplicitCategoriesProvider* pExplicitCategoriesProvider ); , ExplicitCategoriesProvider* pExplicitCategoriesProvider );
AxisProperties( const AxisProperties& rAxisProperties );
void init(bool bCartesian=false);//init from model data (m_xAxisModel) void init(bool bCartesian=false);//init from model data (m_xAxisModel)
......
...@@ -30,14 +30,6 @@ CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCat ...@@ -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() CategoryPositionHelper::~CategoryPositionHelper()
{ {
} }
......
...@@ -27,7 +27,6 @@ class CategoryPositionHelper ...@@ -27,7 +27,6 @@ class CategoryPositionHelper
{ {
public: public:
CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0); CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0);
CategoryPositionHelper( const CategoryPositionHelper& rSource );
virtual ~CategoryPositionHelper(); virtual ~CategoryPositionHelper();
double getScaledSlotWidth() const; double getScaledSlotWidth() const;
......
...@@ -53,10 +53,6 @@ void LocalizedValueNode::setValue(int layer, css::uno::Any const & value) ...@@ -53,10 +53,6 @@ void LocalizedValueNode::setValue(int layer, css::uno::Any const & value)
value_ = value; value_ = value;
} }
LocalizedValueNode::LocalizedValueNode(LocalizedValueNode const & other):
Node(other), value_(other.value_)
{}
LocalizedValueNode::~LocalizedValueNode() {} LocalizedValueNode::~LocalizedValueNode() {}
Node::Kind LocalizedValueNode::kind() const { Node::Kind LocalizedValueNode::kind() const {
......
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
void setValue(int layer, css::uno::Any const & value); void setValue(int layer, css::uno::Any const & value);
private: private:
LocalizedValueNode(LocalizedValueNode const & other); LocalizedValueNode(LocalizedValueNode const&) = default;
virtual ~LocalizedValueNode() override; virtual ~LocalizedValueNode() override;
......
...@@ -81,13 +81,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) { ...@@ -81,13 +81,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) {
externalDescriptor_ = 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() {} PropertyNode::~PropertyNode() {}
Node::Kind PropertyNode::kind() const { Node::Kind PropertyNode::kind() const {
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
bool isExtension() const { return extension_;} bool isExtension() const { return extension_;}
private: private:
PropertyNode(PropertyNode const & other); PropertyNode(PropertyNode const&) = default;
virtual ~PropertyNode() override; virtual ~PropertyNode() override;
......
...@@ -29,12 +29,6 @@ namespace dbaui ...@@ -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 bool OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const
{ {
const OptionalBoolItem* pCompare = dynamic_cast<const OptionalBoolItem*>( &_rItem ); const OptionalBoolItem* pCompare = dynamic_cast<const OptionalBoolItem*>( &_rItem );
......
...@@ -34,7 +34,6 @@ namespace dbaui ...@@ -34,7 +34,6 @@ namespace dbaui
public: public:
explicit OptionalBoolItem( sal_Int16 nWhich ); explicit OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
virtual bool operator==( const SfxPoolItem& _rItem ) const override; virtual bool operator==( const SfxPoolItem& _rItem ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override;
......
...@@ -304,20 +304,9 @@ namespace abp ...@@ -304,20 +304,9 @@ namespace abp
: xORB(_rxORB) : 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 ) ODataSource::ODataSource( const ODataSource& _rSource )
:m_pImpl( nullptr ) :m_pImpl( nullptr )
{ {
......
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