Kaydet (Commit) 13502c0f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

svx: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined counterparts,
but may prevent implicitly declared copy functions from being defined as non-
deleted in the future.  (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)

Change-Id: I1c470ef87e95b22e406099a4e6816693edab2e03
Reviewed-on: https://gerrit.libreoffice.org/58131
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 6844ef8a
......@@ -27,7 +27,6 @@ class SVX_DLLPUBLIC ColorSet
std::vector<Color> maColors;
public:
ColorSet(OUString const & aName);
~ColorSet();
void add(sal_uInt32 nIndex, sal_uInt32 aColorData)
{
......
......@@ -51,6 +51,12 @@ namespace accessibility {
class IAccessibleViewForwarder
{
public:
IAccessibleViewForwarder() = default;
IAccessibleViewForwarder(IAccessibleViewForwarder const &) = default;
IAccessibleViewForwarder(IAccessibleViewForwarder &&) = default;
IAccessibleViewForwarder & operator =(IAccessibleViewForwarder const &) = default;
IAccessibleViewForwarder & operator =(IAccessibleViewForwarder &&) = default;
virtual ~IAccessibleViewForwarder(){};
/** Returns the area of the underlying document that is visible in the
......
......@@ -34,11 +34,16 @@ private:
protected:
XPropertyEntry(const OUString& rPropEntryName);
XPropertyEntry(const XPropertyEntry& rOther);
XPropertyEntry(XPropertyEntry const &) = default;
XPropertyEntry(XPropertyEntry &&) = default;
public:
virtual ~XPropertyEntry();
XPropertyEntry & operator =(XPropertyEntry const &) = default;
XPropertyEntry & operator =(XPropertyEntry &&) = default;
void SetName(const OUString& rPropEntryName) { maPropEntryName = rPropEntryName; }
const OUString& GetName() const { return maPropEntryName; }
void SetUiBitmap(const BitmapEx& rUiBitmap) { maUiBitmap = rUiBitmap; }
......
......@@ -54,6 +54,11 @@ private:
SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& );
virtual ~SdrCustomShapeGeometryItem() override;
SdrCustomShapeGeometryItem(SdrCustomShapeGeometryItem const &) = default;
SdrCustomShapeGeometryItem(SdrCustomShapeGeometryItem &&) = default;
SdrCustomShapeGeometryItem & operator =(SdrCustomShapeGeometryItem const &) = default;
SdrCustomShapeGeometryItem & operator =(SdrCustomShapeGeometryItem &&) = default;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation(SfxItemPresentation ePresentation,
MapUnit eCoreMetric, MapUnit ePresentationMetric,
......
......@@ -70,9 +70,6 @@ namespace sdr
// basic constructor.
DisplayInfo();
// destructor
~DisplayInfo();
// access to ProcessLayers
void SetProcessLayers(const SdrLayerIDSet& rSet);
const SdrLayerIDSet& GetProcessLayers() const { return maProcessLayers; }
......
......@@ -27,6 +27,11 @@ public:
SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
virtual ~SdrTextAniStartInsideItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrTextAniStartInsideItem(SdrTextAniStartInsideItem const &) = default;
SdrTextAniStartInsideItem(SdrTextAniStartInsideItem &&) = default;
SdrTextAniStartInsideItem & operator =(SdrTextAniStartInsideItem const &) = default;
SdrTextAniStartInsideItem & operator =(SdrTextAniStartInsideItem &&) = default;
};
class SVX_DLLPUBLIC SdrTextAniStopInsideItem: public SdrYesNoItem {
......@@ -34,6 +39,11 @@ public:
SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
virtual ~SdrTextAniStopInsideItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrTextAniStopInsideItem(SdrTextAniStopInsideItem const &) = default;
SdrTextAniStopInsideItem(SdrTextAniStopInsideItem &&) = default;
SdrTextAniStopInsideItem & operator =(SdrTextAniStopInsideItem const &) = default;
SdrTextAniStopInsideItem & operator =(SdrTextAniStopInsideItem &&) = default;
};
#endif
......
......@@ -57,6 +57,10 @@ protected:
virtual ~SdrAttrObj() override;
public:
SdrAttrObj(SdrAttrObj const &) = default;
SdrAttrObj(SdrAttrObj &&) = default;
SdrAttrObj & operator =(SdrAttrObj const &) = default;
SdrAttrObj & operator =(SdrAttrObj &&) = default;
// Detects if bFilledObj && Fill != FillNone
bool HasFill() const;
......
......@@ -52,7 +52,6 @@ class SdrObjConnection final
public:
SdrObjConnection() { ResetVars(); }
SVX_DLLPUBLIC ~SdrObjConnection();
void ResetVars();
bool TakeGluePoint(SdrGluePoint& rGP) const;
......
......@@ -51,6 +51,11 @@ public:
SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
virtual ~SdrCaptionEscIsRelItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem const &) = default;
SdrCaptionEscIsRelItem(SdrCaptionEscIsRelItem &&) = default;
SdrCaptionEscIsRelItem & operator =(SdrCaptionEscIsRelItem const &) = default;
SdrCaptionEscIsRelItem & operator =(SdrCaptionEscIsRelItem &&) = default;
};
......@@ -65,6 +70,11 @@ public:
SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {}
virtual ~SdrCaptionEscRelItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrCaptionEscRelItem(SdrCaptionEscRelItem const &) = default;
SdrCaptionEscRelItem(SdrCaptionEscRelItem &&) = default;
SdrCaptionEscRelItem & operator =(SdrCaptionEscRelItem const &) = default;
SdrCaptionEscRelItem & operator =(SdrCaptionEscRelItem &&) = default;
};
......
......@@ -33,6 +33,11 @@ public:
SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {}
virtual ~SdrCaptionLineLenItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrCaptionLineLenItem(SdrCaptionLineLenItem const &) = default;
SdrCaptionLineLenItem(SdrCaptionLineLenItem &&) = default;
SdrCaptionLineLenItem & operator =(SdrCaptionLineLenItem const &) = default;
SdrCaptionLineLenItem & operator =(SdrCaptionLineLenItem &&) = default;
};
/**
......@@ -44,6 +49,11 @@ public:
SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
virtual ~SdrCaptionFitLineLenItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem const &) = default;
SdrCaptionFitLineLenItem(SdrCaptionFitLineLenItem &&) = default;
SdrCaptionFitLineLenItem & operator =(SdrCaptionFitLineLenItem const &) = default;
SdrCaptionFitLineLenItem & operator =(SdrCaptionFitLineLenItem &&) = default;
};
#endif
......
......@@ -34,6 +34,11 @@ public:
SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {}
virtual ~SdrMeasureBelowRefEdgeItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem const &) = default;
SdrMeasureBelowRefEdgeItem(SdrMeasureBelowRefEdgeItem &&) = default;
SdrMeasureBelowRefEdgeItem & operator =(SdrMeasureBelowRefEdgeItem const &) = default;
SdrMeasureBelowRefEdgeItem & operator =(SdrMeasureBelowRefEdgeItem &&) = default;
};
#endif
......
......@@ -32,6 +32,11 @@ public:
SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {}
virtual ~SdrMeasureTextIsFixedAngleItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem const &) = default;
SdrMeasureTextIsFixedAngleItem(SdrMeasureTextIsFixedAngleItem &&) = default;
SdrMeasureTextIsFixedAngleItem & operator =(SdrMeasureTextIsFixedAngleItem const &) = default;
SdrMeasureTextIsFixedAngleItem & operator =(SdrMeasureTextIsFixedAngleItem &&) = default;
};
//Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.)
......@@ -40,6 +45,11 @@ public:
SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {}
virtual ~SdrMeasureTextFixedAngleItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem const &) = default;
SdrMeasureTextFixedAngleItem(SdrMeasureTextFixedAngleItem &&) = default;
SdrMeasureTextFixedAngleItem & operator =(SdrMeasureTextFixedAngleItem const &) = default;
SdrMeasureTextFixedAngleItem & operator =(SdrMeasureTextFixedAngleItem &&) = default;
};
// The decimal places used for the measure value
......@@ -48,6 +58,11 @@ public:
SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {}
virtual ~SdrMeasureDecimalPlacesItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem const &) = default;
SdrMeasureDecimalPlacesItem(SdrMeasureDecimalPlacesItem &&) = default;
SdrMeasureDecimalPlacesItem & operator =(SdrMeasureDecimalPlacesItem const &) = default;
SdrMeasureDecimalPlacesItem & operator =(SdrMeasureDecimalPlacesItem &&) = default;
};
#endif
......
......@@ -28,6 +28,11 @@ public:
SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {}
virtual ~SdrMeasureTextRota90Item() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureTextRota90Item(SdrMeasureTextRota90Item const &) = default;
SdrMeasureTextRota90Item(SdrMeasureTextRota90Item &&) = default;
SdrMeasureTextRota90Item & operator =(SdrMeasureTextRota90Item const &) = default;
SdrMeasureTextRota90Item & operator =(SdrMeasureTextRota90Item &&) = default;
};
// Turn the calculated TextRect through 180 deg
......@@ -37,6 +42,11 @@ public:
SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {}
virtual ~SdrMeasureTextUpsideDownItem() override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem const &) = default;
SdrMeasureTextUpsideDownItem(SdrMeasureTextUpsideDownItem &&) = default;
SdrMeasureTextUpsideDownItem & operator =(SdrMeasureTextUpsideDownItem const &) = default;
SdrMeasureTextUpsideDownItem & operator =(SdrMeasureTextUpsideDownItem &&) = default;
};
#endif
......
......@@ -50,7 +50,6 @@ private:
public:
XColorEntry(const Color& rColor, const OUString& rName);
XColorEntry(const XColorEntry& rOther);
const Color& GetColor() const
{
......
......@@ -34,10 +34,6 @@ namespace sdr
{
}
DisplayInfo::~DisplayInfo()
{
}
// Access to LayerInfos (which layers to process)
void DisplayInfo::SetProcessLayers(const SdrLayerIDSet& rSet)
{
......
......@@ -18,9 +18,6 @@ ColorSet::ColorSet(OUString const & aColorSetName)
, maColors(12)
{}
ColorSet::~ColorSet()
{}
ColorSets::ColorSets()
{}
......
......@@ -49,11 +49,6 @@
#include <svx/xpool.hxx>
#include <o3tl/make_unique.hxx>
SdrObjConnection::~SdrObjConnection()
{
}
void SdrObjConnection::ResetVars()
{
pObj=nullptr;
......
......@@ -25,12 +25,6 @@ XPropertyEntry::XPropertyEntry(const OUString& rPropEntryName)
{
}
XPropertyEntry::XPropertyEntry(const XPropertyEntry& rOther)
: maPropEntryName(rOther.maPropEntryName),
maUiBitmap(rOther.maUiBitmap)
{
}
XPropertyEntry::~XPropertyEntry()
{
}
......
......@@ -37,12 +37,6 @@ XColorEntry::XColorEntry(const Color& rColor, const OUString& rName)
{
}
XColorEntry::XColorEntry(const XColorEntry& rOther)
: XPropertyEntry(rOther),
aColor(rOther.aColor)
{
}
XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName)
: XPropertyEntry(rName),
aB2DPolyPolygon(rB2DPolyPolygon)
......
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