[Libreoffice-commits] core.git: include/svx svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jul 27 06:29:47 UTC 2018
include/svx/ColorSets.hxx | 1 -
include/svx/IAccessibleViewForwarder.hxx | 6 ++++++
include/svx/XPropertyEntry.hxx | 7 ++++++-
include/svx/sdasitm.hxx | 5 +++++
include/svx/sdr/contact/displayinfo.hxx | 3 ---
include/svx/sdtaiitm.hxx | 10 ++++++++++
include/svx/svdoattr.hxx | 4 ++++
include/svx/svdoedge.hxx | 1 -
include/svx/sxcecitm.hxx | 10 ++++++++++
include/svx/sxcllitm.hxx | 10 ++++++++++
include/svx/sxmbritm.hxx | 5 +++++
include/svx/sxmtfitm.hxx | 15 +++++++++++++++
include/svx/sxmtritm.hxx | 10 ++++++++++
include/svx/xtable.hxx | 1 -
svx/source/sdr/contact/displayinfo.cxx | 4 ----
svx/source/styles/ColorSets.cxx | 3 ---
svx/source/svdraw/svdoedge.cxx | 5 -----
svx/source/xoutdev/XPropertyEntry.cxx | 6 ------
svx/source/xoutdev/xtable.cxx | 6 ------
19 files changed, 81 insertions(+), 31 deletions(-)
New commits:
commit 13502c0f201f37960ec06bf1e7e2e8b4d838090a
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 16:21:18 2018 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jul 27 08:29:15 2018 +0200
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: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 586a180342c9..9ac53100b874 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -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)
{
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index eb89854fe1fe..1b228669b7da 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -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
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 4a180c33ea6b..98f482f9c7b4 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -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; }
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 254aba0a7c4d..c0c02897da5c 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -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,
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 486399ab16c4..6a054eb5d824 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -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; }
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index 37e6a8002d43..f49131403096 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -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
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index ff0693f9759b..44a31a65542c 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -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;
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index d1f84cb49f6d..61b53414fa6d 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -52,7 +52,6 @@ class SdrObjConnection final
public:
SdrObjConnection() { ResetVars(); }
- SVX_DLLPUBLIC ~SdrObjConnection();
void ResetVars();
bool TakeGluePoint(SdrGluePoint& rGP) const;
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index fb7d898fcde5..53a81f11462f 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -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;
};
diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index 2b3dae33f370..8fa6eaf81285 100644
--- a/include/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
@@ -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
diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index 342088043330..25646ae92d7b 100644
--- a/include/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
@@ -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
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 525e9e72bbae..e92bc21b2b39 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -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
diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx
index 690f2ea4cea7..78da1e7a1185 100644
--- a/include/svx/sxmtritm.hxx
+++ b/include/svx/sxmtritm.hxx
@@ -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
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 38efceb2106a..849e400e8889 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -50,7 +50,6 @@ private:
public:
XColorEntry(const Color& rColor, const OUString& rName);
- XColorEntry(const XColorEntry& rOther);
const Color& GetColor() const
{
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index 6a70a879fb88..e3fc6b91664a 100644
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
@@ -34,10 +34,6 @@ namespace sdr
{
}
- DisplayInfo::~DisplayInfo()
- {
- }
-
// Access to LayerInfos (which layers to process)
void DisplayInfo::SetProcessLayers(const SdrLayerIDSet& rSet)
{
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index ab313c8599f1..7a3fabf6a9d8 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -18,9 +18,6 @@ ColorSet::ColorSet(OUString const & aColorSetName)
, maColors(12)
{}
-ColorSet::~ColorSet()
-{}
-
ColorSets::ColorSets()
{}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 7b490aeecd96..605ed189ae55 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -49,11 +49,6 @@
#include <svx/xpool.hxx>
#include <o3tl/make_unique.hxx>
-
-SdrObjConnection::~SdrObjConnection()
-{
-}
-
void SdrObjConnection::ResetVars()
{
pObj=nullptr;
diff --git a/svx/source/xoutdev/XPropertyEntry.cxx b/svx/source/xoutdev/XPropertyEntry.cxx
index 4c29e4f3fb8a..974a5bb20c91 100644
--- a/svx/source/xoutdev/XPropertyEntry.cxx
+++ b/svx/source/xoutdev/XPropertyEntry.cxx
@@ -25,12 +25,6 @@ XPropertyEntry::XPropertyEntry(const OUString& rPropEntryName)
{
}
-XPropertyEntry::XPropertyEntry(const XPropertyEntry& rOther)
-: maPropEntryName(rOther.maPropEntryName),
- maUiBitmap(rOther.maUiBitmap)
-{
-}
-
XPropertyEntry::~XPropertyEntry()
{
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index aec72447ae82..3b72a44156ba 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -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)
More information about the Libreoffice-commits
mailing list