summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 11:23:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 14:22:51 +0200
commitf05d0d05829dd51cb9d8071ac97cc219779ee40a (patch)
tree3502cef16b7dacb0cdaa66ec6a34842239c1c505 /sw/source/uibase
parent266bcae306a1dd6e0d9df80ba30ade7311385c28 (diff)
loplugin:unusedfields in sw part1
Change-Id: Iabbf7f09c0d92b488d7e03f4436f077c5e6e87aa Reviewed-on: https://gerrit.libreoffice.org/39039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/apphdl.cxx6
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx1
-rw-r--r--sw/source/uibase/inc/navipi.hxx1
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx1
-rw-r--r--sw/source/uibase/inc/tmpdlg.hxx8
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx4
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx1
-rw-r--r--sw/source/uibase/uiview/view0.cxx5
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx5
-rw-r--r--sw/source/uibase/utlui/navipi.cxx3
10 files changed, 7 insertions, 28 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 4d45596c01cd..c7611e0e0f9f 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -245,7 +245,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
// start field dialog
void NewXForms( SfxRequest& rReq ); // implementation: below
-std::shared_ptr<SwMailMergeConfigItem> SwView::EnsureMailMergeConfigItem(const SfxItemSet* pArgs, sal_uInt16 nWizardRestartPage)
+std::shared_ptr<SwMailMergeConfigItem> SwView::EnsureMailMergeConfigItem(const SfxItemSet* pArgs)
{
// create if it does not exist yet
std::shared_ptr<SwMailMergeConfigItem> xMMConfig = GetMailMergeConfigItem();
@@ -302,7 +302,7 @@ std::shared_ptr<SwMailMergeConfigItem> SwView::EnsureMailMergeConfigItem(const S
}
}
- SetMailMergeConfigItem(xMMConfig, nWizardRestartPage);
+ SetMailMergeConfigItem(xMMConfig);
}
return xMMConfig;
}
@@ -448,7 +448,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
acquire();
// create if it does not exist yet
- std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->EnsureMailMergeConfigItem(pArgs, m_pWizard ? m_pWizard->GetRestartPage() : 0);
+ std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->EnsureMailMergeConfigItem(pArgs);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
m_pWizard = pFact->CreateMailMergeWizard(*m_pView, xMMConfig);
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 1674285e5364..ebf36a5aa885 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -41,7 +41,6 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper<
css::uno::Reference< css::io::XInputStream > xInputStream;
css::uno::Reference< css::lang::XComponent > xModel;
- bool bExport;
public:
SwXFilterOptions();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 1825f8eac10f..6e37fe6996bb 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -94,7 +94,6 @@ class SwNavigationPI : public PanelLayout,
Size m_aExpandedSize;
bool m_bIsZoomedIn : 1;
- bool m_bPageCtrlsVisible : 1;
bool m_bGlobalMode : 1;
bool IsZoomedIn() const {return m_bIsZoomedIn;}
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index cefd96af2346..632520ac0b0b 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -69,7 +69,6 @@ class SwMultiTOXTabDialog : public SfxTabDialog
SwWrtShell& m_rWrtShell;
sal_uInt16 m_nSelectId;
- sal_uInt16 m_nStylesId;
sal_uInt16 m_nColumnId;
sal_uInt16 m_nBackGroundId;
sal_uInt16 m_nEntriesId;
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index c4a14d61ca0d..803e1820a007 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -35,15 +35,11 @@ class SwTemplateDlg: public SfxStyleDialog
sal_uInt16 m_nIndentsId;
sal_uInt16 m_nAlignId;
- sal_uInt16 m_nTextFlowId;
- sal_uInt16 m_nAsianTypo;
sal_uInt16 m_nFontId;
sal_uInt16 m_nFontEffectId;
sal_uInt16 m_nPositionId;
sal_uInt16 m_nAsianLayoutId;
- sal_uInt16 m_nTabId;
sal_uInt16 m_nOutlineId;
- sal_uInt16 m_nDropCapsId;
sal_uInt16 m_nBackgroundId;
sal_uInt16 m_nAreaId;
sal_uInt16 m_nTransparenceId;
@@ -57,12 +53,8 @@ class SwTemplateDlg: public SfxStyleDialog
sal_uInt16 m_nHeaderId;
sal_uInt16 m_nFooterId;
sal_uInt16 m_nPageId;
- sal_uInt16 m_nFootNoteId;
- sal_uInt16 m_nTextGridId;
- sal_uInt16 m_nSingleId;
sal_uInt16 m_nBulletId;
sal_uInt16 m_nNumId;
- sal_uInt16 m_nBmpId;
sal_uInt16 m_nNumOptId;
sal_uInt16 m_nNumPosId;
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 80209b9e8afa..7ebb1b3428b7 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -103,7 +103,6 @@ class SwView_Impl
std::shared_ptr<SwMailMergeConfigItem>
xConfigItem;
- sal_uInt16 nMailMergeRestartPage;
sfx2::DocumentInserter* m_pDocInserter;
SfxRequest* m_pRequest;
@@ -135,10 +134,9 @@ public:
void AddTransferable(SwTransferable& rTransferable);
- void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rItem, sal_uInt16 nRestart)
+ void SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rItem)
{
xConfigItem = rItem;
- nMailMergeRestartPage = nRestart;
}
std::shared_ptr<SwMailMergeConfigItem> GetMailMergeConfigItem() {return xConfigItem;}
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 6569ec483a8e..2ab3dfd58c41 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -55,7 +55,6 @@ SwView_Impl::SwView_Impl(SwView* pShell)
: mxXTextView()
, pView(pShell)
, eShellMode(ShellMode::Text)
- , nMailMergeRestartPage(0)
, m_pDocInserter(nullptr)
, m_pRequest(nullptr)
, m_nParam(0)
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index f6d6bdee9494..a297001ffc1a 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -131,10 +131,9 @@ void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOpt
}
-void SwView::SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rConfigItem,
- sal_uInt16 nRestart)
+void SwView::SetMailMergeConfigItem(std::shared_ptr<SwMailMergeConfigItem>& rConfigItem)
{
- m_pViewImpl->SetMailMergeConfigItem(rConfigItem, nRestart);
+ m_pViewImpl->SetMailMergeConfigItem(rConfigItem);
UIFeatureChanged();
}
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 8c79f32f0957..71f1b724a928 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -41,8 +41,7 @@ using namespace ::com::sun::star::lang;
#define FILTER_OPTIONS_NAME "FilterOptions"
-SwXFilterOptions::SwXFilterOptions() :
- bExport( false )
+SwXFilterOptions::SwXFilterOptions()
{
}
@@ -116,13 +115,11 @@ sal_Int16 SwXFilterOptions::execute()
void SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent >& xDoc )
{
- bExport = false;
xModel = xDoc;
}
void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& xDoc )
{
- bExport = true;
xModel = xDoc;
}
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 29fcbb1d791a..a46b76f4b374 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -598,7 +598,6 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
, m_nAutoMarkIdx(1)
, m_nRegionMode(RegionMode::NONE)
, m_bIsZoomedIn(false)
- , m_bPageCtrlsVisible(false)
, m_bGlobalMode(false)
{
get(m_aContentToolBox, "content");
@@ -633,8 +632,6 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
m_xEdit->SetUpHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
m_xEdit->SetDownHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
- m_bPageCtrlsVisible = true;
-
// Double separators are not allowed, so you have to
// determine the suitable size differently.
tools::Rectangle aFirstRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("anchor"));