[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk sc/JunitTest_sc_unoapi_5.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 22 05:59:13 UTC 2018
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotItemsEnumeration.csv | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java | 332 ----------
sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk | 43 +
sc/JunitTest_sc_unoapi_5.mk | 14
sc/Module_sc.mk | 2
sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx | 143 ++++
sc/qa/unoapi/sc_5.sce | 18
8 files changed, 187 insertions(+), 368 deletions(-)
New commits:
commit b978f9f37529c2d1428dcd37221558374e95b8d1
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Nov 20 22:19:19 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Nov 22 06:58:49 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_DataPilotItemsEnumeration.
It's also the last test in the group JunitTest_sc_unoapi_5,
we finally could remove that target from the Makefile.
Change-Id: I560c1ca691f0019ac4da99bde3c599b4ba22fb68
Reviewed-on: https://gerrit.libreoffice.org/63690
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 73982bf98210..63ebd62f3844 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -992,7 +992,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
- qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotItemsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotItemsEnumeration.csv
deleted file mode 100644
index f46004cbff37..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_DataPilotItemsEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_DataPilotItemsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_DataPilotItemsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
deleted file mode 100644
index 93e61ffa4c39..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package mod._sc;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNamed;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.DataPilotFieldOrientation;
-import com.sun.star.sheet.XDataPilotDescriptor;
-import com.sun.star.sheet.XDataPilotField;
-import com.sun.star.sheet.XDataPilotTables;
-import com.sun.star.sheet.XDataPilotTablesSupplier;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import util.SOfficeFactory;
-
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.sheet.DataPilotField</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::container::XNamed</code></li>
-* <li> <code>com::sun::star::sheet::DataPilotField</code></li>
-* <li> <code>com::sun::star::beans::XPropertySet</code></li>
-* </ul>
-* @see com.sun.star.sheet.DataPilotField
-* @see com.sun.star.container.XNamed
-* @see com.sun.star.sheet.DataPilotField
-* @see com.sun.star.beans.XPropertySet
-* @see ifc.container._XNamed
-* @see ifc.sheet._DataPilotField
-* @see ifc.beans._XPropertySet
-*/
-public class ScIndexEnumeration_DataPilotItemsEnumeration
- extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * A field is filled some values. This integer determines the size of the
- * field in x and y direction.
- */
- private static final int mMaxFieldIndex = 6;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory(
- tParam.getMSF());
-
- log.println("creating a Spreadsheet document");
- xSheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes Spreadsheet document.
- */
- @Override
- protected void cleanup(TestParameters tParam, PrintWriter log) {
- log.println(" disposing xSheetDoc ");
-
- XComponent oComp = UnoRuntime.queryInterface(
- XComponent.class, xSheetDoc);
- util.DesktopTools.closeDoc(oComp);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Retrieves a collection of spreadsheets from a document
- * and takes one of them. Fills some table in the spreadsheet.
- * Obtains the collection of data pilot tables using the interface
- * <code>XDataPilotTablesSupplier</code>. Creates a data pilot descriptor
- * for the filled table and inserts new data pilot table with this descriptor
- * to the collection. Obtains the collection of all the data pilot fields
- * using the interface <code>XDataPilotDescriptor</code>. Retrieves from
- * the collection the data pilot field with index 0. This data pilot field
- * is the instance of the service <code>com.sun.star.sheet.DataPilotField</code>.
- * @see com.sun.star.sheet.DataPilotField
- * @see com.sun.star.sheet.XDataPilotTablesSupplier
- * @see com.sun.star.sheet.XDataPilotDescriptor
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log) throws Exception {
- XInterface oObj = null;
-
-
- // creation of testobject here
- // first we write what we are intend to do to log file
- log.println("Creating a test environment");
-
- // the cell range
- CellRangeAddress sCellRangeAdress = new CellRangeAddress();
- sCellRangeAdress.Sheet = 0;
- sCellRangeAdress.StartColumn = 1;
- sCellRangeAdress.StartRow = 0;
- sCellRangeAdress.EndColumn = mMaxFieldIndex - 1;
- sCellRangeAdress.EndRow = mMaxFieldIndex - 1;
-
- // position of the data pilot table
- CellAddress sCellAdress = new CellAddress();
- sCellAdress.Sheet = 0;
- sCellAdress.Column = 7;
- sCellAdress.Row = 8;
-
- log.println("Getting a sheet");
-
- XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
- XSpreadsheet oSheet = null;
- XSpreadsheet oSheet2 = null;
- XIndexAccess oIndexAccess = UnoRuntime.queryInterface(
- XIndexAccess.class, xSpreadsheets);
- // Make sure there are at least two sheets
- xSpreadsheets.insertNewByName("Some Sheet", (short)0);
-
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
- oIndexAccess.getByIndex(0));
- oSheet2 = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
- oIndexAccess.getByIndex(1));
-
- log.println("Filling a table");
-
- for (int i = 1; i < mMaxFieldIndex; i++) {
- oSheet.getCellByPosition(i, 0).setFormula("Col" + i);
- oSheet.getCellByPosition(0, i).setFormula("Row" + i);
- oSheet2.getCellByPosition(i, 0).setFormula("Col" + i);
- oSheet2.getCellByPosition(0, i).setFormula("Row" + i);
- }
-
- for (int i = 1; i < mMaxFieldIndex; i++)
- for (int j = 1; j < mMaxFieldIndex; j++) {
- oSheet.getCellByPosition(i, j).setValue(i * (j + 1));
- oSheet2.getCellByPosition(i, j).setValue(i * (j + 2));
- }
-
- oSheet.getCellByPosition(1, 5);
-
- int x = sCellAdress.Column;
- int y = sCellAdress.Row + 3;
-
-
- oSheet.getCellByPosition(x, y);
-
- // create the test objects
- log.println("Getting test objects");
-
- XDataPilotTablesSupplier DPTS = UnoRuntime.queryInterface(
- XDataPilotTablesSupplier.class,
- oSheet);
- XDataPilotTables DPT = DPTS.getDataPilotTables();
- XDataPilotDescriptor DPDsc = DPT.createDataPilotDescriptor();
- DPDsc.setSourceRange(sCellRangeAdress);
-
- XPropertySet fieldPropSet = null;
-
- Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0);
- fieldPropSet = UnoRuntime.queryInterface(
- XPropertySet.class, oDataPilotField);
-
- fieldPropSet.setPropertyValue("Function",
- com.sun.star.sheet.GeneralFunction.SUM);
- fieldPropSet.setPropertyValue("Orientation",
- com.sun.star.sheet.DataPilotFieldOrientation.DATA);
-
- log.println("Insert the DataPilotTable");
-
- if (DPT.hasByName("DataPilotTable")) {
- DPT.removeByName("DataPilotTable");
- }
-
- XIndexAccess IA = DPDsc.getDataPilotFields();
- getSRange(IA);
-
- DPT.insertNewByName("DataPilotTable", sCellAdress, DPDsc);
-
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class), IA.getByIndex(0));
-
- log.println("Creating object - " +
- ((oObj == null) ? "FAILED" : "OK"));
-
- XDataPilotField xDataPilotField = UnoRuntime.queryInterface(
- XDataPilotField.class, oObj);
-
- XEnumerationAccess xEnumerationAccess = UnoRuntime.queryInterface(
- XEnumerationAccess.class,
- xDataPilotField.getItems());
-
- oObj = xEnumerationAccess.createEnumeration();
-
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- log.println("Implementationname: " + util.utils.getImplName(oObj));
-
- // Other parameters required for interface tests
- return tEnv;
- }
-
- private void getSRange(XIndexAccess IA) {
- int fieldsAmount = IA.getCount() + 1;
-
- String[] fieldsNames = new String[fieldsAmount];
-
- int i = -1;
- int cnt = 0;
-
- while ((++i) < fieldsAmount) {
- Object field;
-
- try {
- field = IA.getByIndex(i);
- } catch (com.sun.star.lang.WrappedTargetException e) {
- e.printStackTrace(log);
-
- return;
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- e.printStackTrace(log);
-
- return;
- }
-
- XNamed named = UnoRuntime.queryInterface(XNamed.class,
- field);
- String name = named.getName();
-
- log.println("**Field : '" + name + "' ... ");
-
- if (!name.equals("Data")) {
- fieldsNames[cnt] = name;
-
- XPropertySet props = UnoRuntime.queryInterface(
- XPropertySet.class, field);
-
- try {
- switch (cnt % 5) {
- case 0:
- props.setPropertyValue("Orientation",
- DataPilotFieldOrientation.COLUMN);
- log.println(" Column");
-
- break;
-
- case 1:
- props.setPropertyValue("Orientation",
- DataPilotFieldOrientation.ROW);
- log.println(" Row");
-
- break;
-
- case 2:
- props.setPropertyValue("Orientation",
- DataPilotFieldOrientation.DATA);
- log.println(" Data");
-
- break;
-
- case 3:
- props.setPropertyValue("Orientation",
- DataPilotFieldOrientation.HIDDEN);
- log.println(" Hidden");
-
- break;
-
- case 4:
- props.setPropertyValue("Orientation",
- DataPilotFieldOrientation.PAGE);
- log.println(" Page");
-
- break;
- }
- } catch (com.sun.star.lang.WrappedTargetException e) {
- e.printStackTrace(log);
-
- return;
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- e.printStackTrace(log);
-
- return;
- } catch (com.sun.star.beans.PropertyVetoException e) {
- e.printStackTrace(log);
-
- return;
- } catch (com.sun.star.beans.UnknownPropertyException e) {
- e.printStackTrace(log);
-
- return;
- }
-
- if ((++cnt) > 4) {
- break;
- }
- } else {
- return;
- }
- }
- }
-}
diff --git a/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk b/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk
new file mode 100644
index 000000000000..e785d84ee661
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_indexenumeration_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_datapilotitemsenumeration,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilotitemsenumeration, \
+ sc/qa/extras/scindexenumeration_datapilotitemsenumeration \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_datapilotitemsenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_datapilotitemsenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_datapilotitemsenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_datapilotitemsenumeration))
+
+$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_datapilotitemsenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_datapilotitemsenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/JunitTest_sc_unoapi_5.mk b/sc/JunitTest_sc_unoapi_5.mk
deleted file mode 100644
index be22bd887f7d..000000000000
--- a/sc/JunitTest_sc_unoapi_5.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_JunitTest_JunitTest,sc_unoapi_5))
-
-$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_5))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2da7844a1467..1dfe489869f6 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_unoapi_2 \
JunitTest_sc_unoapi_3 \
JunitTest_sc_unoapi_4 \
- JunitTest_sc_unoapi_5 \
JunitTest_sc_unoapi_6 \
JunitTest_sc_unoapi_7 \
CppunitTest_sc_anchor_test \
@@ -138,6 +137,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_cellarealinksenumeration \
CppunitTest_sc_indexenumeration_databaserangesenumeration \
CppunitTest_sc_indexenumeration_datapilotfieldsenumeration \
+ CppunitTest_sc_indexenumeration_datapilotitemsenumeration \
CppunitTest_sc_indexenumeration_datapilottablesenumeration \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_indexenumeration_functiondescriptionenumeration \
diff --git a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
new file mode 100644
index 000000000000..0e123b098853
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumeration.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+#include <com/sun/star/sheet/GeneralFunction.hpp>
+#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+#include <com/sun/star/sheet/XDataPilotField.hpp>
+#include <com/sun/star/sheet/XDataPilotTables.hpp>
+#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+using namespace com::sun::star;
+
+namespace sc_apitest
+{
+const auto nMaxFieldIndex = 6;
+
+class ScIndexEnumeration_DataPilotItemsEnumeration : public CalcUnoApiTest,
+ public apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_DataPilotItemsEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotItemsEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_DataPilotItemsEnumeration::ScIndexEnumeration_DataPilotItemsEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotItemsEnumeration::init()
+{
+ table::CellRangeAddress aCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1);
+ table::CellAddress aCellAddress(0, 7, 8);
+
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no document", xDoc.is());
+ uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+
+ uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+ xSheets->insertNewByName("Some Sheet", 0);
+
+ uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet> xSheet1(xIA->getByIndex(1), uno::UNO_QUERY_THROW);
+
+ for (auto i = 1; i < nMaxFieldIndex; ++i)
+ {
+ xSheet0->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
+ xSheet0->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
+ xSheet1->getCellByPosition(i, 0)->setFormula("Col" + OUString::number(i));
+ xSheet1->getCellByPosition(0, i)->setFormula("Row" + OUString::number(i));
+ }
+
+ for (auto i = 1; i < nMaxFieldIndex; ++i)
+ {
+ for (auto j = 1; j < nMaxFieldIndex; ++j)
+ {
+ xSheet0->getCellByPosition(i, j)->setValue(i * (j + 1));
+ xSheet1->getCellByPosition(i, j)->setValue(i * (j + 2));
+ }
+ }
+
+ xSheet0->getCellByPosition(1, 5);
+ xSheet0->getCellByPosition(aCellAddress.Column, aCellAddress.Row + 3);
+
+ uno::Reference<sheet::XDataPilotTablesSupplier> xDPTS(xSheet0, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XDataPilotTables> xDPT(xDPTS->getDataPilotTables(), uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XDataPilotDescriptor> xDPD(xDPT->createDataPilotDescriptor(),
+ uno::UNO_QUERY_THROW);
+
+ xDPD->setSourceRange(aCellRangeAddress);
+
+ uno::Any aValue;
+ uno::Reference<beans::XPropertySet> xPropertySet(xDPD->getDataPilotFields()->getByIndex(0),
+ uno::UNO_QUERY_THROW);
+ aValue <<= sheet::DataPilotFieldOrientation_DATA;
+ xPropertySet->setPropertyValue("Orientation", aValue);
+ aValue <<= sheet::GeneralFunction_SUM;
+ xPropertySet->setPropertyValue("Function", aValue);
+
+ xDPT->insertNewByName("DataPilotTable", aCellAddress, xDPD);
+
+ uno::Reference<sheet::XDataPilotField> xDPF(xDPD->getDataPilotFields()->getByIndex(0),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<container::XEnumerationAccess> xEA(xDPF->getItems(), uno::UNO_QUERY_THROW);
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_DataPilotItemsEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ // create a calc document
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_DataPilotItemsEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotItemsEnumeration);
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unoapi/sc_5.sce b/sc/qa/unoapi/sc_5.sce
deleted file mode 100644
index b8c921a07ff4..000000000000
--- a/sc/qa/unoapi/sc_5.sce
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
--o sc.ScIndexEnumeration_DataPilotItemsEnumeration
More information about the Libreoffice-commits
mailing list