diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-20 13:54:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-31 12:09:00 +0200 |
commit | 4732e65646016087d772adb3a0b55c166b35356d (patch) | |
tree | 76285ed978ddce19355fe993391172aeb575d69b /sw/source/ui | |
parent | b6e32d53ce9c98bfba517c40f53d40e97a091b0e (diff) |
loplugin:unusedfields in sw
Change-Id: Iad2bddb2359af3e7da40175d17d2d3ed7eda5be6
Reviewed-on: https://gerrit.libreoffice.org/40229
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 22 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 3 |
2 files changed, 0 insertions, 25 deletions
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index e7d2cbefe1d7..18158982aebf 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -62,7 +62,6 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, , m_nParaExt(0) , m_nParaNumPara(0) , m_nParaDrpCps(0) - , m_nParaBckGrnd(0) , m_nParaBorder(0) , m_nAreaId(0) , m_nTransparenceId(0) @@ -142,18 +141,12 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, if(!bHtmlMode || (nHtmlMode & (HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES))) { - // remove? - //OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); - //OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!"); - //m_nParaBckGrnd = AddTabPage("labelTP_BACKGROUND", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); - // // add Area and Transparence TabPages m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA )); m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) ); } else { - // RemoveTabPage("labelTP_BACKGROUND"); RemoveTabPage("area"); RemoveTabPage("transparence"); } @@ -219,21 +212,6 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { static_cast<SwDropCapsPage&>(rPage).SetFormat(false); } - else if( m_nParaBckGrnd == nId ) - { - if(!( nHtmlMode & HTMLMODE_ON ) || - nHtmlMode & HTMLMODE_SOME_STYLES) - { - // pagebreak only when the cursor is in the body-area and not in a table - const FrameTypeFlags eType = rSh.GetFrameType(nullptr,true); - if(!(FrameTypeFlags::BODY & eType) || - rSh.GetSelectionType() & SelectionType::Table) - { - aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true)); - rPage.PageCreated(aSet); - } - } - } else if( m_nParaNumPara == nId) { SwTextFormatColl* pTmpColl = rSh.GetCurTextFormatColl(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index f4b0cf499bce..45d8042b5a53 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -98,7 +98,6 @@ struct SwSendMailDialog_Impl sal_uInt32 nCurrentDescriptor; ::rtl::Reference< MailDispatcher > xMailDispatcher; ::rtl::Reference< IMailDispatcherListener> xMailListener; - uno::Reference< mail::XMailService > xConnectedMailService; uno::Reference< mail::XMailService > xConnectedInMailService; Idle aRemoveIdle; @@ -307,8 +306,6 @@ void SwSendMailDialog::dispose() { if(m_pImpl->xMailDispatcher->isStarted()) m_pImpl->xMailDispatcher->stop(); - if(m_pImpl->xConnectedMailService.is() && m_pImpl->xConnectedMailService->isConnected()) - m_pImpl->xConnectedMailService->disconnect(); if(m_pImpl->xConnectedInMailService.is() && m_pImpl->xConnectedInMailService->isConnected()) m_pImpl->xConnectedInMailService->disconnect(); |