summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/qa/complex/api_internal/api.lst1
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java119
-rw-r--r--sc/qa/extras/sclabelrangesobj.cxx10
-rw-r--r--sc/qa/unoapi/sc_6.sce1
6 files changed, 10 insertions, 124 deletions
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index b47dad57003c..a4b45dfd2053 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -91,7 +91,6 @@ job96=sc.ScFilterDescriptorBase
job97=sc.ScFunctionListObj
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
-job122=sc.ScLabelRangesObj
job125=sc.ScScenariosObj
job126=sc.ScSheetLinkObj
job127=sc.ScSheetLinksObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 2c5673c4e86a..9de56bbe02dd 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -989,7 +989,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/ScLabelRangesObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
qadevOOo/tests/java/mod/_sc/ScScenariosObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
deleted file mode 100644
index c814454c7897..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScLabelRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScLabelRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
deleted file mode 100644
index 2806fd4cfb55..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
+++ /dev/null
@@ -1,119 +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 java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XLabelRanges;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.sheet.LabelRanges</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::sheet::XLabelRanges</code></li>
-* <li> <code>com::sun::star::container::XIndexAccess</code></li>
-* <li> <code>com::sun::star::container::XElementAccess</code></li>
-* </ul>
-* @see com.sun.star.sheet.LabelRanges
-* @see com.sun.star.sheet.XLabelRanges
-* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.sheet._XLabelRanges
-* @see ifc.container._XIndexAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScLabelRangesObj extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- // get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
- log.println( "creating a sheetdocument" );
- 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.
- * Obtains the value of the property <code>'ColumnLabelRanges'</code>
- * from the document. The property value is the collection of label ranges.
- * Adds new label range to the collection using the interface
- * <code>XLabelRanges</code> that was queried from the property value.
- * This collection is the instance of the service
- * <code>com.sun.star.sheet.LabelRanges</code>.
- * @see com.sun.star.sheet.LabelRanges
- * @see com.sun.star.sheet.XLabelRanges
- */
- @Override
- public 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" );
-
- log.println("Getting test object ") ;
- XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc);
- Object ranges = docProps.getPropertyValue("ColumnLabelRanges");
- XLabelRanges lRanges = UnoRuntime.queryInterface(XLabelRanges.class, ranges);
-
- log.println("Adding at least one element for ElementAccess interface");
- CellRangeAddress aRange2 = new CellRangeAddress((short)0, 0, 1, 0, 6);
- CellRangeAddress aRange1 = new CellRangeAddress((short)0, 0, 0, 0, 1);
- lRanges.addNew(aRange1, aRange2);
-
- oObj = lRanges;
-
- log.println("creating a new environment for object");
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- log.println("testing...");
-
- return tEnv;
- } // finish method getTestEnvironment
-
-} // finish class ScLabelRangesObj
-
diff --git a/sc/qa/extras/sclabelrangesobj.cxx b/sc/qa/extras/sclabelrangesobj.cxx
index fefba462d117..9f720eeaadf7 100644
--- a/sc/qa/extras/sclabelrangesobj.cxx
+++ b/sc/qa/extras/sclabelrangesobj.cxx
@@ -8,12 +8,14 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xelementaccess.hxx>
#include <test/container/xenumerationaccess.hxx>
#include <test/container/xindexaccess.hxx>
#include <test/sheet/xlabelranges.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XLabelRange.hpp>
#include <com/sun/star/sheet/XLabelRanges.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
@@ -21,6 +23,8 @@
#include <com/sun/star/uno/Reference.hxx>
+#include <cppu/unotype.hxx>
+
using namespace css;
using namespace css::uno;
using namespace com::sun::star;
@@ -28,6 +32,7 @@ using namespace com::sun::star;
namespace sc_apitest
{
class ScLabelRangesObj : public CalcUnoApiTest,
+ public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XLabelRanges
@@ -41,6 +46,10 @@ public:
CPPUNIT_TEST_SUITE(ScLabelRangesObj);
+ // XElementAccess
+ CPPUNIT_TEST(testGetElementType);
+ CPPUNIT_TEST(testHasElements);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -60,6 +69,7 @@ private:
ScLabelRangesObj::ScLabelRangesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+ , XElementAccess(cppu::UnoType<sheet::XLabelRange>::get())
, XIndexAccess(1)
{
}
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index ae64fae00d92..c264f0ab4eda 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -15,7 +15,6 @@
# 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.ScLabelRangesObj
-o sc.ScModelObj
-o sc.ScNamedRangesObj
# -o sc.ScScenariosObj
generated by cgit (git 2.34.1) at 2025-02-10 02:51:20 +0000