[Libreoffice-commits] core.git: sc/qa

[Libreoffice Gerrit user]

 sc/qa/extras/scdatapilotfieldgroupitemobj.cxx                 |    3 +--
 sc/qa/extras/scdatapilotfieldgroupsobj.cxx                    |    3 +--
 sc/qa/extras/scdatapilotitemobj.cxx                           |    4 +---
 sc/qa/extras/scdatapilotitemsobj.cxx                          |    3 +--
 sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx |    3 +--
 5 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 221ae913dbeac56ce5674ad4ac3ce3a8d3ba8ae8
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Mar 5 22:02:49 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Mar 6 21:01:25 2019 +0100

    Move variable nMaxFieldIndex out of namespace
    
    Change-Id: I9396abb722b24d8ee6b2d5f8fccac140a1014436
    Reviewed-on: https://gerrit.libreoffice.org/68784
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
index b715a521359d..a2b43d7ee731 100644
--- a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
@@ -40,8 +40,6 @@ using namespace css;
 
 namespace sc_apitest
 {
-const auto nMaxFieldIndex = 6;
-
 class ScDataPilotFieldGroupItemObj : public CalcUnoApiTest,
                                      public apitest::XNamed,
                                      public apitest::XServiceInfo
@@ -67,6 +65,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
+    static const int nMaxFieldIndex = 6;
     uno::Reference<lang::XComponent> m_xComponent;
 };
 
diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
index 8bdaf055af48..148c04af4093 100644
--- a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
@@ -44,8 +44,6 @@ using namespace css;
 
 namespace sc_apitest
 {
-const auto nMaxFieldIndex = 6;
-
 class ScDataPilotFieldGroupsObj : public CalcUnoApiTest,
                                   public apitest::XElementAccess,
                                   public apitest::XEnumerationAccess,
@@ -94,6 +92,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
+    static const int nMaxFieldIndex = 6;
     uno::Reference<lang::XComponent> m_xComponent;
 };
 
diff --git a/sc/qa/extras/scdatapilotitemobj.cxx b/sc/qa/extras/scdatapilotitemobj.cxx
index 5d182624c00f..a11f2e571623 100644
--- a/sc/qa/extras/scdatapilotitemobj.cxx
+++ b/sc/qa/extras/scdatapilotitemobj.cxx
@@ -48,12 +48,10 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    static sal_Int32 nMaxFieldIndex;
+    static const int nMaxFieldIndex = 6;
     uno::Reference< lang::XComponent > mxComponent;
 };
 
-sal_Int32 ScDataPilotItemObj::nMaxFieldIndex = 6;
-
 ScDataPilotItemObj::ScDataPilotItemObj()
      : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
diff --git a/sc/qa/extras/scdatapilotitemsobj.cxx b/sc/qa/extras/scdatapilotitemsobj.cxx
index 720a2ad9e8ec..69c6c987abe6 100644
--- a/sc/qa/extras/scdatapilotitemsobj.cxx
+++ b/sc/qa/extras/scdatapilotitemsobj.cxx
@@ -40,8 +40,6 @@ using namespace css;
 
 namespace sc_apitest
 {
-const auto nMaxFieldIndex = 6;
-
 class ScDataPilotItemsObj : public CalcUnoApiTest,
                             public apitest::XElementAccess,
                             public apitest::XEnumerationAccess,
@@ -82,6 +80,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
+    static const int nMaxFieldIndex = 6;
     uno::Reference<lang::XComponent> m_xComponent;
 };
 
diff --git a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
index 0e123b098853..423714b637aa 100644
--- a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
@@ -34,8 +34,6 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-const auto nMaxFieldIndex = 6;
-
 class ScIndexEnumeration_DataPilotItemsEnumeration : public CalcUnoApiTest,
                                                      public apitest::XEnumeration
 {
@@ -55,6 +53,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
+    static const int nMaxFieldIndex = 6;
     uno::Reference<lang::XComponent> m_xComponent;
 };