diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 13:47:59 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:20:20 +0200 |
commit | f1a10d4f14e86a2a2a632ff4a091690c2f31f255 (patch) | |
tree | 739f86a047016f2ac99c9dca142d666253173c80 /sc/source/filter/inc | |
parent | 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f (diff) |
sc: 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: I4efe3eb088e5f9096be87dd8240504768755112b
Reviewed-on: https://gerrit.libreoffice.org/58096
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r-- | sc/source/filter/inc/fapihelper.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/inc/formulabase.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/inc/workbookhelper.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/inc/xechart.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/inc/xerecord.hxx | 11 | ||||
-rw-r--r-- | sc/source/filter/inc/xichart.hxx | 17 | ||||
-rw-r--r-- | sc/source/filter/inc/xlpivot.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/inc/xlstyle.hxx | 5 |
8 files changed, 63 insertions, 0 deletions
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 33631e8a0f75..c4d14a5b9aa2 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -112,6 +112,11 @@ public: explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); } ~ScfPropertySet(); + //TOOD: + ScfPropertySet(ScfPropertySet const &) = default; + ScfPropertySet(ScfPropertySet &&) = default; + ScfPropertySet & operator =(ScfPropertySet const &) = default; + ScfPropertySet & operator =(ScfPropertySet &&) = default; /** Sets the passed UNO property set and releases the old UNO property set. */ void Set( css::uno::Reference< css::beans::XPropertySet > const & xPropSet ); diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index d207559a2d66..3f359c07e1bf 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -537,6 +537,11 @@ public: explicit FunctionProvider(bool bImportFilter); virtual ~FunctionProvider(); + FunctionProvider(FunctionProvider const &) = default; + FunctionProvider(FunctionProvider &&) = default; + FunctionProvider & operator =(FunctionProvider const &) = default; + FunctionProvider & operator =(FunctionProvider &&) = default; + /** Returns the function info for an OOXML function name, or 0 on error. */ const FunctionInfo* getFuncInfoFromOoxFuncName( const OUString& rFuncName ) const; @@ -574,6 +579,11 @@ public: bool bImportFilter); virtual ~OpCodeProvider() override; + OpCodeProvider(OpCodeProvider const &) = default; + OpCodeProvider(OpCodeProvider &&) = default; + OpCodeProvider & operator =(OpCodeProvider const &) = default; + OpCodeProvider & operator =(OpCodeProvider &&) = default; + /** Returns the structure containing all token op-codes for operators and special tokens used by the Calc document and its formula parser. */ const ApiOpCodes& getOpCodes() const; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index afd36fadd83b..7a9047ae55d5 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -104,6 +104,11 @@ public: /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {} virtual ~WorkbookHelper(); + WorkbookHelper(WorkbookHelper const &) = default; + WorkbookHelper(WorkbookHelper &&) = default; + WorkbookHelper & operator =(WorkbookHelper const &) = default; + WorkbookHelper & operator =(WorkbookHelper &&) = default; + static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter ); // filter ----------------------------------------------------------------- diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index dcdd1e3f3b6d..d9fca5961ea2 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -83,6 +83,11 @@ public: explicit XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ); virtual ~XclExpChRoot() override; + XclExpChRoot(XclExpChRoot const &) = default; + XclExpChRoot(XclExpChRoot &&) = default; + XclExpChRoot & operator =(XclExpChRoot const &) = default; + XclExpChRoot & operator =(XclExpChRoot &&) = default; + /** Returns this root instance - for code readability in derived classes. */ const XclExpChRoot& GetChRoot() const { return *this; } /** Returns the API Chart document model. */ diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index efa20eb0f402..2985e452ce2e 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -36,6 +36,12 @@ class XclExpRecordBase { public: + XclExpRecordBase() = default; + XclExpRecordBase(XclExpRecordBase const &) = default; + XclExpRecordBase(XclExpRecordBase &&) = default; + XclExpRecordBase & operator =(XclExpRecordBase const &) = default; + XclExpRecordBase & operator =(XclExpRecordBase &&) = default; + virtual ~XclExpRecordBase(); /** Overwrite this method to do any operation while saving the record. */ @@ -124,6 +130,11 @@ public: virtual ~XclExpRecord() override; + XclExpRecord(XclExpRecord const &) = default; + XclExpRecord(XclExpRecord &&) = default; + XclExpRecord & operator =(XclExpRecord const &) = default; + XclExpRecord & operator =(XclExpRecord &&) = default; + /** Returns the current record ID. */ sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the current record size prediction. */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index d1e3f4efcde8..f02ec52ca42b 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -86,6 +86,11 @@ public: explicit XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ); virtual ~XclImpChRoot() override; + XclImpChRoot(XclImpChRoot const &) = default; + XclImpChRoot(XclImpChRoot &&) = default; + XclImpChRoot & operator =(XclImpChRoot const &) = default; + XclImpChRoot & operator =(XclImpChRoot &&) = default; + /** Returns this root instance - for code readability in derived classes. */ const XclImpChRoot& GetChRoot() const { return *this; } /** Returns a reference to the parent chart data object. */ @@ -177,6 +182,12 @@ private: class XclImpChGroupBase { public: + XclImpChGroupBase() = default; + XclImpChGroupBase(XclImpChGroupBase const &) = default; + XclImpChGroupBase(XclImpChGroupBase &&) = default; + XclImpChGroupBase & operator =(XclImpChGroupBase const &) = default; + XclImpChGroupBase & operator =(XclImpChGroupBase &&) = default; + virtual ~XclImpChGroupBase(); /** Reads the entire record group. @@ -428,6 +439,12 @@ typedef std::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef; class XclImpChFontBase { public: + XclImpChFontBase() = default; + XclImpChFontBase(XclImpChFontBase const &) = default; + XclImpChFontBase(XclImpChFontBase &&) = default; + XclImpChFontBase & operator =(XclImpChFontBase const &) = default; + XclImpChFontBase & operator =(XclImpChFontBase &&) = default; + virtual ~XclImpChFontBase(); /** Derived classes return the leading font index for the text object. */ diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 5306bbbf690c..26e5c7869eb2 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -377,6 +377,11 @@ public: explicit XclPCItem(); virtual ~XclPCItem(); + XclPCItem(XclPCItem const &) = default; + XclPCItem(XclPCItem &&) = default; + XclPCItem & operator =(XclPCItem const &) = default; + XclPCItem & operator =(XclPCItem &&) = default; + /** Sets the item to 'empty' type. */ void SetEmpty(); /** Sets the item to 'text' type and adds the passed text. */ diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 1ff7b9a8c1f7..f9b6e68a80ad 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -566,6 +566,11 @@ public: explicit XclXFBase( bool bCellXF ); virtual ~XclXFBase(); + XclXFBase(XclXFBase const &) = default; + XclXFBase(XclXFBase &&) = default; + XclXFBase & operator =(XclXFBase const &) = default; + XclXFBase & operator =(XclXFBase &&) = default; + /** Sets all "attribute used" flags to the passed state. */ void SetAllUsedFlags( bool bUsed ); /** Returns true, if any "attribute used" flags are ste in this XF. */ |