summaryrefslogtreecommitdiff
path: root/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx')
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx25
1 files changed, 13 insertions, 12 deletions
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index eb9e7dc45eb7..fc0395687e2a 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -50,7 +50,7 @@ private:
friend class CellBorderStyleControl;
public:
- static CellAppearancePropertyPanel* Create(
+ static VclPtr<vcl::Window> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
@@ -69,14 +69,22 @@ public:
SfxBindings* GetBindings() { return mpBindings;}
+ // constructor/destuctor
+ CellAppearancePropertyPanel(
+ vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ SfxBindings* pBindings);
+ virtual ~CellAppearancePropertyPanel();
+ virtual void dispose() SAL_OVERRIDE;
+
private:
//ui controls
- ToolBox* mpTBCellBorder;
- ToolBox* mpTBLineStyle;
- ToolBox* mpTBLineColor;
+ VclPtr<ToolBox> mpTBCellBorder;
+ VclPtr<ToolBox> mpTBLineStyle;
+ VclPtr<ToolBox> mpTBLineColor;
::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
- CheckBox* mpCBXShowGrid;
+ VclPtr<CheckBox> mpCBXShowGrid;
::sfx2::sidebar::ControllerItem maLineStyleControl;
::sfx2::sidebar::ControllerItem maBorderOuterControl;
@@ -145,13 +153,6 @@ private:
svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent);
void EndCellBorderStylePopupMode();
- // constructor/destuctor
- CellAppearancePropertyPanel(
- vcl::Window* pParent,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings);
- virtual ~CellAppearancePropertyPanel();
-
void Initialize();
void SetStyleIcon();
void UpdateControlState();