summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/test/sheet/xcellformatrangessupplier.hxx34
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv1
-rw-r--r--qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java83
-rw-r--r--sc/qa/extras/sccellcursorobj.cxx9
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx7
-rw-r--r--sc/qa/extras/sctablesheetobj.cxx9
-rw-r--r--test/Library_subsequenttest.mk1
-rw-r--r--test/source/sheet/xcellformatrangessupplier.cxx39
11 files changed, 94 insertions, 92 deletions
diff --git a/include/test/sheet/xcellformatrangessupplier.hxx b/include/test/sheet/xcellformatrangessupplier.hxx
new file mode 100644
index 000000000000..1f2f6d3794b6
--- /dev/null
+++ b/include/test/sheet/xcellformatrangessupplier.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+#define INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <test/testdllapi.hxx>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellFormatRangesSupplier
+{
+public:
+ virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+ void testGetCellFormatRanges();
+
+protected:
+ ~XCellFormatRangesSupplier() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6f07cb3ab936..5a4f7a7ae293 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -586,7 +586,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
qadevOOo/tests/java/ifc/sheet/_XCalculatable \
- qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier \
qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable \
qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index e6b2ef052fd0..81bda88aa988 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -209,7 +209,6 @@
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentRegion()"
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentArray()"
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToMergedArea()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index deddc503556a..e018f5e09ef8 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -204,7 +204,6 @@
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
"ScCellRangeObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
"ScCellRangeObj";"com::sun::star::util::XModifyBroadcaster#optional";"removeModifyListener()"
"ScCellRangeObj";"com::sun::star::util::XImportable";"createImportDescriptor()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 48032b0f4309..d62b814567ff 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -231,7 +231,6 @@
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
"ScTableSheetObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScTableSheetObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
"ScTableSheetObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
"ScTableSheetObj";"com::sun::star::util::XModifyBroadcaster#optional";"removeModifyListener()"
"ScTableSheetObj";"com::sun::star::util::XImportable";"createImportDescriptor()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java
deleted file mode 100644
index 6a1e2af1bef3..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java
+++ /dev/null
@@ -1,83 +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 ifc.sheet;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.sheet.XCellFormatRangesSupplier;
-
-/**
- * Interface test to check the interface XCellFormatRangesSupplier
- *
- * methods:
- *
- * getCellFormatRanges()
- *
- */
-
-public class _XCellFormatRangesSupplier extends MultiMethodTest {
-
- public XCellFormatRangesSupplier oObj = null;
-
- /**
- * call the method getCellFormatRanges and returns OK result if
- * the gained XIndexAccess isn't null and the method checkIndexAccess
- * returns true.
- */
-
- public void _getCellFormatRanges() {
- boolean res = true;
- XIndexAccess xIA = oObj.getCellFormatRanges();
- if (xIA != null) {
- res = checkIndexAccess(xIA);
- } else {
- log.println("The gained IndexAccess is null");
- res = false;
- }
- tRes.tested("getCellFormatRanges()",res);
- }
-
- /**
- * calls the method getCount at the IndexAccess, returns true is it is >0
- * and getByIndex() doesn't throw an exception for Indexes between 0 and count
- */
-
- protected boolean checkIndexAccess(XIndexAccess xIA) {
- boolean res = true;
- int count = xIA.getCount();
- log.println("Found "+count+" Elements");
- res &= count>0;
- for (int k=0; k<count; k++) {
- try {
- Object element = xIA.getByIndex(k);
- log.println("Element "+k+" = "+element);
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Unexpected Exception while getting by Index ("+k+")"+e.getMessage());
- res &=false;
- } catch (com.sun.star.lang.WrappedTargetException e) {
- log.println("Unexpected Exception while getting by Index ("+k+")"+e.getMessage());
- res &=false;
- }
- }
- return res;
- }
-
-}
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index 43d0113d777e..da8ddc988f67 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/sheet/xcellformatrangessupplier.hxx>
#include <test/sheet/xcellseries.hxx>
#include <test/sheet/xmultipleoperation.hxx>
#include <test/sheet/xsheetcellrange.hxx>
@@ -27,9 +28,10 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 14
+#define NUMBER_OF_TESTS 15
-class ScCellCursorObj : public CalcUnoApiTest, public apitest::XCellSeries,
+class ScCellCursorObj : public CalcUnoApiTest, public apitest::XCellFormatRangesSupplier,
+ public apitest::XCellSeries,
public apitest::XMultipleOperation,
public apitest::XSheetCellRange,
public apitest::XSheetFilterable,
@@ -56,6 +58,9 @@ public:
// XMultipleOperation
CPPUNIT_TEST(testSetTableOperation);
+ // XCellFormatRangesSupplier
+ CPPUNIT_TEST(testGetCellFormatRanges);
+
// XCellSeries
CPPUNIT_TEST(testFillAuto);
CPPUNIT_TEST(testFillSeries);
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index fa14458872ee..ff92190a6e77 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/cellproperties.hxx>
+#include <test/sheet/xcellformatrangessupplier.hxx>
#include <test/sheet/xcellrangedata.hxx>
#include <test/sheet/xcellrangesquery.hxx>
#include <test/sheet/xcellseries.hxx>
@@ -44,9 +45,10 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 27
+#define NUMBER_OF_TESTS 28
class ScCellRangeObj : public CalcUnoApiTest, public apitest::CellProperties,
+ public apitest::XCellFormatRangesSupplier,
public apitest::XCellRangeData,
public apitest::XCellRangesQuery,
public apitest::XCellSeries,
@@ -76,6 +78,9 @@ public:
CPPUNIT_TEST(testVertJustify);
CPPUNIT_TEST(testRotateReference);
+ // XCellFormatRangesSupplier
+ CPPUNIT_TEST(testGetCellFormatRanges);
+
// XCellSeries
CPPUNIT_TEST(testFillAuto);
CPPUNIT_TEST(testFillSeries);
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index b0e546058a33..c0fe3f3a48e3 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/sheet/xcellformatrangessupplier.hxx>
#include <test/sheet/xcellseries.hxx>
#include <test/sheet/xdatapilottablessupplier.hxx>
#include <test/sheet/xmultipleoperation.hxx>
@@ -39,9 +40,10 @@ using namespace css::uno;
namespace sc_apitest
{
-#define NUMBER_OF_TESTS 32
+#define NUMBER_OF_TESTS 33
-class ScTableSheetObj : public CalcUnoApiTest, public apitest::XCellSeries,
+class ScTableSheetObj : public CalcUnoApiTest, public apitest::XCellFormatRangesSupplier,
+ public apitest::XCellSeries,
public apitest::XDataPilotTablesSupplier,
public apitest::XMultipleOperation,
public apitest::XPrintAreas,
@@ -75,6 +77,9 @@ public:
CPPUNIT_TEST_SUITE(ScTableSheetObj);
+ // XCellFormatRangesSupplier
+ CPPUNIT_TEST(testGetCellFormatRanges);
+
// XCellSeries
CPPUNIT_TEST(testFillAuto);
CPPUNIT_TEST(testFillSeries);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 1d2fab702738..8cb91296260b 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xarealink \
test/source/sheet/xarealinks \
test/source/sheet/xcelladdressable \
+ test/source/sheet/xcellformatrangessupplier \
test/source/sheet/xcellrangedata \
test/source/sheet/xcellrangereferrer \
test/source/sheet/xcellrangesquery \
diff --git a/test/source/sheet/xcellformatrangessupplier.cxx b/test/source/sheet/xcellformatrangessupplier.cxx
new file mode 100644
index 000000000000..c387156b7e05
--- /dev/null
+++ b/test/source/sheet/xcellformatrangessupplier.cxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/sheet/xcellformatrangessupplier.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/sheet/XCellFormatRangesSupplier.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest
+{
+void XCellFormatRangesSupplier::testGetCellFormatRanges()
+{
+ uno::Reference<sheet::XCellFormatRangesSupplier> xCFRS(init(), UNO_QUERY_THROW);
+
+ uno::Reference<container::XIndexAccess> xIA(xCFRS->getCellFormatRanges(), UNO_QUERY_THROW);
+
+ const sal_Int32 nCount = xIA->getCount();
+ CPPUNIT_ASSERT_MESSAGE("No items found", sal_Int32(0) != nCount);
+ for (auto i = 0; i < nCount; i++)
+ {
+ CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to access element at position " + std::to_string(i),
+ xIA->getByIndex(i));
+ }
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
generated by cgit (git 2.34.1) at 2025-02-12 19:26:39 +0000