diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-20 17:15:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-22 18:47:09 +0000 |
| commit | ad1386300562779606d958ea8289916cb9cbb8f8 (patch) | |
| tree | d2825ec74621daad2dea81a155f4bc7d905bceaf /sc/source/ui/inc | |
| parent | 4d1d60719802ae34a9fc381c8f202ca80b7388ad (diff) | |
convert SC_PASTE constants to scoped enum
Change-Id: I2c1b2cd5a89b3124a2e452800bf397e100cc885b
Reviewed-on: https://gerrit.libreoffice.org/18734
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/inscodlg.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/viewfunc.hxx | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 4c68cb053243..a36994dfdd8b 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -37,7 +37,7 @@ public: virtual void dispose() SAL_OVERRIDE; InsertDeleteFlags GetInsContentsCmdBits() const; - sal_uInt16 GetFormulaCmdBits() const; + ScPasteFunc GetFormulaCmdBits() const; bool IsSkipEmptyCells() const; bool IsTranspose() const; bool IsLink() const; @@ -84,7 +84,7 @@ private: bool bUsedShortCut; InsertDeleteFlags nShortCutInsContentsCmdBits; - sal_uInt16 nShortCutFormulaCmdBits; + ScPasteFunc nShortCutFormulaCmdBits; bool bShortCutSkipEmptyCells; bool bShortCutTranspose; bool bShortCutIsLink; @@ -93,7 +93,7 @@ private: static bool bPreviousAllCheck; static InsertDeleteFlags nPreviousChecks; static sal_uInt16 nPreviousChecks2; - static sal_uInt16 nPreviousFormulaChecks; + static ScPasteFunc nPreviousFormulaChecks; static sal_uInt16 nPreviousMoveMode; // enum InsCellCmd void DisableChecks( bool bInsAllChecked = true ); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 53111f41f997..4013805f0b1c 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -163,14 +163,14 @@ private: struct ScUndoPasteOptions { - sal_uInt16 nFunction; + ScPasteFunc nFunction; bool bSkipEmpty; bool bTranspose; bool bAsLink; InsCellCmd eMoveMode; ScUndoPasteOptions() : - nFunction( PASTE_NOFUNC ), + nFunction( ScPasteFunc::NONE ), bSkipEmpty( false ), bTranspose( false ), bAsLink( false ), @@ -293,7 +293,7 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, bool bNewMulti, SCTAB nSrc, - InsertDeleteFlags nFlg, sal_uInt16 nFunc, bool bSkip, bool bLink ); + InsertDeleteFlags nFlg, ScPasteFunc nFunc, bool bSkip, bool bLink ); virtual ~ScUndoFillTable(); virtual void Undo() SAL_OVERRIDE; @@ -310,7 +310,7 @@ private: sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; InsertDeleteFlags nFlags; - sal_uInt16 nFunction; + ScPasteFunc nFunction; SCTAB nSrcTab; bool bMulti; // Multi selection bool bSkipEmpty; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 7b28d0ae5729..cbd8a391f4a1 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -105,13 +105,13 @@ public: bool bApi = false, bool bIncludeObjects = false, bool bStopEdit = true, bool bUseRangeForVBA = true ); ScTransferObj* CopyToTransferable(); SC_DLLPUBLIC bool PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, - sal_uInt16 nFunction = PASTE_NOFUNC, bool bSkipEmpty = false, + ScPasteFunc nFunction = ScPasteFunc::NONE, bool bSkipEmpty = false, bool bTranspose = false, bool bAsLink = false, InsCellCmd eMoveMode = INS_NONE, InsertDeleteFlags nUndoExtraFlags = IDF_NONE, bool bAllowDialogs = false ); - void FillTab( InsertDeleteFlags nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ); + void FillTab( InsertDeleteFlags nFlags, ScPasteFunc nFunction, bool bSkipEmpty, bool bAsLink ); SC_DLLPUBLIC void PasteFromSystem(); SC_DLLPUBLIC bool PasteFromSystem( SotClipboardFormatId nFormatId, bool bApi = false ); @@ -119,8 +119,8 @@ public: ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); void PasteDraw(); - void PasteDraw( const Point& rLogicPos, SdrModel* pModel, bool bGroup, - const OUString& rSrcShellID, const OUString& rDestShellID ); + void PasteDraw( const Point& rLogicPos, SdrModel* pModel, bool bGroup, + const OUString& rSrcShellID, const OUString& rDestShellID ); bool PasteOnDrawObjectLinked( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, @@ -341,11 +341,11 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - bool PasteMultiRangesFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction, + bool PasteMultiRangesFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, ScPasteFunc nFunction, bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs, InsCellCmd eMoveMode, InsertDeleteFlags nUndoFlags ); - bool PasteFromClipToMultiRanges( InsertDeleteFlags nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction, + bool PasteFromClipToMultiRanges( InsertDeleteFlags nFlags, ScDocument* pClipDoc, ScPasteFunc nFunction, bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs, InsCellCmd eMoveMode, InsertDeleteFlags nUndoFlags ); |