summaryrefslogtreecommitdiff
path: root/chart2/source/controller
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-17 09:32:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-22 11:16:54 +0200
commit51b49228ee7d3bb9788b7ff44e2c1737caa63818 (patch)
tree08a810a27a463537c86a56773adb1e32dc2f03f4 /chart2/source/controller
parente129d1ae092e3605656ca4c58be3b77495444e5f (diff)
loplugin:unusedfields in avmedia..comphelper
Change-Id: I74f125103b67c506d9bb67537e4c4cd3f8f871da Reviewed-on: https://gerrit.libreoffice.org/54641 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller')
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx5
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx3
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx3
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx1
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
8 files changed, 5 insertions, 16 deletions
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 490ca57ed761..646ba40b8699 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -27,11 +27,10 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt
ModalDialog(pWindow
,"dlg_DataLabels"
,"modules/schart/ui/dlg_DataLabel.ui"),
- m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) ),
- m_rInAttrs(rInAttrs)
+ m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) )
{
m_apDataLabelResources->SetNumberFormatter( pFormatter );
- m_apDataLabelResources->Reset(m_rInAttrs);
+ m_apDataLabelResources->Reset(rInAttrs);
}
DataLabelsDialog::~DataLabelsDialog() = default;
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index a866ada4a8d6..e70a22f5e717 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -44,9 +44,8 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ModalDialog( pParent
,"dlg_InsertErrorBars"
,"modules/schart/ui/dlg_InsertErrorBars.ui"),
- rInAttrs( rMyAttrs ),
m_apErrorBarResources( new ErrorBarResources(
- this, this, rInAttrs,
+ this, this, rMyAttrs,
/* bNoneAvailable = */ true, eType ))
{
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 9d6df50719c6..f4a511aa52fd 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -325,7 +325,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
)
: SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr)
- , eObjectType(pDialogParameter->getObjectType())
, nDlgType(nNoArrowNoShadowDlg)
, m_pParameter( pDialogParameter )
, m_pViewElementListProvider( pViewElementListProvider )
@@ -342,7 +341,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
SvtCJKOptions aCJKOptions;
- switch (eObjectType)
+ switch (pDialogParameter->getObjectType())
{
case OBJECTTYPE_TITLE:
AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 654cb794ddb2..6600108b8bf6 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -86,7 +86,6 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
m_bIndicatorUnique( true ),
m_bRangePosUnique( true ),
m_bRangeNegUnique( true ),
- m_bNoneAvailable( bNoneAvailable ),
m_eErrorBarType( eType ),
m_nConstDecimalDigits( 1 ),
m_nConstSpinSize( 1 ),
@@ -126,7 +125,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
pParent->get(m_pUIStringNeg, "STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS");
pParent->get(m_pUIStringRbRange, "STR_CONTROLTEXT_ERROR_BARS_FROM_DATA");
- if( m_bNoneAvailable )
+ if( bNoneAvailable )
m_pRbNone->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
else
m_pRbNone->Hide();
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 43a67490648f..c1660dc20fda 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -38,8 +38,6 @@ private:
// HelpButton m_aBtnHelp;
std::unique_ptr < DataLabelResources > m_apDataLabelResources;
- const SfxItemSet& m_rInAttrs;
-
public:
DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
virtual ~DataLabelsDialog() override;
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 584033a45584..796b0dc46888 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -48,8 +48,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private:
- const SfxItemSet & rInAttrs;
-
std::unique_ptr< ErrorBarResources > m_apErrorBarResources;
};
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index d8702f689191..afa83bc6f56c 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -106,7 +106,6 @@ class ViewElementListProvider;
class SchAttribTabDlg : public SfxTabDialog
{
private:
- ObjectType eObjectType;
sal_uInt16 nDlgType;
const ObjectPropertiesDialogParameter * const m_pParameter;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index e5ade413f9a4..a2688c288da4 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -106,8 +106,6 @@ private:
bool m_bRangePosUnique;
bool m_bRangeNegUnique;
- bool m_bNoneAvailable;
-
tErrorBarType m_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits;
sal_Int64 m_nConstSpinSize;