Kaydet (Commit) d25465ae authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

svtools: Simplify HeaderBar with std::unique_ptr

Change-Id: I5376616ed1b1a1087dd8bac6830d31212252e4bd
Reviewed-on: https://gerrit.libreoffice.org/47459Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 0c1ca083
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <tools/link.hxx> #include <tools/link.hxx>
#include <vcl/window.hxx> #include <vcl/window.hxx>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
#include <memory>
/************************************************************************* /*************************************************************************
...@@ -173,8 +174,6 @@ HeaderBarItemBits::CLICKABLE, but HeaderBarItemBits::FIXEDPOS. ...@@ -173,8 +174,6 @@ HeaderBarItemBits::CLICKABLE, but HeaderBarItemBits::FIXEDPOS.
class Accelerator; class Accelerator;
class ImplHeadItem; class ImplHeadItem;
typedef ::std::vector< ImplHeadItem* > ImplHeadItemList;
#define WB_BOTTOMBORDER ((WinBits)0x0400) #define WB_BOTTOMBORDER ((WinBits)0x0400)
#define WB_BUTTONSTYLE ((WinBits)0x0800) #define WB_BUTTONSTYLE ((WinBits)0x0800)
#define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER) #define WB_STDHEADERBAR (WB_BUTTONSTYLE | WB_BOTTOMBORDER)
...@@ -216,7 +215,7 @@ class VCLXHeaderBar; ...@@ -216,7 +215,7 @@ class VCLXHeaderBar;
class SVT_DLLPUBLIC HeaderBar : public vcl::Window class SVT_DLLPUBLIC HeaderBar : public vcl::Window
{ {
private: private:
ImplHeadItemList* mpItemList; std::vector<std::unique_ptr<ImplHeadItem>> mvItemList;
long mnBorderOff1; long mnBorderOff1;
long mnBorderOff2; long mnBorderOff2;
long mnOffset; long mnOffset;
...@@ -266,7 +265,6 @@ private: ...@@ -266,7 +265,6 @@ private:
public: public:
HeaderBar( vcl::Window* pParent, WinBits nWinBits ); HeaderBar( vcl::Window* pParent, WinBits nWinBits );
virtual ~HeaderBar() override; virtual ~HeaderBar() override;
virtual void dispose() override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment