From 96f8861a29ebf650dedcbee71b8360133c0ceabb Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Fri, 15 Dec 2017 20:52:32 +0000 Subject: tdf#45904 Move _XCellFormatRangesSupplier Java test to C++ Change-Id: I95c20893878385ef173875956d3d7166b0e9e563 Reviewed-on: https://gerrit.libreoffice.org/46578 Tested-by: Jenkins Reviewed-by: Jens Carl --- 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 - .../java/ifc/sheet/_XCellFormatRangesSupplier.java | 83 ---------------------- 5 files changed, 87 deletions(-) delete mode 100644 qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java (limited to 'qadevOOo') 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