summaryrefslogtreecommitdiff
path: root/include/vcl/floatwin.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-13 09:26:49 +0200
committerNoel Grandin <noel@peralex.com>2015-05-13 09:27:16 +0200
commit5525ad365c9c19d86d32efdd4644bfcf43063bcf (patch)
tree9fe0b9ccd2b57f54de892b8d71a63c24d13d9c05 /include/vcl/floatwin.hxx
parent666f42854e04141541227d88130ff3338aff07b6 (diff)
convert FLOATWIN_TITLE constants to scoped enum
Change-Id: Iebd2eadfa375092a33d6de9d7f7964dba64f7d6b
Diffstat (limited to 'include/vcl/floatwin.hxx')
-rw-r--r--include/vcl/floatwin.hxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 2a35d6e6dc4f..16f52cb8fed4 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -71,11 +71,14 @@ namespace o3tl
template<> struct typed_flags<FloatWinPopupEndFlags> : is_typed_flags<FloatWinPopupEndFlags, 0x0f> {};
}
-#define FLOATWIN_TITLE_NORMAL ((sal_uInt16)0x0001)
-#define FLOATWIN_TITLE_TEAROFF ((sal_uInt16)0x0002)
-#define FLOATWIN_TITLE_POPUP ((sal_uInt16)0x0004)
-#define FLOATWIN_TITLE_NONE ((sal_uInt16)0x0008)
-
+enum class FloatWinTitleType
+{
+ Unknown = 0,
+ Normal = 1,
+ TearOff = 2,
+ Popup = 3,
+ NONE = 4,
+};
enum HitTest
{
@@ -96,8 +99,8 @@ private:
Rectangle maFloatRect;
ImplSVEvent * mnPostId;
FloatWinPopupFlags mnPopupModeFlags;
- sal_uInt16 mnTitle;
- sal_uInt16 mnOldTitle;
+ FloatWinTitleType mnTitle;
+ FloatWinTitleType mnOldTitle;
bool mbInPopupMode;
bool mbPopupMode;
bool mbPopupModeCanceled;
@@ -147,8 +150,8 @@ public:
virtual void PopupModeEnd();
- void SetTitleType( sal_uInt16 nTitle );
- sal_uInt16 GetTitleType() const { return mnTitle; }
+ void SetTitleType( FloatWinTitleType nTitle );
+ FloatWinTitleType GetTitleType() const { return mnTitle; }
void StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags nFlags = FloatWinPopupFlags::NONE );
void StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags = FloatWinPopupFlags::NONE );