diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 09:38:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-23 20:31:42 +0100 |
| commit | 9c0c5bc5ba01f1a07abe918730675dd3c7497bb7 (patch) | |
| tree | 04e541177d960f754579cb847b15399b9debb032 /include/formula | |
| parent | 49b1107b6ea81c32628a52202ffbbcd44b042e38 (diff) | |
convert FormulaDlgMode to scoped enum
and drop unused ARGS value
Change-Id: I9b9d0c9ea64a2174759dcf6406bdf6cd5be5862a
Reviewed-on: https://gerrit.libreoffice.org/63892
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/formdata.hxx | 8 | ||||
| -rw-r--r-- | include/formula/formula.hxx | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 1188ab884461..6a1889b3c1ba 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -29,6 +29,8 @@ namespace formula { +enum class FormulaDlgMode; + class FORMULA_DLLPUBLIC FormEditData { public: @@ -37,7 +39,7 @@ public: virtual void SaveValues(); - sal_uInt16 GetMode() const { return nMode; } + FormulaDlgMode GetMode() const { return nMode; } sal_Int32 GetFStart() const { return nFStart; } sal_uInt16 GetOffset() const { return nOffset; } const OUString& GetUndoStr() const { return aUndoStr; } @@ -45,7 +47,7 @@ public: const VclPtr<vcl::Window>& GetFocusWindow()const { return xFocusWin; } const Selection& GetSelection()const { return aSelection;} - void SetMode( sal_uInt16 nNew ) { nMode = nNew; } + void SetMode( FormulaDlgMode nNew ) { nMode = nNew; } void SetFStart( sal_Int32 nNew ) { nFStart = nNew; } void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; } void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } @@ -58,7 +60,7 @@ protected: FormEditData& operator=( const FormEditData& r ); private: - sal_uInt16 nMode; // enum ScFormulaDlgMode + FormulaDlgMode nMode; sal_Int32 nFStart; sal_uInt16 nOffset; OUString aUndoStr; diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 4c9d37e807b0..201a598891e4 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -49,7 +49,7 @@ namespace formula #define STRUCT_FOLDER 2 #define STRUCT_ERROR 3 -enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT }; +enum class FormulaDlgMode { Formula, Edit }; class FormulaDlg_Impl; |