diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-23 14:54:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 07:26:54 +0100 |
| commit | 84d9785a04a1d4929505ef1d7958e0420eec43b6 (patch) | |
| tree | 6c95e3f234e1efe21d762d2bf2ba5b9e26a3aea4 /include | |
| parent | 761546e088dcccf3aa66c3f5c4853f110b93770f (diff) | |
remove unused DrawFlags enum values
Change-Id: I3f313dfa085612d805ea54352793a3fb0356b986
Reviewed-on: https://gerrit.libreoffice.org/63970
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/button.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/fixed.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/imgctrl.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 7 |
4 files changed, 5 insertions, 10 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 5bad4b5e2e15..98ac3ea9f7e9 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -49,9 +49,9 @@ private: public: SAL_DLLPRIVATE DrawButtonFlags ImplGetButtonState() const; SAL_DLLPRIVATE DrawButtonFlags& ImplGetButtonState(); - SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( OUString& rText, WinBits nWinStyle, DrawFlags nDrawFlags ); + SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, - sal_uLong nImageSep, DrawFlags nDrawFlags, + sal_uLong nImageSep, DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle &rFocusRect ); SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 10a0263c5d40..7873c58de340 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -156,7 +156,7 @@ private: SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); protected: - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, const Point& rPos, const Size& rSize ); public: explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index f1aa5f3225d6..528f2046fd52 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -45,7 +45,7 @@ public: virtual void LoseFocus() override; protected: - void ImplDraw( OutputDevice& rDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize ) const; + void ImplDraw( OutputDevice& rDev, const Point& rPos, const Size& rSize ) const; }; #endif // INCLUDED_VCL_IMGCTRL_HXX diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 6557c45434d1..99a6d2b6b599 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -370,16 +370,11 @@ enum class DrawFlags { NONE = 0x0000, Mono = 0x0001, - NoBorder = 0x0002, NoControls = 0x0004, - NoDisable = 0x0008, - NoMnemonic = 0x0010, - NoSelection = 0x0020, - NoBackground = 0x0040, }; namespace o3tl { - template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x007f> {}; + template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x0005> {}; } // DialogControl-Flags |