summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-07-23 10:05:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-23 10:05:49 +0100
commit5ccd10fbbd66558a6662d74bc7ba76a4697f593a (patch)
tree53752a255c732d0a8cdc7f72073f71b03b6efda1 /sw/source/ui
parent2e0561c9962e1205b68ae0c9971c4df7b141f535 (diff)
use an expander instead of hand-crafted code
Change-Id: Id5606051656f21309c9e5c8d08a2eacd65b22dbf
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx25
2 files changed, 0 insertions, 29 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index fef10e9eda5c..8585c02e2507 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -147,7 +147,6 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
ProgressBar *m_pProgressBar;
FixedText *m_pErrorStatus;
- PushButton *m_pDetails;
SvSimpleTableContainer *m_pContainer;
HeaderBar *m_pStatusHB;
SvTabListBox *m_pStatusLB;
@@ -156,8 +155,6 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
PushButton *m_pStop;
PushButton *m_pClose;
- OUString m_sMore;
- OUString m_sLess;
OUString m_sContinue;
OUString m_sStop;
OUString m_sSend;
@@ -179,7 +176,6 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog
sal_Int32 m_nSendCount;
sal_Int32 m_nErrorCount;
- SAL_DLLPRIVATE DECL_LINK( DetailsHdl_Impl, void* );
SAL_DLLPRIVATE DECL_LINK( StopHdl_Impl, PushButton* );
SAL_DLLPRIVATE DECL_LINK( CloseHdl_Impl, void* );
SAL_DLLPRIVATE DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* );
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 29aecd3e4ea9..75b401e759b7 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -232,12 +232,9 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
m_pPaused(get<FixedText>("paused")),
m_pProgressBar(get<ProgressBar>("progress")),
m_pErrorStatus(get<FixedText>("errorstatus")),
- m_pDetails(get<PushButton>("details")),
m_pContainer(get<SvSimpleTableContainer>("container")),
m_pStop(get<PushButton>("stop")),
m_pClose(get<PushButton>("close")),
- m_sMore(m_pDetails->GetText()),
- m_sLess(SW_RES(ST_LESS)),
m_sContinue(SW_RES( ST_CONTINUE )),
m_sStop(m_pStop->GetText()),
m_sSend(SW_RES(ST_SEND)),
@@ -265,7 +262,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
OUString sTask(SW_RES(ST_TASK));
OUString sStatus(SW_RES(ST_STATUS));
- m_pDetails->SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
m_pStop->SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
m_pClose->SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
@@ -284,7 +280,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
m_pStatus->SetTabs(&nTabs[0], MAP_PIXEL);
m_pStatus->SetSpaceBetweenEntries(3);
- DetailsHdl_Impl( m_pDetails );
UpdateTransferStatus();
}
@@ -335,26 +330,6 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments )
UpdateTransferStatus();
}
-IMPL_LINK_NOARG(SwSendMailDialog, DetailsHdl_Impl)
-{
- long nMove = 0;
- if(m_pContainer->IsVisible())
- {
- m_pContainer->Hide();
- nMove = - m_nStatusHeight;
- m_pDetails->SetText(m_sMore);
- }
- else
- {
- m_pContainer->Show();
- nMove = m_nStatusHeight;
- m_pDetails->SetText(m_sLess);
- }
- Size aDlgSize = GetSizePixel(); aDlgSize.Height() += nMove; SetSizePixel(aDlgSize);
-
- return 0;
-}
-
IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton )
{
m_bCancel = true;