sc: Peel off a pimpl

Change-Id: I8797ccc165fb0a6060c6232babc299114411130a
Reviewed-on: https://gerrit.libreoffice.org/64707
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sc/inc/listenerquery.hxx

@@ -11,13 +11,11 @@
 #define SC_LISTENERQUERY_HXX
 
 #include "address.hxx"
+#include "rangelst.hxx"
 #include <svl/listener.hxx>
 
 #include <unordered_map>
 #include <vector>
-#include <memory>
-
-class ScRangeList;
 
 namespace sc {
 
@@ -51,8 +49,7 @@ private:
 
 class QueryRange : public SvtListener::QueryBase
 {
-    struct Impl;
-    std::unique_ptr<Impl> mpImpl;
+    ScRangeList maRanges;
 
     QueryRange( const QueryRange& ) = delete;
     QueryRange& operator= ( const QueryRange& ) = delete;

sc/source/core/tool/listenerquery.cxx

@@ -10,7 +10,6 @@
 #include <listenerquery.hxx>
 #include <listenerqueryids.hxx>
 #include <address.hxx>
-#include <rangelst.hxx>
 
 namespace sc {
 
@@ -68,14 +67,9 @@ const RefQueryFormulaGroup::TabsType& RefQueryFormulaGroup::getAllPositions() co
     return maTabs;
 }
 
-struct QueryRange::Impl
-{
-    ScRangeList maRanges;
-};
-
 QueryRange::QueryRange() :
-    SvtListener::QueryBase(SC_LISTENER_QUERY_FORMULA_GROUP_RANGE),
-    mpImpl(new Impl) {}
+    SvtListener::QueryBase(SC_LISTENER_QUERY_FORMULA_GROUP_RANGE)
+{}
 
 QueryRange::~QueryRange()
 {
@@ -83,12 +77,12 @@ QueryRange::~QueryRange()
 
 void QueryRange::add( const ScRange& rRange )
 {
-    mpImpl->maRanges.Join(rRange);
+    maRanges.Join(rRange);
 }
 
 void QueryRange::swapRanges( ScRangeList& rRanges )
 {
-    mpImpl->maRanges.swap(rRanges);
+    maRanges.swap(rRanges);
 }
 
 }