summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/mailmergechildwindow.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-02 17:08:54 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-02 17:34:57 +0100
commit0df2b61e1a81477f0f828e3234030a1f69880214 (patch)
treeadb0edf3605ddd3b73121fbc647ff1b8f9bf4c53 /sw/source/uibase/inc/mailmergechildwindow.hxx
parenta261bac7d97ae41460c29d002d477bc8413d4d7a (diff)
convert DLG_MAILMERGECHILD floating window to .ui
Change-Id: I0ab16d3f5d86004b63f9a1baa454b18b7948f86a
Diffstat (limited to 'sw/source/uibase/inc/mailmergechildwindow.hxx')
-rw-r--r--sw/source/uibase/inc/mailmergechildwindow.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx
index 30dc88e849cd..8ee4aa9fea1c 100644
--- a/sw/source/uibase/inc/mailmergechildwindow.hxx
+++ b/sw/source/uibase/inc/mailmergechildwindow.hxx
@@ -25,15 +25,13 @@
class SwMailMergeChildWin : public SfxFloatingWindow
{
- ToolBox m_aBackTB;
-
+ ToolBox* m_pBackTB;
DECL_LINK( BackHdl, void* );
public:
SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent);
- virtual ~SwMailMergeChildWin();
- virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
+ virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
};
class SwMailMergeChildWindow : public SfxChildWindow