From 4818ee60172b2c7d5d04e57499e345e1cfd7b430 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Wed, 23 Aug 2017 07:35:01 +0000 Subject: tdf#45904 Move Java _XUniqueCellFormatRangesSupplier test to C++ Change-Id: I66c62f1676515437197d1875600407408040ca74 Reviewed-on: https://gerrit.libreoffice.org/41445 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- qadevOOo/Jar_OOoRunner.mk | 1 - .../com.sun.star.comp.office.ScCellCursorObj.csv | 1 - .../sc/com.sun.star.comp.office.ScCellRangeObj.csv | 1 - .../com.sun.star.comp.office.ScTableSheetObj.csv | 1 - .../sheet/_XUniqueCellFormatRangesSupplier.java | 74 ---------------------- 5 files changed, 78 deletions(-) delete mode 100644 qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java (limited to 'qadevOOo') diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 92b9912342f5..c09c9134c895 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -639,7 +639,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \ qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \ qadevOOo/tests/java/ifc/sheet/_XSubTotalField \ - qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \ qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \ 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 b8a24da282db..3ce35d7a5460 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv @@ -138,7 +138,6 @@ "ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryColumnDifferences()" "ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryRowDifferences()" "ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()" -"ScCellCursorObj";"com::sun::star::sheet::XUniqueCellFormatRangesSupplier";"getUniqueCellFormatRanges()" "ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellByPosition()" "ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()" "ScCellCursorObj";"com::sun::star::table::XCellRange";"getCellRangeByName()" 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 a07777d2ecb8..396876793189 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv @@ -133,7 +133,6 @@ "ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryColumnDifferences()" "ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryRowDifferences()" "ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()" -"ScCellRangeObj";"com::sun::star::sheet::XUniqueCellFormatRangesSupplier";"getUniqueCellFormatRanges()" "ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellByPosition()" "ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()" "ScCellRangeObj";"com::sun::star::table::XCellRange";"getCellRangeByName()" 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 2dbb627cf654..776469521bec 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv @@ -164,7 +164,6 @@ "ScTableSheetObj";"com::sun::star::sheet::XScenario";"setScenarioComment()" "ScTableSheetObj";"com::sun::star::sheet::XScenario";"addRanges()" "ScTableSheetObj";"com::sun::star::sheet::XScenario";"apply()" -"ScTableSheetObj";"com::sun::star::sheet::XUniqueCellFormatRangesSupplier";"getUniqueCellFormatRanges()" "ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellByPosition()" "ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()" "ScTableSheetObj";"com::sun::star::table::XCellRange";"getCellRangeByName()" diff --git a/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java b/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java deleted file mode 100644 index 982a85e4e25c..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier.java +++ /dev/null @@ -1,74 +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.XUniqueCellFormatRangesSupplier; - -public class _XUniqueCellFormatRangesSupplier extends MultiMethodTest { - - public XUniqueCellFormatRangesSupplier oObj; - - /** - * call the method getUniqueCellFormatRanges and returns OK result if - * the gained XIndexAccess isn't null and the method checkIndexAccess - * returns true. - */ - - public void _getUniqueCellFormatRanges() { - boolean res = true; - XIndexAccess xIA = oObj.getUniqueCellFormatRanges(); - if (xIA != null) { - res = checkIndexAccess(xIA); - } else { - log.println("The gained IndexAccess is null"); - res = false; - } - tRes.tested("getUniqueCellFormatRanges()",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