Kaydet (Commit) d1f330cf authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-private-field

Change-Id: Iab661fad3892c72ef042016085db553819307c56
üst 770a970a
...@@ -137,9 +137,9 @@ public: ...@@ -137,9 +137,9 @@ public:
private: private:
css::uno::Reference<css::chart2::data::XDataSource> css::uno::Reference<css::chart2::data::XDataSource>
createValuesDataSource(OUString const & aRangeRepresentation); createValuesDataSource();
css::uno::Reference<css::chart2::data::XDataSource> css::uno::Reference<css::chart2::data::XDataSource>
createCategoriesDataSource(OUString const & aRangeRepresentation, bool bOrientationIsColumn); createCategoriesDataSource(bool bOrientationIsColumn);
css::uno::Reference<css::chart2::data::XLabeledDataSequence> newLabeledDataSequence(); css::uno::Reference<css::chart2::data::XLabeledDataSequence> newLabeledDataSequence();
......
...@@ -30,8 +30,7 @@ typedef cppu::WeakImplHelper<css::chart2::data::XDataSource, ...@@ -30,8 +30,7 @@ typedef cppu::WeakImplHelper<css::chart2::data::XDataSource,
class PivotTableDataSource : public PivotTableDataSource_Base, public SfxListener class PivotTableDataSource : public PivotTableDataSource_Base, public SfxListener
{ {
public: public:
explicit PivotTableDataSource(OUString const & aRangeRepresentation, explicit PivotTableDataSource(std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence);
std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence);
virtual ~PivotTableDataSource() override; virtual ~PivotTableDataSource() override;
virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override; virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override;
...@@ -49,7 +48,6 @@ public: ...@@ -49,7 +48,6 @@ public:
private: private:
std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>> m_xLabeledSequence; std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>> m_xLabeledSequence;
OUString m_aRangeRepresentation;
}; };
} }
......
...@@ -188,9 +188,9 @@ uno::Reference<chart2::data::XDataSource> SAL_CALL ...@@ -188,9 +188,9 @@ uno::Reference<chart2::data::XDataSource> SAL_CALL
uno::Reference<chart2::data::XDataSource> xResult; uno::Reference<chart2::data::XDataSource> xResult;
if (aRangeRepresentation == "Categories") if (aRangeRepresentation == "Categories")
xResult = createCategoriesDataSource(aRangeRepresentation, bOrientCol); xResult = createCategoriesDataSource(bOrientCol);
else else
xResult = createValuesDataSource(aRangeRepresentation); xResult = createValuesDataSource();
return xResult; return xResult;
} }
...@@ -230,8 +230,7 @@ void PivotTableDataProvider::setLabeledDataSequence(uno::Reference<chart2::data: ...@@ -230,8 +230,7 @@ void PivotTableDataProvider::setLabeledDataSequence(uno::Reference<chart2::data:
} }
uno::Reference<chart2::data::XDataSource> uno::Reference<chart2::data::XDataSource>
PivotTableDataProvider::createCategoriesDataSource(OUString const & rRangeRepresentation, PivotTableDataProvider::createCategoriesDataSource(bool bOrientationIsColumn)
bool bOrientationIsColumn)
{ {
if (m_bNeedsUpdate) if (m_bNeedsUpdate)
collectPivotTableData(); collectPivotTableData();
...@@ -258,7 +257,7 @@ PivotTableDataProvider::createCategoriesDataSource(OUString const & rRangeRepres ...@@ -258,7 +257,7 @@ PivotTableDataProvider::createCategoriesDataSource(OUString const & rRangeRepres
} }
} }
xDataSource.set(new PivotTableDataSource(rRangeRepresentation, aLabeledSequences)); xDataSource.set(new PivotTableDataSource(aLabeledSequences));
return xDataSource; return xDataSource;
} }
...@@ -552,7 +551,7 @@ void PivotTableDataProvider::assignLabelsToDataSequence(uno::Reference<chart2::d ...@@ -552,7 +551,7 @@ void PivotTableDataProvider::assignLabelsToDataSequence(uno::Reference<chart2::d
} }
uno::Reference<chart2::data::XDataSource> uno::Reference<chart2::data::XDataSource>
PivotTableDataProvider::createValuesDataSource(OUString const & rRangeRepresentation) PivotTableDataProvider::createValuesDataSource()
{ {
if (m_bNeedsUpdate) if (m_bNeedsUpdate)
collectPivotTableData(); collectPivotTableData();
...@@ -605,7 +604,7 @@ uno::Reference<chart2::data::XDataSource> ...@@ -605,7 +604,7 @@ uno::Reference<chart2::data::XDataSource>
} }
} }
xDataSource.set(new PivotTableDataSource(rRangeRepresentation, aLabeledSequences)); xDataSource.set(new PivotTableDataSource(aLabeledSequences));
return xDataSource; return xDataSource;
} }
......
...@@ -23,10 +23,8 @@ namespace sc ...@@ -23,10 +23,8 @@ namespace sc
SC_SIMPLE_SERVICE_INFO(PivotTableDataSource, "PivotTableDataSource", "com.sun.star.chart2.data.DataSource") SC_SIMPLE_SERVICE_INFO(PivotTableDataSource, "PivotTableDataSource", "com.sun.star.chart2.data.DataSource")
PivotTableDataSource::PivotTableDataSource(OUString const & aRangeRepresentation, PivotTableDataSource::PivotTableDataSource(std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence)
std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence)
: m_xLabeledSequence(xLabeledSequence) : m_xLabeledSequence(xLabeledSequence)
, m_aRangeRepresentation(aRangeRepresentation)
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment