diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 08:50:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-06 09:54:25 +0200 |
commit | 24eae7bd702f3f6dd790be7ac38ac16e9fe6a375 (patch) | |
tree | 56398264184709e84517c2e843aa3a0894cc1c51 /sc/source | |
parent | fad919eb0d30b2303193e1c00ba765514957652c (diff) |
clang-tidy performance-unnecessary-value-param
Change-Id: I69247498e13331f6ef84afeb242479f8fb1178a8
Reviewed-on: https://gerrit.libreoffice.org/60068
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/colorscale.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 30 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/dataprovider/csvdataprovider.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/dataprovider/dataprovider.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dataprovider/datatransformation.cxx | 33 | ||||
-rw-r--r-- | sc/source/ui/dataprovider/htmldataprovider.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/dataprovider/xmldataprovider.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/datatransformation.hxx | 36 | ||||
-rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/dataproviderdlg.cxx | 77 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/datatableview.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 13 |
15 files changed, 151 insertions, 123 deletions
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 3617dcf7401f..46dea0e3f124 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -346,7 +346,7 @@ void ScColorScaleEntry::setListener() } } -void ScColorScaleEntry::SetRepaintCallback(std::function<void()> func) +void ScColorScaleEntry::SetRepaintCallback(const std::function<void()>& func) { mpListener->setCallback(func); } diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 5bf0269f3978..6a365098a5a5 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -950,10 +950,11 @@ template<class Base> class DynamicKernelSlidingArgument : public Base { public: - DynamicKernelSlidingArgument( const ScCalcConfig& config, const std::string& s, - FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen, - int index ) : - Base(config, s, ft, index), mpCodeGen(CodeGen) + DynamicKernelSlidingArgument(const ScCalcConfig& config, const std::string& s, + const FormulaTreeNodeRef& ft, + std::shared_ptr<SlidingFunctionBase>& CodeGen, int index) + : Base(config, s, ft, index) + , mpCodeGen(CodeGen) { FormulaToken* t = ft->GetFormulaToken(); if (t->GetType() != formula::svDoubleVectorRef) @@ -1175,8 +1176,9 @@ public: typedef std::map<const formula::FormulaToken*, DynamicKernelArgumentRef> ArgumentMap; // This avoids instability caused by using pointer as the key type SymbolTable() : mCurId(0) { } - template<class T> - const DynamicKernelArgument* DeclRefArg( const ScCalcConfig& config, FormulaTreeNodeRef, SlidingFunctionBase* pCodeGen, int nResultSize ); + template <class T> + const DynamicKernelArgument* DeclRefArg(const ScCalcConfig& config, const FormulaTreeNodeRef&, + SlidingFunctionBase* pCodeGen, int nResultSize); /// Used to generate sliding window helpers void DumpSlidingWindowFunctions( std::stringstream& ss ) { @@ -1211,10 +1213,11 @@ template<class Base> class ParallelReductionVectorRef : public Base { public: - ParallelReductionVectorRef( const ScCalcConfig& config, const std::string& s, - FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen, - int index ) : - Base(config, s, ft, index), mpCodeGen(CodeGen) + ParallelReductionVectorRef(const ScCalcConfig& config, const std::string& s, + const FormulaTreeNodeRef& ft, + std::shared_ptr<SlidingFunctionBase>& CodeGen, int index) + : Base(config, s, ft, index) + , mpCodeGen(CodeGen) { FormulaToken* t = ft->GetFormulaToken(); if (t->GetType() != formula::svDoubleVectorRef) @@ -3544,9 +3547,10 @@ void DynamicKernel::Launch( size_t nr ) // Symbol lookup. If there is no such symbol created, allocate one // kernel with argument with unique name and return so. // The template argument T must be a subclass of DynamicKernelArgument -template<typename T> -const DynamicKernelArgument* SymbolTable::DeclRefArg( const ScCalcConfig& config, - FormulaTreeNodeRef t, SlidingFunctionBase* pCodeGen, int nResultSize ) +template <typename T> +const DynamicKernelArgument* SymbolTable::DeclRefArg(const ScCalcConfig& config, + const FormulaTreeNodeRef& t, + SlidingFunctionBase* pCodeGen, int nResultSize) { FormulaToken* ref = t->GetFormulaToken(); ArgumentMap::iterator it = mSymbols.find(ref); diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 51a63f548afe..89bc5fdf3dcc 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -60,6 +60,7 @@ using ::std::vector; #include <com/sun/star/sheet/FormulaToken.hpp> #include <com/sun/star/sheet/ReferenceFlags.hpp> #include <com/sun/star/sheet/NameToken.hpp> +#include <utility> using namespace formula; using namespace com::sun::star; @@ -939,8 +940,9 @@ bool ScTableRefToken::operator==( const FormulaToken& r ) const return true; } -ScJumpMatrixToken::ScJumpMatrixToken( std::shared_ptr<ScJumpMatrix> p ) - : FormulaToken( formula::svJumpMatrix ), mpJumpMatrix( p ) +ScJumpMatrixToken::ScJumpMatrixToken(std::shared_ptr<ScJumpMatrix> p) + : FormulaToken(formula::svJumpMatrix) + , mpJumpMatrix(std::move(p)) {} ScJumpMatrixToken::ScJumpMatrixToken( const ScJumpMatrixToken & ) = default; diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx index 16fc8f3c84f7..3998bba8298a 100644 --- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx +++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx @@ -203,7 +203,7 @@ void AddressWalkerWriter::writeValue(double aValue) // DataCellIterator -DataCellIterator::DataCellIterator(ScRange aInputRange, bool aByColumn) +DataCellIterator::DataCellIterator(const ScRange& aInputRange, bool aByColumn) : mInputRange(aInputRange) , mByColumn(aByColumn) , mCol(0) @@ -282,9 +282,9 @@ sal_Int32 DataRangeIterator::index() // DataRangeByColumnIterator -DataRangeByColumnIterator::DataRangeByColumnIterator(ScRange aInputRange) : - DataRangeIterator(aInputRange), - mCol(aInputRange.aStart.Col()) +DataRangeByColumnIterator::DataRangeByColumnIterator(const ScRange& aInputRange) + : DataRangeIterator(aInputRange) + , mCol(aInputRange.aStart.Col()) {} bool DataRangeByColumnIterator::hasNext() @@ -323,9 +323,9 @@ DataCellIterator DataRangeByColumnIterator::iterateCells() // DataRangeByRowIterator -DataRangeByRowIterator::DataRangeByRowIterator(ScRange aInputRange) : - DataRangeIterator(aInputRange), - mRow(aInputRange.aStart.Row()) +DataRangeByRowIterator::DataRangeByRowIterator(const ScRange& aInputRange) + : DataRangeIterator(aInputRange) + , mRow(aInputRange.aStart.Row()) {} bool DataRangeByRowIterator::hasNext() diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx index c787ee4ce0c6..92176f9a55f6 100644 --- a/sc/source/ui/dataprovider/csvdataprovider.cxx +++ b/sc/source/ui/dataprovider/csvdataprovider.cxx @@ -12,6 +12,7 @@ #include <stringutil.hxx> #include <orcus/csv_parser.hpp> +#include <utility> namespace { @@ -59,15 +60,15 @@ public: } namespace sc { - -CSVFetchThread::CSVFetchThread(ScDocument& rDoc, const OUString& mrURL, std::function<void()> aImportFinishedHdl, - const std::vector<std::shared_ptr<sc::DataTransformation>>& rDataTransformations): - Thread("CSV Fetch Thread"), - mrDocument(rDoc), - maURL (mrURL), - mbTerminate(false), - maDataTransformations(rDataTransformations), - maImportFinishedHdl(aImportFinishedHdl) +CSVFetchThread::CSVFetchThread( + ScDocument& rDoc, const OUString& mrURL, std::function<void()> aImportFinishedHdl, + const std::vector<std::shared_ptr<sc::DataTransformation>>& rDataTransformations) + : Thread("CSV Fetch Thread") + , mrDocument(rDoc) + , maURL(mrURL) + , mbTerminate(false) + , maDataTransformations(rDataTransformations) + , maImportFinishedHdl(std::move(aImportFinishedHdl)) { maConfig.delimiters.push_back(','); maConfig.text_qualifier = '"'; diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 353d19d42b76..01408c778fa9 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -163,7 +163,8 @@ void ExternalDataSource::refresh(ScDocument* pDoc, bool bDeterministic) mpDataProvider->Import(); } -void ExternalDataSource::AddDataTransformation(std::shared_ptr<sc::DataTransformation> mpDataTransformation) +void ExternalDataSource::AddDataTransformation( + const std::shared_ptr<sc::DataTransformation>& mpDataTransformation) { maDataTransformations.push_back(mpDataTransformation); } diff --git a/sc/source/ui/dataprovider/datatransformation.cxx b/sc/source/ui/dataprovider/datatransformation.cxx index ff3aab748fa9..0c4e64a83f3e 100644 --- a/sc/source/ui/dataprovider/datatransformation.cxx +++ b/sc/source/ui/dataprovider/datatransformation.cxx @@ -452,17 +452,19 @@ std::set<SCCOL> AggregateFunction::getColumns() const return maColumns; } -NumberTransformation::NumberTransformation(const std::set<SCCOL> nCol, const NUMBER_TRANSFORM_TYPE rType): - mnCol(nCol), - maType(rType), - maPrecision(-1) +NumberTransformation::NumberTransformation(const std::set<SCCOL>& nCol, + const NUMBER_TRANSFORM_TYPE rType) + : mnCol(nCol) + , maType(rType) + , maPrecision(-1) { } -NumberTransformation::NumberTransformation(const std::set<SCCOL> nCol,const NUMBER_TRANSFORM_TYPE rType, int nPrecision): - mnCol(nCol), - maType(rType), - maPrecision(nPrecision) +NumberTransformation::NumberTransformation(const std::set<SCCOL>& nCol, + const NUMBER_TRANSFORM_TYPE rType, int nPrecision) + : mnCol(nCol) + , maType(rType) + , maPrecision(nPrecision) { } @@ -708,9 +710,10 @@ std::set<SCCOL> NumberTransformation::getColumn() const return mnCol; } -ReplaceNullTransformation::ReplaceNullTransformation(const std::set<SCCOL> nCol, const OUString sReplaceWith): - mnCol(nCol), - msReplaceWith(sReplaceWith) +ReplaceNullTransformation::ReplaceNullTransformation(const std::set<SCCOL>& nCol, + const OUString& sReplaceWith) + : mnCol(nCol) + , msReplaceWith(sReplaceWith) { } @@ -757,10 +760,10 @@ TransformationType ReplaceNullTransformation::getTransformationType() const return TransformationType::REMOVE_NULL_TRANSFORMATION; } - -DateTimeTransformation::DateTimeTransformation(const std::set<SCCOL> nCol,const DATETIME_TRANSFORMATION_TYPE rType): - mnCol(nCol), - maType(rType) +DateTimeTransformation::DateTimeTransformation(const std::set<SCCOL>& nCol, + const DATETIME_TRANSFORMATION_TYPE rType) + : mnCol(nCol) + , maType(rType) { } diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx b/sc/source/ui/dataprovider/htmldataprovider.cxx index b95b448c1989..b83a046f0d36 100644 --- a/sc/source/ui/dataprovider/htmldataprovider.cxx +++ b/sc/source/ui/dataprovider/htmldataprovider.cxx @@ -18,6 +18,7 @@ #include <libxml/xpathInternals.h> #include <comphelper/string.hxx> +#include <utility> namespace sc { @@ -41,14 +42,16 @@ public: virtual void execute() override; }; -HTMLFetchThread::HTMLFetchThread(ScDocument& rDoc, const OUString& rURL, const OUString& rID, std::function<void()> aImportFinishedHdl, - const std::vector<std::shared_ptr<sc::DataTransformation>>& rTransformations): - salhelper::Thread("HTML Fetch Thread"), - mrDocument(rDoc), - maURL(rURL), - maID(rID), - maDataTransformations(rTransformations), - maImportFinishedHdl(aImportFinishedHdl) +HTMLFetchThread::HTMLFetchThread( + ScDocument& rDoc, const OUString& rURL, const OUString& rID, + std::function<void()> aImportFinishedHdl, + const std::vector<std::shared_ptr<sc::DataTransformation>>& rTransformations) + : salhelper::Thread("HTML Fetch Thread") + , mrDocument(rDoc) + , maURL(rURL) + , maID(rID) + , maDataTransformations(rTransformations) + , maImportFinishedHdl(std::move(aImportFinishedHdl)) { } diff --git a/sc/source/ui/dataprovider/xmldataprovider.cxx b/sc/source/ui/dataprovider/xmldataprovider.cxx index 43fb36cf79b1..95c5e467e1f2 100644 --- a/sc/source/ui/dataprovider/xmldataprovider.cxx +++ b/sc/source/ui/dataprovider/xmldataprovider.cxx @@ -14,6 +14,7 @@ #include <filter.hxx> #include <document.hxx> #include <orcusfilters.hxx> +#include <utility> using namespace com::sun::star; @@ -46,7 +47,7 @@ XMLFetchThread::XMLFetchThread( , maID(rID) , maParam(rParam) , maDataTransformations(rTransformations) - , maImportFinishedHdl(aImportFinishedHdl) + , maImportFinishedHdl(std::move(aImportFinishedHdl)) { } diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 073c89d98b0d..c52cf2838fb0 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -101,7 +101,7 @@ private: SCROW mRow; public: - DataCellIterator(ScRange aInputRange, bool aByColumn); + DataCellIterator(const ScRange& aInputRange, bool aByColumn); ~DataCellIterator(); bool hasNext(); @@ -136,7 +136,7 @@ class DataRangeByColumnIterator final : public DataRangeIterator SCCOL mCol; public: - DataRangeByColumnIterator(ScRange aInputRange); + DataRangeByColumnIterator(const ScRange& aInputRange); virtual bool hasNext() override; virtual void next() override; @@ -151,7 +151,7 @@ class DataRangeByRowIterator final : public DataRangeIterator SCROW mRow; public: - DataRangeByRowIterator(ScRange aInputRange); + DataRangeByRowIterator(const ScRange& aInputRange); virtual bool hasNext() override; virtual void next() override; diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx index 4d68046ffd85..a8c54dabbd59 100644 --- a/sc/source/ui/inc/datatransformation.hxx +++ b/sc/source/ui/inc/datatransformation.hxx @@ -145,13 +145,14 @@ class SC_DLLPUBLIC NumberTransformation : public DataTransformation int maPrecision; public: - NumberTransformation(const std::set<SCCOL> nCol, const NUMBER_TRANSFORM_TYPE rType); - NumberTransformation(const std::set<SCCOL> nCol, const NUMBER_TRANSFORM_TYPE rType, int nPrecision); - virtual void Transform(ScDocument& rDoc) const override; - virtual TransformationType getTransformationType() const override; - NUMBER_TRANSFORM_TYPE getNumberTransfromationType() const; - int getPrecision() const; - std::set<SCCOL> getColumn() const; + NumberTransformation(const std::set<SCCOL>& nCol, const NUMBER_TRANSFORM_TYPE rType); + NumberTransformation(const std::set<SCCOL>& nCol, const NUMBER_TRANSFORM_TYPE rType, + int nPrecision); + virtual void Transform(ScDocument& rDoc) const override; + virtual TransformationType getTransformationType() const override; + NUMBER_TRANSFORM_TYPE getNumberTransfromationType() const; + int getPrecision() const; + std::set<SCCOL> getColumn() const; }; class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation @@ -160,11 +161,11 @@ class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation OUString msReplaceWith; public: - ReplaceNullTransformation(const std::set<SCCOL> nCol, const OUString sReplaceWith); - virtual void Transform(ScDocument& rDoc) const override; - virtual TransformationType getTransformationType() const override; - std::set<SCCOL> getColumn() const; - OUString getReplaceString() const; + ReplaceNullTransformation(const std::set<SCCOL>& nCol, const OUString& sReplaceWith); + virtual void Transform(ScDocument& rDoc) const override; + virtual TransformationType getTransformationType() const override; + std::set<SCCOL> getColumn() const; + OUString getReplaceString() const; }; class SC_DLLPUBLIC DateTimeTransformation : public DataTransformation @@ -173,11 +174,12 @@ class SC_DLLPUBLIC DateTimeTransformation : public DataTransformation DATETIME_TRANSFORMATION_TYPE maType; public: - DateTimeTransformation(const std::set<SCCOL> nCol, const DATETIME_TRANSFORMATION_TYPE rType); - virtual void Transform(ScDocument& rDoc) const override; - virtual TransformationType getTransformationType() const override; - DATETIME_TRANSFORMATION_TYPE getDateTimeTransfromationType() const; - std::set<SCCOL> getColumn() const; + DateTimeTransformation(const std::set<SCCOL>& nCol, + const DATETIME_TRANSFORMATION_TYPE rType); + virtual void Transform(ScDocument& rDoc) const override; + virtual TransformationType getTransformationType() const override; + DATETIME_TRANSFORMATION_TYPE getDateTimeTransfromationType() const; + std::set<SCCOL> getColumn() const; }; } diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 99e2d1ff988b..0eb80137c926 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -139,11 +139,11 @@ private: class ScUndoCut: public ScBlockUndo { public: - ScUndoCut( ScDocShell* pNewDocShell, - ScRange aRange, // adjusted for merged cells - const ScAddress& aOldEnd, // end position without adjustment - const ScMarkData& rMark, // selected sheets - ScDocumentUniquePtr pNewUndoDoc ); + ScUndoCut(ScDocShell* pNewDocShell, + const ScRange& aRange, // adjusted for merged cells + const ScAddress& aOldEnd, // end position without adjustment + const ScMarkData& rMark, // selected sheets + ScDocumentUniquePtr pNewUndoDoc); virtual ~ScUndoCut() override; virtual void Undo() override; diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index b637c5d4770d..85cdd20e29cd 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -16,6 +16,7 @@ #include <comphelper/string.hxx> #include <sal/log.hxx> +#include <utility> #include <vcl/lstbox.hxx> constexpr int MENU_START = 0; @@ -267,10 +268,11 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScDeleteColumnTransformationControl::ScDeleteColumnTransformationControl(vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent, "modules/scalc/ui/deletecolumnentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScDeleteColumnTransformationControl::ScDeleteColumnTransformationControl( + vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/deletecolumnentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(maColumnNums, "ed_columns"); get(maDelete, "ed_delete"); @@ -331,11 +333,13 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScSplitColumnTransformationControl::ScSplitColumnTransformationControl(vcl::Window* pParent, SCCOL nCol, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent, "modules/scalc/ui/splitcolumnentry.ui"), - mnCol(nCol), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScSplitColumnTransformationControl::ScSplitColumnTransformationControl( + vcl::Window* pParent, SCCOL nCol, sal_uInt32 aIndex, + std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/splitcolumnentry.ui") + , mnCol(nCol) + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(maSeparator, "ed_separator"); get(maNumColumns, "num_cols"); @@ -383,10 +387,12 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScMergeColumnTransformationControl::ScMergeColumnTransformationControl(vcl::Window* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent, "modules/scalc/ui/mergecolumnentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScMergeColumnTransformationControl::ScMergeColumnTransformationControl( + vcl::Window* pParent, SCCOL nStartCol, SCCOL nEndCol, sal_uInt32 aIndex, + std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/mergecolumnentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(mpSeparator, "ed_separator"); get(mpEdColumns, "ed_columns"); @@ -459,10 +465,11 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScSortTransformationControl::ScSortTransformationControl(vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent, "modules/scalc/ui/sorttransformationentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScSortTransformationControl::ScSortTransformationControl( + vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/sorttransformationentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(mpAscending, "ed_ascending"); get(mpEdColumns, "ed_columns"); @@ -522,10 +529,11 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScColumnTextTransformation::ScColumnTextTransformation(vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent,"modules/scalc/ui/texttransformationentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScColumnTextTransformation::ScColumnTextTransformation( + vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/texttransformationentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(maColumnNums, "ed_columns"); get(maType, "ed_lst"); @@ -602,10 +610,11 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScAggregateFunction::ScAggregateFunction(vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent,"modules/scalc/ui/aggregatefunctionentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScAggregateFunction::ScAggregateFunction(vcl::Window* pParent, sal_uInt32 aIndex, + std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/aggregatefunctionentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(maColumnNums, "ed_columns"); get(maType, "ed_lst"); @@ -681,10 +690,11 @@ public: DECL_LINK(DeleteHdl, Button*, void); }; -ScNumberTransformation::ScNumberTransformation(vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation): - ScDataTransformationBaseControl(pParent,"modules/scalc/ui/numbertransformationentry.ui"), - maIndex(aIndex), - maDeleteTransformation(aDeleteTransformation) +ScNumberTransformation::ScNumberTransformation( + vcl::Window* pParent, sal_uInt32 aIndex, std::function<void(sal_uInt32&)> aDeleteTransformation) + : ScDataTransformationBaseControl(pParent, "modules/scalc/ui/numbertransformationentry.ui") + , maIndex(aIndex) + , maDeleteTransformation(std::move(aDeleteTransformation)) { get(maColumnNums, "ed_columns"); get(maType, "ed_lst"); @@ -826,10 +836,11 @@ std::shared_ptr<sc::DataTransformation> ScReplaceNullTransformation::getTransfor } -ScDataProviderDlg::ScDataProviderDlg(vcl::Window* pParent, std::shared_ptr<ScDocument> pDoc, ScDocument* pDocument): - ModalDialog(pParent, "dataproviderdlg", "modules/scalc/ui/dataproviderdlg.ui", true), - mpDoc(pDoc), - mpBar(VclPtr<MenuBar>::Create()) +ScDataProviderDlg::ScDataProviderDlg(vcl::Window* pParent, std::shared_ptr<ScDocument> pDoc, + ScDocument* pDocument) + : ModalDialog(pParent, "dataproviderdlg", "modules/scalc/ui/dataproviderdlg.ui", true) + , mpDoc(std::move(pDoc)) + , mpBar(VclPtr<MenuBar>::Create()) { get(mpTable, "data_table"); get(mpList, "operation_ctrl"); diff --git a/sc/source/ui/miscdlgs/datatableview.cxx b/sc/source/ui/miscdlgs/datatableview.cxx index 05dacaf2e2a8..174342653d93 100644 --- a/sc/source/ui/miscdlgs/datatableview.cxx +++ b/sc/source/ui/miscdlgs/datatableview.cxx @@ -20,6 +20,7 @@ #include <datatableview.hxx> #include <document.hxx> +#include <utility> #include <viewdata.hxx> #include <output.hxx> #include <fillinfo.hxx> @@ -165,7 +166,7 @@ ScDataTableView::ScDataTableView(vcl::Window* pParent): void ScDataTableView::Init(std::shared_ptr<ScDocument> pDoc) { - mpDoc = pDoc; + mpDoc = std::move(pDoc); mpColView->Init(mpDoc.get()); mpRowView->Init(mpDoc.get()); } diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 07ff4ff622b8..ce81044707a0 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -799,13 +799,12 @@ bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } -ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, - ScRange aRange, const ScAddress& aOldEnd, const ScMarkData& rMark, - ScDocumentUniquePtr pNewUndoDoc ) : - ScBlockUndo( pNewDocShell, ScRange(aRange.aStart, aOldEnd), SC_UNDO_AUTOHEIGHT ), - aMarkData( rMark ), - pUndoDoc( std::move(pNewUndoDoc) ), - aExtendedRange( aRange ) +ScUndoCut::ScUndoCut(ScDocShell* pNewDocShell, const ScRange& aRange, const ScAddress& aOldEnd, + const ScMarkData& rMark, ScDocumentUniquePtr pNewUndoDoc) + : ScBlockUndo(pNewDocShell, ScRange(aRange.aStart, aOldEnd), SC_UNDO_AUTOHEIGHT) + , aMarkData(rMark) + , pUndoDoc(std::move(pNewUndoDoc)) + , aExtendedRange(aRange) { SetChangeTrack(); } |