diff options
Diffstat (limited to 'sc/source/ui/inc')
37 files changed, 113 insertions, 110 deletions
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 0a1465cfbb1b..879de23a7442 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -60,7 +60,7 @@ class ScAccessibleContextBase public: //===== internal ======================================================== ScAccessibleContextBase( - const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + css::uno::Reference<css::accessibility::XAccessible> xParent, const sal_Int16 aRole); virtual void Init(); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 65a2ddb02b46..576389f1d73e 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -443,7 +443,7 @@ private: public: explicit ScAccessibleCsvCell( ScCsvGrid& rGrid, - const OUString& rCellText, + OUString aCellText, sal_Int32 nRow, sal_Int32 nColumn); virtual ~ScAccessibleCsvCell() override; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 23fdb3cb25ea..b4706a09c858 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -178,7 +178,7 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat { public: ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, - const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader); + OUString aText, const ScAddress& rP, bool bColHeader, bool bRowHeader); virtual ~ScAccessiblePreviewHeaderCellTextData() override; virtual ScAccessibleTextData* Clone() const override; @@ -231,7 +231,7 @@ class ScAccessibleNoteTextData : public ScAccessibleTextData { public: ScAccessibleNoteTextData(ScPreviewShell* pViewShell, - const OUString& sText, const ScAddress& aCellPos, bool bMarkNote); + OUString sText, const ScAddress& aCellPos, bool bMarkNote); virtual ~ScAccessibleNoteTextData() override; virtual ScAccessibleTextData* Clone() const override; @@ -272,7 +272,7 @@ public: explicit ScAccessibleCsvTextData( OutputDevice* pWindow, EditEngine* pEditEngine, - const OUString& rCellText, + OUString aCellText, const Size& rCellSize ); virtual ~ScAccessibleCsvTextData() override; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 0ce026bf4047..ade3085feeae 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -25,7 +25,7 @@ public: ScPivotFuncData maFunctionData; ScItemValue* mpOriginalItemValue; - ScItemValue(OUString const & aName, SCCOL nColumn, PivotFunc nFunctionMask); + ScItemValue(OUString aName, SCCOL nColumn, PivotFunc nFunctionMask); ScItemValue(const ScItemValue* pInputItemValue); ~ScItemValue(); diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index a0c0cd9eb517..891455cc82bb 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -20,6 +20,7 @@ #pragma once #include <address.hxx> +#include <utility> #include <vector> #include <rtl/ustring.hxx> #include <tools/solar.h> @@ -35,8 +36,8 @@ struct ScAutoStyleData ScRange aRange; OUString aStyle; - ScAutoStyleData( sal_uLong nT, const ScRange& rR, const OUString& rT ) : - nTimeout(nT), aRange(rR), aStyle(rT) {} + ScAutoStyleData( sal_uLong nT, const ScRange& rR, OUString aT ) : + nTimeout(nT), aRange(rR), aStyle(std::move(aT)) {} }; struct ScAutoStyleInitData { @@ -45,8 +46,8 @@ struct ScAutoStyleInitData sal_uLong nTimeout; OUString aStyle2; - ScAutoStyleInitData( const ScRange& rR, const OUString& rSt1, sal_uLong nT, const OUString& rSt2 ) : - aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {} + ScAutoStyleInitData( const ScRange& rR, OUString aSt1, sal_uLong nT, OUString aSt2 ) : + aRange(rR), aStyle1(std::move(aSt1)), nTimeout(nT), aStyle2(std::move(aSt2)) {} }; diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 253aed098eab..16b971a538f8 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -68,7 +68,7 @@ class ScCondFormatObj : public cppu::WeakImplHelper<css::sheet::XConditionalForm css::beans::XPropertySet> { public: - ScCondFormatObj(ScDocShell* pDocShell, rtl::Reference<ScCondFormatsObj> const & xCondFormats, sal_Int32 nKey); + ScCondFormatObj(ScDocShell* pDocShell, rtl::Reference<ScCondFormatsObj> xCondFormats, sal_Int32 nKey); virtual ~ScCondFormatObj() override; @@ -156,7 +156,7 @@ class ScColorScaleFormatObj : public cppu::WeakImplHelper<css::beans::XPropertyS { public: - ScColorScaleFormatObj(rtl::Reference<ScCondFormatObj> const & xParent, const ScColorScaleFormat* pFormat); + ScColorScaleFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScColorScaleFormat* pFormat); virtual ~ScColorScaleFormatObj() override; // XConditionEntry @@ -190,7 +190,7 @@ private: class ScColorScaleEntryObj : public cppu::WeakImplHelper<css::sheet::XColorScaleEntry> { public: - ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> const & xParent, size_t nPos); + ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> xParent, size_t nPos); virtual ~ScColorScaleEntryObj() override; @@ -217,7 +217,7 @@ class ScDataBarFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, css::sheet::XConditionEntry> { public: - ScDataBarFormatObj(rtl::Reference<ScCondFormatObj> const & xParent, + ScDataBarFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScDataBarFormat* pFormat); virtual ~ScDataBarFormatObj() override; @@ -251,7 +251,7 @@ private: class ScDataBarEntryObj : public cppu::WeakImplHelper<css::sheet::XDataBarEntry> { public: - ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> const & xParent, size_t nPos); + ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> xParent, size_t nPos); virtual ~ScDataBarEntryObj() override; @@ -274,7 +274,7 @@ class ScIconSetFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, css::sheet::XConditionEntry> { public: - ScIconSetFormatObj(rtl::Reference<ScCondFormatObj> const & xParent, + ScIconSetFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScIconSetFormat* pFormat); virtual ~ScIconSetFormatObj() override; @@ -308,7 +308,7 @@ private: class ScIconSetEntryObj : public cppu::WeakImplHelper<css::sheet::XIconSetEntry> { public: - ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> const & xParent, size_t nPos); + ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> xParent, size_t nPos); virtual ~ScIconSetEntryObj() override; @@ -331,7 +331,7 @@ class ScCondDateFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet css::sheet::XConditionEntry> { public: - ScCondDateFormatObj(rtl::Reference<ScCondFormatObj> const & xParent, + ScCondDateFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScCondDateFormatEntry* pFormat); virtual ~ScCondDateFormatObj() override; diff --git a/sc/source/ui/inc/dataprovider.hxx b/sc/source/ui/inc/dataprovider.hxx index e6457c48e243..e053a72eb4e2 100644 --- a/sc/source/ui/inc/dataprovider.hxx +++ b/sc/source/ui/inc/dataprovider.hxx @@ -48,7 +48,7 @@ class CSVFetchThread : public salhelper::Thread public: - CSVFetchThread(ScDocument& rDoc, const OUString&, std::function<void()> aImportFinishedHdl, + CSVFetchThread(ScDocument& rDoc, OUString , std::function<void()> aImportFinishedHdl, std::vector<std::shared_ptr<sc::DataTransformation>>&& mrDataTransformations); virtual ~CSVFetchThread() override; @@ -121,7 +121,7 @@ class ScDBDataManager ScDocument* mpDoc; public: - ScDBDataManager(const OUString& rDBName, ScDocument* pDoc); + ScDBDataManager(OUString aDBName, ScDocument* pDoc); ~ScDBDataManager(); void SetDatabase(const OUString& rDBName); diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx index e69b21f423e4..aa822340fa80 100644 --- a/sc/source/ui/inc/datatransformation.hxx +++ b/sc/source/ui/inc/datatransformation.hxx @@ -96,7 +96,7 @@ class SC_DLLPUBLIC MergeColumnTransformation : public DataTransformation public: - MergeColumnTransformation(std::set<SCCOL>&& rColumns, const OUString& rMergeString); + MergeColumnTransformation(std::set<SCCOL>&& rColumns, OUString aMergeString); virtual void Transform(ScDocument& rDoc) const override; virtual TransformationType getTransformationType() const override; const OUString & getMergeString() const; @@ -163,7 +163,7 @@ class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation OUString msReplaceWith; public: - ReplaceNullTransformation(std::set<SCCOL>&& nCol, const OUString& sReplaceWith); + ReplaceNullTransformation(std::set<SCCOL>&& nCol, OUString sReplaceWith); virtual void Transform(ScDocument& rDoc) const override; virtual TransformationType getTransformationType() const override; const std::set<SCCOL>& getColumn() const; @@ -191,7 +191,7 @@ class FindReplaceTransformation : public DataTransformation OUString maReplaceString; public: - FindReplaceTransformation(SCCOL nCol, const OUString& aFindString, const OUString& aReplaceString); + FindReplaceTransformation(SCCOL nCol, OUString aFindString, OUString aReplaceString); virtual void Transform(ScDocument& rDoc) const override; virtual TransformationType getTransformationType() const override; SCCOL getColumn() const; @@ -205,7 +205,7 @@ class DeleteRowTransformation : public DataTransformation OUString maFindString; public: - DeleteRowTransformation(SCCOL nCol, const OUString& aFindString); + DeleteRowTransformation(SCCOL nCol, OUString aFindString); virtual void Transform(ScDocument& rDoc) const override; virtual TransformationType getTransformationType() const override; SCCOL getColumn() const; diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 99fdcf0d40a7..34e4af7063fc 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -66,7 +66,7 @@ private: public: ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel, ScDocShell* pContainerShell, - const TransferableObjectDescriptor& rDesc ); + TransferableObjectDescriptor aDesc ); virtual ~ScDrawTransferObj() override; virtual void AddSupportedFormats() override; diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index c52452841b6c..8c8203746526 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -32,7 +32,7 @@ public: FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const OUString& aStartStr, + OUString aStartStr, double fStep, double fMax, SCSIZE nSelectHeight, diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 765c32522b29..353a94167a37 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -310,7 +310,7 @@ public: ScInputHdlState( const ScAddress& rCurPos, const ScAddress& rStartPos, const ScAddress& rEndPos, - const OUString& rString, + OUString aString, const EditTextObject* pData ); ScInputHdlState( const ScInputHdlState& rCpy ); ~ScInputHdlState(); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 9d121a928fa6..c6e89ab9fed0 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -27,7 +27,7 @@ class ScDocument; class ScMoveTableDlg : public weld::GenericDialogController { public: - ScMoveTableDlg(weld::Window* pParent, const OUString& rDefault); + ScMoveTableDlg(weld::Window* pParent, OUString aDefault); virtual ~ScMoveTableDlg() override; sal_uInt16 GetSelectedDocument () const { return nDocument; } diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 1ed812d0fb82..5fb1d6e94704 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -55,7 +55,7 @@ private: public: ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, - ScDocument* pD, const ScAddress& aPos, const OUString& rUser, + ScDocument* pD, const ScAddress& aPos, OUString aUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard); ~ScNoteMarker(); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 538a4a536009..1c2329a6aff1 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -69,10 +69,10 @@ class ScOptSolverSave css::uno::Sequence<css::beans::PropertyValue> maProperties; public: - ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, - const OUString& rTarget, const OUString& rVariable, + ScOptSolverSave( OUString aObjective, bool bMax, bool bMin, bool bValue, + OUString aTarget, OUString aVariable, std::vector<ScOptConditionRow>&& rConditions, - const OUString& rEngine, + OUString aEngine, const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); const OUString& GetObjective() const { return maObjective; } diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx index ea7a4adf3aba..35ea695edaf0 100644 --- a/sc/source/ui/inc/overlayobject.hxx +++ b/sc/source/ui/inc/overlayobject.hxx @@ -44,7 +44,7 @@ private: class ScOverlayHint : public sdr::overlay::OverlayObject { public: - ScOverlayHint(const OUString& rTit, const OUString& rMsg, const Color& rColor, const vcl::Font& rFont); + ScOverlayHint(OUString aTit, const OUString& rMsg, const Color& rColor, vcl::Font aFont); Size GetSizePixel() const; void SetPos(const Point& rPos, const MapMode& rMode); diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx index c3324e2f69f6..5621cd2628ac 100644 --- a/sc/source/ui/inc/pfuncache.hxx +++ b/sc/source/ui/inc/pfuncache.hxx @@ -93,7 +93,7 @@ class ScPrintFuncCache public: ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, - const ScPrintSelectionStatus& rStatus ); + ScPrintSelectionStatus aStatus ); ~ScPrintFuncCache(); bool IsSameSelection( const ScPrintSelectionStatus& rStatus ) const; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 17a20526be02..9a7fa4a1f2b4 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -137,7 +137,7 @@ class ScDPSubtotalOptDlg : public weld::GenericDialogController { public: explicit ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject& rDPObj, - const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, + ScDPLabelData aLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ); virtual ~ScDPSubtotalOptDlg() override; void FillLabelData( ScDPLabelData& rLabelData ) const; diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index bd8f6cff10eb..18e13a09b2d3 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -45,7 +45,7 @@ class ScRangeFindList sal_uInt16 nIndexColor; public: - ScRangeFindList(const OUString& rName); + ScRangeFindList(OUString aName); sal_uLong Count() const { return maEntries.size(); } Color Insert( const ScRangeFindData &rNew ); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 5e39ef758a4c..a43a6b6320e0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -19,6 +19,7 @@ #pragma once +#include <utility> #include <vcl/weld.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -34,11 +35,11 @@ class ScSolverOptionsString OUString msStr; public: - explicit ScSolverOptionsString(const OUString& rStr) + explicit ScSolverOptionsString(OUString aStr) : mbIsDouble(false) , mfDoubleValue(0.0) , mnIntValue(0) - , msStr(rStr) + , msStr(std::move(aStr)) { } @@ -82,7 +83,7 @@ public: ScSolverOptionsDialog( weld::Window* pParent, const css::uno::Sequence<OUString>& rImplNames, const css::uno::Sequence<OUString>& rDescriptions, - const OUString& rEngine, + OUString aEngine, const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog() override; diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index c6d75675d397..98baa5c8e46a 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -130,7 +130,7 @@ public: explicit ScTextConversionEngine( SfxItemPool* pEnginePool, ScViewData& rViewData, - const ScConversionParam& rConvParam, + ScConversionParam aConvParam, ScDocument* pUndoDoc, ScDocument* pRedoDoc ); diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index ba6f56d7f4ef..7aff4317fd1d 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -47,7 +47,7 @@ public: ScConversionType eConvType, LanguageType eSourceLang, LanguageType eTargetLang, - const vcl::Font& rTargetFont, + vcl::Font aTargetFont, sal_Int32 nOptions, bool bIsInteractive ); diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 36710d6bb1d2..93a3716f7a2f 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -59,7 +59,7 @@ private: void DoPaint(vcl::RenderContext& rRenderContext); public: - ScZoomSlider(const css::uno::Reference<css::frame::XDispatchProvider>& rDispatchProvider, + ScZoomSlider(css::uno::Reference<css::frame::XDispatchProvider> xDispatchProvider, sal_uInt16 nCurrentZoom); void UpdateFromItem(const SvxZoomSliderItem* pZoomSliderItem); diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index adc58b6a5b3d..8429b6e6c257 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -67,7 +67,7 @@ private: static void GetAreaSize( const ScDocument& rDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ); public: - ScTransferObj( const std::shared_ptr<ScDocument>& pClipDoc, const TransferableObjectDescriptor& rDesc ); + ScTransferObj( const std::shared_ptr<ScDocument>& pClipDoc, TransferableObjectDescriptor aDesc ); virtual ~ScTransferObj() override; virtual void AddSupportedFormats() override; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 7a16c79f2bac..71216eb687b9 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -55,7 +55,7 @@ public: const ScAddress& rCurPos, const ScAddress& rStartPos, const ScAddress& rEndPos, - const OUString& rString, + OUString aString, const EditTextObject* pData ); ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem() override; diff --git a/sc/source/ui/inc/undo/UndoDeleteSparklineGroup.hxx b/sc/source/ui/inc/undo/UndoDeleteSparklineGroup.hxx index 081a741ab347..7ca6c6007782 100644 --- a/sc/source/ui/inc/undo/UndoDeleteSparklineGroup.hxx +++ b/sc/source/ui/inc/undo/UndoDeleteSparklineGroup.hxx @@ -28,7 +28,7 @@ private: public: UndoDeleteSparklineGroup(ScDocShell& rDocShell, - std::shared_ptr<sc::SparklineGroup> const& pSparklineGroup, + std::shared_ptr<sc::SparklineGroup> pSparklineGroup, SCTAB nSheetIndex); virtual ~UndoDeleteSparklineGroup() override; diff --git a/sc/source/ui/inc/undo/UndoEditSparkline.hxx b/sc/source/ui/inc/undo/UndoEditSparkline.hxx index 4e33eaa1f5df..78bd096bc9c3 100644 --- a/sc/source/ui/inc/undo/UndoEditSparkline.hxx +++ b/sc/source/ui/inc/undo/UndoEditSparkline.hxx @@ -30,8 +30,8 @@ private: ScRangeList maNewDataRange; public: - UndoEditSparkline(ScDocShell& rDocShell, std::shared_ptr<sc::Sparkline> const& rpSparkline, - SCTAB nTab, ScRangeList const& rDataRange); + UndoEditSparkline(ScDocShell& rDocShell, std::shared_ptr<sc::Sparkline> pSparkline, SCTAB nTab, + ScRangeList rDataRange); virtual ~UndoEditSparkline() override; diff --git a/sc/source/ui/inc/undo/UndoEditSparklineGroup.hxx b/sc/source/ui/inc/undo/UndoEditSparklineGroup.hxx index 4ab3e6a4e48f..b529c0234db6 100644 --- a/sc/source/ui/inc/undo/UndoEditSparklineGroup.hxx +++ b/sc/source/ui/inc/undo/UndoEditSparklineGroup.hxx @@ -29,7 +29,7 @@ private: public: UndoEditSparklneGroup(ScDocShell& rDocShell, std::shared_ptr<sc::SparklineGroup> const& rSparklineGroup, - sc::SparklineAttributes const& rAttributes); + sc::SparklineAttributes aAttributes); virtual ~UndoEditSparklneGroup() override; void Undo() override; diff --git a/sc/source/ui/inc/undo/UndoGroupSparklines.hxx b/sc/source/ui/inc/undo/UndoGroupSparklines.hxx index bcbc470bcd86..e67778c21309 100644 --- a/sc/source/ui/inc/undo/UndoGroupSparklines.hxx +++ b/sc/source/ui/inc/undo/UndoGroupSparklines.hxx @@ -12,17 +12,18 @@ #include <undobase.hxx> #include <memory> +#include <utility> namespace sc { /** Previous sparkline group data, which is restored at Undo grouping */ struct UndoGroupSparklinesData { - UndoGroupSparklinesData(ScAddress const& rAddress, ScRangeList const& rDataRangeList, - std::shared_ptr<sc::SparklineGroup> const& rpGroup) + UndoGroupSparklinesData(ScAddress const& rAddress, ScRangeList aDataRangeList, + std::shared_ptr<sc::SparklineGroup> pGroup) : m_aAddress(rAddress) - , m_aDataRangeList(rDataRangeList) - , m_pSparklineGroup(rpGroup) + , m_aDataRangeList(std::move(aDataRangeList)) + , m_pSparklineGroup(std::move(pGroup)) { } @@ -41,7 +42,7 @@ private: public: UndoGroupSparklines(ScDocShell& rDocShell, ScRange const& rRange, - std::shared_ptr<sc::SparklineGroup> const& rpSparklineGroup); + std::shared_ptr<sc::SparklineGroup> pSparklineGroup); virtual ~UndoGroupSparklines() override; void Undo() override; diff --git a/sc/source/ui/inc/undo/UndoInsertSparkline.hxx b/sc/source/ui/inc/undo/UndoInsertSparkline.hxx index d9e1885f171c..5262297a2495 100644 --- a/sc/source/ui/inc/undo/UndoInsertSparkline.hxx +++ b/sc/source/ui/inc/undo/UndoInsertSparkline.hxx @@ -27,8 +27,7 @@ private: std::shared_ptr<sc::SparklineGroup> mpSparklineGroup; public: - UndoInsertSparkline(ScDocShell& rDocShell, - std::vector<SparklineData> const& rSparklineDataVector, + UndoInsertSparkline(ScDocShell& rDocShell, std::vector<SparklineData> pSparklineDataVector, std::shared_ptr<sc::SparklineGroup> pSparklineGroup); virtual ~UndoInsertSparkline() override; diff --git a/sc/source/ui/inc/undo/UndoUngroupSparklines.hxx b/sc/source/ui/inc/undo/UndoUngroupSparklines.hxx index ce49d701e72b..7c836ac2d1ce 100644 --- a/sc/source/ui/inc/undo/UndoUngroupSparklines.hxx +++ b/sc/source/ui/inc/undo/UndoUngroupSparklines.hxx @@ -12,17 +12,18 @@ #include <undobase.hxx> #include <memory> +#include <utility> namespace sc { /** Previous sparkline group data, which is restored at undo ungroupping */ struct SparklineUndoData { - SparklineUndoData(ScAddress const& rAddress, ScRangeList const& rDataRangeList, - std::shared_ptr<sc::SparklineGroup> const& rpGroup) + SparklineUndoData(ScAddress const& rAddress, ScRangeList aDataRangeList, + std::shared_ptr<sc::SparklineGroup> pGroup) : m_aAddress(rAddress) - , m_aDataRangeList(rDataRangeList) - , m_pSparklineGroup(rpGroup) + , m_aDataRangeList(std::move(aDataRangeList)) + , m_pSparklineGroup(std::move(pGroup)) { } diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 460702a5fbaa..25cee7e5c5a5 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -103,7 +103,7 @@ protected: class SC_DLLPUBLIC ScMultiBlockUndo: public ScSimpleUndo { public: - ScMultiBlockUndo(ScDocShell* pDocSh, const ScRangeList& rRanges); + ScMultiBlockUndo(ScDocShell* pDocSh, ScRangeList aRanges); virtual ~ScMultiBlockUndo() override; protected: diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index a0de06cb698d..fef867d5bbdf 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -137,7 +137,7 @@ public: ScUndoCut(ScDocShell* pNewDocShell, const ScRange& aRange, // adjusted for merged cells const ScAddress& aOldEnd, // end position without adjustment - const ScMarkData& rMark, // selected sheets + ScMarkData aMark, // selected sheets ScDocumentUniquePtr pNewUndoDoc); virtual ~ScUndoCut() override; @@ -181,7 +181,7 @@ class SC_DLLPUBLIC ScUndoPaste: public ScMultiBlockUndo { public: ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges, - const ScMarkData& rMark, + ScMarkData aMark, ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc, InsertDeleteFlags nNewFlags, std::unique_ptr<ScRefUndoData> pRefData, @@ -249,7 +249,7 @@ class ScUndoDeleteContents: public ScSimpleUndo { public: ScUndoDeleteContents( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, const ScRange& rRange, ScDocumentUniquePtr&& pNewUndoDoc, bool bNewMulti, InsertDeleteFlags nNewFlags, bool bObjects ); @@ -284,7 +284,7 @@ class ScUndoFillTable: public ScSimpleUndo { public: ScUndoFillTable( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocumentUniquePtr pNewUndoDoc, bool bNewMulti, SCTAB nSrc, @@ -320,7 +320,7 @@ class ScUndoSelectionAttr: public ScSimpleUndo { public: ScUndoSelectionAttr( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocumentUniquePtr pNewUndoDoc, bool bNewMulti, @@ -357,7 +357,7 @@ class ScUndoWidthOrHeight: public ScSimpleUndo { public: ScUndoWidthOrHeight( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab, ScDocumentUniquePtr pNewUndoDoc, @@ -394,7 +394,7 @@ class ScUndoAutoFill: public ScBlockUndo public: ScUndoAutoFill( ScDocShell* pNewDocShell, const ScRange& rRange, const ScRange& rSourceArea, - ScDocumentUniquePtr pNewUndoDoc, const ScMarkData& rMark, + ScDocumentUniquePtr pNewUndoDoc, ScMarkData aMark, FillDir eNewFillDir, FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd, double fNewStartValue, double fNewStepValue, double fNewMaxValue ); @@ -427,7 +427,7 @@ private: class ScUndoMerge: public ScSimpleUndo { public: - ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, + ScUndoMerge( ScDocShell* pNewDocShell, ScCellMergeOption aOption, bool bMergeContents, ScDocumentUniquePtr pUndoDoc, std::unique_ptr<SdrUndoAction> pDrawUndo); virtual ~ScUndoMerge() override; @@ -453,7 +453,7 @@ class ScUndoAutoFormat: public ScBlockUndo public: ScUndoAutoFormat( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocumentUniquePtr pNewUndoDoc, - const ScMarkData& rMark, + ScMarkData aMark, bool bNewSize, sal_uInt16 nNewFormatNo ); virtual ~ScUndoAutoFormat() override; @@ -476,9 +476,9 @@ class ScUndoReplace: public ScSimpleUndo { public: ScUndoReplace( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, - const OUString& rNewUndoStr, ScDocumentUniquePtr pNewUndoDoc, + OUString aNewUndoStr, ScDocumentUniquePtr pNewUndoDoc, const SvxSearchItem* pItem ); virtual ~ScUndoReplace() override; @@ -537,10 +537,10 @@ class ScUndoConversion : public ScSimpleUndo { public: - ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark, + ScUndoConversion( ScDocShell* pNewDocShell, ScMarkData aMark, SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocumentUniquePtr pNewUndoDoc, SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocumentUniquePtr pNewRedoDoc, - const ScConversionParam& rConvParam ); + ScConversionParam aConvParam ); virtual ~ScUndoConversion() override; virtual void Undo() override; @@ -568,7 +568,7 @@ class ScUndoRefConversion: public ScSimpleUndo { public: ScUndoRefConversion( ScDocShell* pNewDocShell, - const ScRange& aMarkRange, const ScMarkData& rMark, + const ScRange& aMarkRange, ScMarkData aMark, ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc, bool bNewMulti); virtual ~ScUndoRefConversion() override; @@ -659,9 +659,9 @@ class ScUndoUseScenario: public ScSimpleUndo { public: ScUndoUseScenario( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, const ScArea& rDestArea, ScDocumentUniquePtr pNewUndoDoc, - const OUString& rNewName ); + OUString aNewName ); virtual ~ScUndoUseScenario() override; virtual void Undo() override; @@ -683,9 +683,9 @@ class ScUndoSelectionStyle: public ScSimpleUndo { public: ScUndoSelectionStyle( ScDocShell* pNewDocShell, - const ScMarkData& rMark, + ScMarkData aMark, const ScRange& rRange, - const OUString& rName, + OUString aName, ScDocumentUniquePtr pNewUndoDoc ); virtual ~ScUndoSelectionStyle() override; @@ -730,7 +730,7 @@ public: ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea, ScDocumentUniquePtr pNewUndoDoc, - const OUString& rForm ); + OUString aForm ); virtual ~ScUndoEnterMatrix() override; virtual void Undo() override; @@ -754,9 +754,9 @@ class ScUndoInsertAreaLink : public ScSimpleUndo { public: ScUndoInsertAreaLink( ScDocShell* pShell, - const OUString& rDocName, - const OUString& rFltName, const OUString& rOptions, - const OUString& rAreaName, const ScRange& rDestRange, + OUString aDocName, + OUString aFltName, OUString aOptions, + OUString aAreaName, const ScRange& rDestRange, sal_uLong nRefreshDelay ); virtual ~ScUndoInsertAreaLink() override; @@ -780,9 +780,9 @@ class ScUndoRemoveAreaLink : public ScSimpleUndo { public: ScUndoRemoveAreaLink( ScDocShell* pShell, - const OUString& rDocName, - const OUString& rFltName, const OUString& rOptions, - const OUString& rAreaName, const ScRange& rDestRange, + OUString aDocName, + OUString aFltName, OUString aOptions, + OUString aAreaName, const ScRange& rDestRange, sal_uLong nRefreshDelay ); virtual ~ScUndoRemoveAreaLink() override; @@ -806,13 +806,13 @@ class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUnd { public: ScUndoUpdateAreaLink(ScDocShell* pShell, - const OUString& rOldD, - const OUString& rOldF, const OUString& rOldO, - const OUString& rOldA, const ScRange& rOldR, + OUString aOldD, + OUString aOldF, OUString aOldO, + OUString aOldA, const ScRange& rOldR, sal_uLong nOldRD, - const OUString& rNewD, - const OUString& rNewF, const OUString& rNewO, - const OUString& rNewA, const ScRange& rNewR, + OUString aNewD, + OUString aNewF, OUString aNewO, + OUString aNewA, const ScRange& rNewR, sal_uLong nNewRD, ScDocumentUniquePtr pUndo, ScDocumentUniquePtr pRedo, bool bDoInsert); diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 206ed7d31713..bfc82abe97f6 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -85,7 +85,7 @@ public: ScUndoEnterData( ScDocShell* pNewDocShell, const ScAddress& rPos, - ValuesType& rOldValues, const OUString& rNewStr, std::unique_ptr<EditTextObject> pObj ); + ValuesType& rOldValues, OUString aNewStr, std::unique_ptr<EditTextObject> pObj ); virtual void Undo() override; virtual void Redo() override; @@ -113,7 +113,7 @@ class ScUndoEnterValue: public ScSimpleUndo public: ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, - const ScCellValue& rUndoCell, double nVal ); + ScCellValue aUndoCell, double nVal ); virtual ~ScUndoEnterValue() override; @@ -138,7 +138,7 @@ private: class ScUndoSetCell : public ScSimpleUndo { public: - ScUndoSetCell( ScDocShell* pDocSh, const ScAddress& rPos, const ScCellValue& rOldVal, const ScCellValue& rNewVal ); + ScUndoSetCell( ScDocShell* pDocSh, const ScAddress& rPos, ScCellValue aOldVal, ScCellValue aNewVal ); virtual ~ScUndoSetCell() override; @@ -216,7 +216,7 @@ class ScUndoThesaurus: public ScSimpleUndo public: ScUndoThesaurus( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, - const ScCellValue& rOldText, const ScCellValue& rNewText ); + ScCellValue aOldText, ScCellValue aNewText ); virtual ~ScUndoThesaurus() override; virtual void Undo() override; @@ -256,8 +256,8 @@ public: ScUndoReplaceNote( ScDocShell& rDocShell, const ScAddress& rPos, - const ScNoteData& rOldData, - const ScNoteData& rNewData, + ScNoteData aOldData, + ScNoteData aNewData, std::unique_ptr<SdrUndoAction> pDrawUndo ); virtual ~ScUndoReplaceNote() override; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 486fe07d11ca..5060bf0c1059 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -244,7 +244,7 @@ private: public: ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const OUString& rName, bool bSet ); + OUString aName, bool bSet ); virtual ~ScUndoAutoFilter() override; virtual void Undo() override; @@ -388,10 +388,10 @@ class ScUndoChartData: public ScSimpleUndo { public: ScUndoChartData( ScDocShell* pNewDocShell, - const OUString& rName, const ScRange& rNew, + OUString aName, const ScRange& rNew, bool bColHdr, bool bRowHdr, bool bAdd ); ScUndoChartData( ScDocShell* pNewDocShell, - const OUString& rName, const ScRangeListRef& rNew, + OUString aName, ScRangeListRef xNew, bool bColHdr, bool bRowHdr, bool bAdd ); virtual ~ScUndoChartData() override; diff --git a/sc/source/ui/inc/undosort.hxx b/sc/source/ui/inc/undosort.hxx index 64b4f0da7859..40ba12cac95a 100644 --- a/sc/source/ui/inc/undosort.hxx +++ b/sc/source/ui/inc/undosort.hxx @@ -19,7 +19,7 @@ class UndoSort : public ScSimpleUndo ReorderParam maParam; public: - UndoSort( ScDocShell* pDocSh, const ReorderParam& rParam ); + UndoSort( ScDocShell* pDocSh, ReorderParam aParam ); virtual OUString GetComment() const override; virtual void Undo() override; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 6c169c43e32b..39b55c0bda81 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -74,7 +74,7 @@ public: class ScUndoApplyPageStyle: public ScSimpleUndo { public: - ScUndoApplyPageStyle( ScDocShell* pDocSh, const OUString& rNewStyle ); + ScUndoApplyPageStyle( ScDocShell* pDocSh, OUString aNewStyle ); virtual ~ScUndoApplyPageStyle() override; void AddSheetAction( SCTAB nTab, const OUString& rOld ); @@ -91,7 +91,7 @@ private: { SCTAB mnTab; OUString maOldStyle; - explicit ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ); + explicit ApplyStyleEntry( SCTAB nTab, OUString aOldStyle ); }; typedef ::std::vector< ApplyStyleEntry > ApplyStyleVec; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 2d94d69657c0..ce9a9d190fdb 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -41,7 +41,7 @@ public: ScDocShell* pNewDocShell, SCTAB nTabNum, bool bApp, - const OUString& rNewName); + OUString aNewName); virtual ~ScUndoInsertTab() override; virtual void Undo() override; @@ -225,7 +225,7 @@ public: ScUndoMakeScenario( ScDocShell* pNewDocShell, SCTAB nSrc, SCTAB nDest, - const OUString& rN, const OUString& rC, + OUString aN, OUString aC, const Color& rCol, ScScenarioFlags nF, const ScMarkData& rMark ); virtual ~ScUndoMakeScenario() override; @@ -277,7 +277,7 @@ class ScUndoRemoveLink : public ScSimpleUndo public: ScUndoRemoveLink( // Call before delete! ScDocShell* pShell, - const OUString& rDoc ); + OUString aDoc ); virtual ~ScUndoRemoveLink() override; virtual void Undo() override; @@ -398,8 +398,8 @@ class ScUndoScenarioFlags: public ScSimpleUndo public: ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT, - const OUString& rON, const OUString& rNN, - const OUString& rOC, const OUString& rNC, + OUString aON, OUString aNN, + OUString aOC, OUString aNC, const Color& rOCol, const Color& rNCol, ScScenarioFlags nOF, ScScenarioFlags nNF); @@ -428,8 +428,8 @@ class ScUndoRenameObject: public ScSimpleUndo { public: ScUndoRenameObject( - ScDocShell* pNewDocShell, const OUString& rPN, - const OUString& rON, const OUString& rNN ); + ScDocShell* pNewDocShell, OUString aPN, + OUString aON, OUString aNN ); virtual ~ScUndoRenameObject() override; |