diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 11:15:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 08:17:42 +0200 |
| commit | d8499c45eb9079cba4ac9b36c3e89f30e74fdf6a (patch) | |
| tree | 20d934d4076a9c4d8fc39d2d9479d0c2f90e0a58 /sw/inc | |
| parent | 4f52b3b052b5684c28bf48196980e5a6b73f1c07 (diff) | |
convert ShellModes to scoped enum
and drop read-only SHELL_MODE_DRAW_CTRL enumerator
Change-Id: I2ccaeb492912c876b89ff9b5dccaa99e28a268b7
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/view.hxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index ef1d46dd81a3..71ee3e984690 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -95,24 +95,23 @@ const long nScrollY = 30; #define MAX_MARKS 5 -enum ShellModes +enum class ShellMode { - SHELL_MODE_TEXT, - SHELL_MODE_FRAME, - SHELL_MODE_GRAPHIC, - SHELL_MODE_OBJECT, - SHELL_MODE_DRAW, - SHELL_MODE_DRAW_CTRL, - SHELL_MODE_DRAW_FORM, - SHELL_MODE_DRAWTEXT, - SHELL_MODE_BEZIER, - SHELL_MODE_LIST_TEXT, - SHELL_MODE_TABLE_TEXT, - SHELL_MODE_TABLE_LIST_TEXT, - SHELL_MODE_MEDIA, - SHELL_MODE_EXTRUDED_CUSTOMSHAPE, - SHELL_MODE_FONTWORK, - SHELL_MODE_POSTIT + Text, + Frame, + Graphic, + Object, + Draw, + DrawForm, + DrawText, + Bezier, + ListText, + TableText, + TableListText, + Media, + ExtrudedCustomShape, + FontWork, + PostIt }; // apply a template @@ -379,9 +378,9 @@ public: virtual void ShowCursor( bool bOn = true ) override; virtual ErrCode DoVerb( long nVerb ) override; - virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL) override; - ShellModes GetShellMode(); + ShellMode GetShellMode(); css::view::XSelectionSupplier* GetUNOObject(); |