[Libreoffice-commits] core.git: sc/inc sc/source

[Stephan Bergmann]

 sc/inc/PivotTableDataProvider.hxx              |    4 ++--
 sc/inc/PivotTableDataSource.hxx                |    4 +---
 sc/source/ui/unoobj/PivotTableDataProvider.cxx |   13 ++++++-------
 sc/source/ui/unoobj/PivotTableDataSource.cxx   |    4 +---
 4 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit d1f330cf55a54ccf9b2329798fe7650eb9ee02c3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 5 12:01:42 2017 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: Iab661fad3892c72ef042016085db553819307c56

diff --git a/sc/inc/PivotTableDataProvider.hxx b/sc/inc/PivotTableDataProvider.hxx
index 8135cba9d58d..1a88939c7a3e 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -137,9 +137,9 @@ public:
 private:
 
     css::uno::Reference<css::chart2::data::XDataSource>
-        createValuesDataSource(OUString const & aRangeRepresentation);
+        createValuesDataSource();
     css::uno::Reference<css::chart2::data::XDataSource>
-        createCategoriesDataSource(OUString const & aRangeRepresentation, bool bOrientationIsColumn);
+        createCategoriesDataSource(bool bOrientationIsColumn);
 
     css::uno::Reference<css::chart2::data::XLabeledDataSequence> newLabeledDataSequence();
 
diff --git a/sc/inc/PivotTableDataSource.hxx b/sc/inc/PivotTableDataSource.hxx
index 326f7c31b8a7..cd4281ceffe1 100644
--- a/sc/inc/PivotTableDataSource.hxx
+++ b/sc/inc/PivotTableDataSource.hxx
@@ -30,8 +30,7 @@ typedef cppu::WeakImplHelper<css::chart2::data::XDataSource,
 class PivotTableDataSource : public PivotTableDataSource_Base, public SfxListener
 {
 public:
-    explicit PivotTableDataSource(OUString const & aRangeRepresentation,
-                                  std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence);
+    explicit PivotTableDataSource(std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence);
     virtual ~PivotTableDataSource() override;
     virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override;
 
@@ -49,7 +48,6 @@ public:
 
 private:
     std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>> m_xLabeledSequence;
-    OUString m_aRangeRepresentation;
 };
 
 }
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 84eb756c3bf3..5eb66c65257a 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -188,9 +188,9 @@ uno::Reference<chart2::data::XDataSource> SAL_CALL
     uno::Reference<chart2::data::XDataSource> xResult;
 
     if (aRangeRepresentation == "Categories")
-        xResult = createCategoriesDataSource(aRangeRepresentation, bOrientCol);
+        xResult = createCategoriesDataSource(bOrientCol);
     else
-        xResult = createValuesDataSource(aRangeRepresentation);
+        xResult = createValuesDataSource();
 
     return xResult;
 }
@@ -230,8 +230,7 @@ void PivotTableDataProvider::setLabeledDataSequence(uno::Reference<chart2::data:
 }
 
 uno::Reference<chart2::data::XDataSource>
-PivotTableDataProvider::createCategoriesDataSource(OUString const & rRangeRepresentation,
-                                                   bool bOrientationIsColumn)
+PivotTableDataProvider::createCategoriesDataSource(bool bOrientationIsColumn)
 {
     if (m_bNeedsUpdate)
         collectPivotTableData();
@@ -258,7 +257,7 @@ PivotTableDataProvider::createCategoriesDataSource(OUString const & rRangeRepres
         }
     }
 
-    xDataSource.set(new PivotTableDataSource(rRangeRepresentation, aLabeledSequences));
+    xDataSource.set(new PivotTableDataSource(aLabeledSequences));
     return xDataSource;
 }
 
@@ -552,7 +551,7 @@ void PivotTableDataProvider::assignLabelsToDataSequence(uno::Reference<chart2::d
 }
 
 uno::Reference<chart2::data::XDataSource>
-    PivotTableDataProvider::createValuesDataSource(OUString const & rRangeRepresentation)
+    PivotTableDataProvider::createValuesDataSource()
 {
     if (m_bNeedsUpdate)
         collectPivotTableData();
@@ -605,7 +604,7 @@ uno::Reference<chart2::data::XDataSource>
         }
     }
 
-    xDataSource.set(new PivotTableDataSource(rRangeRepresentation, aLabeledSequences));
+    xDataSource.set(new PivotTableDataSource(aLabeledSequences));
     return xDataSource;
 }
 
diff --git a/sc/source/ui/unoobj/PivotTableDataSource.cxx b/sc/source/ui/unoobj/PivotTableDataSource.cxx
index 752f8a4b4efe..28f4d7a44085 100644
--- a/sc/source/ui/unoobj/PivotTableDataSource.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataSource.cxx
@@ -23,10 +23,8 @@ namespace sc
 
 SC_SIMPLE_SERVICE_INFO(PivotTableDataSource, "PivotTableDataSource", "com.sun.star.chart2.data.DataSource")
 
-PivotTableDataSource::PivotTableDataSource(OUString const & aRangeRepresentation,
-                                           std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence)
+PivotTableDataSource::PivotTableDataSource(std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence>>& xLabeledSequence)
     : m_xLabeledSequence(xLabeledSequence)
-    , m_aRangeRepresentation(aRangeRepresentation)
 {
 }