diff options
| -rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
| -rw-r--r-- | qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsEnumeration.csv | 2 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java | 121 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_uniquecellformatsenumeration.mk | 43 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 1 | ||||
| -rw-r--r-- | sc/qa/extras/scuniquecellformatsenumeration.cxx | 133 | ||||
| -rw-r--r-- | sc/qa/unoapi/sc_7.sce | 1 |
7 files changed, 177 insertions, 125 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 80b91408cf64..ddc54bd13ceb 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -1035,7 +1035,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \ qadevOOo/tests/java/mod/_sc/ScTableValidationObj \ qadevOOo/tests/java/mod/_sc/ScTabViewObj \ - qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration \ qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj \ qadevOOo/tests/java/mod/_sc/ScViewPaneObj \ qadevOOo/tests/java/mod/_sc/XMLContentExporter \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsEnumeration.csv deleted file mode 100644 index e3ee16a5935b..000000000000 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScUniqueCellFormatsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScUniqueCellFormatsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java deleted file mode 100644 index 8f7a98c7cc08..000000000000 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ /dev/null @@ -1,121 +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.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XUniqueCellFormatRangesSupplier; -import com.sun.star.table.XCellRange; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -import java.awt.Color; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import util.SOfficeFactory; - - -public class ScUniqueCellFormatsEnumeration extends TestCase { - private XSpreadsheetDocument xSheetDoc = null; - static XSpreadsheet oSheet = 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) { - util.DesktopTools.closeDoc(xSheetDoc); - } - - @Override - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) throws Exception { - log.println("Getting the first sheet"); - - XIndexAccess xIA = UnoRuntime.queryInterface( - XIndexAccess.class, xSheetDoc.getSheets()); - - oSheet = UnoRuntime.queryInterface( - XSpreadsheet.class, xIA.getByIndex(0)); - - changeColor("A1:A5", 0, 255, 0); - changeColor("A6:B10", 255, 0, 0); - changeColor("B1:B6", 0, 0, 255); - changeColor("B7", 0, 255, 0); - changeColor("B8:B10", 0, 0, 255); - changeColor("C1:C10", 0, 0, 255); - changeColor("D1:D10", 0, 255, 0); - - XUniqueCellFormatRangesSupplier xUCRS = UnoRuntime.queryInterface( - XUniqueCellFormatRangesSupplier.class, - oSheet); - - XEnumerationAccess xEnum = UnoRuntime.queryInterface( - XEnumerationAccess.class, - xUCRS.getUniqueCellFormatRanges()); - XInterface oObj = xEnum.createEnumeration(); - log.println("Implementationname: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("ExpectedCount", Integer.valueOf(4)); - - return tEnv; - } - - protected void changeColor(String RangeName, int r, int g, int b) { - XCellRange xRange = oSheet.getCellRangeByName(RangeName); - XPropertySet xPropertySet = UnoRuntime.queryInterface( - XPropertySet.class, xRange); - Color c = new Color(r, g, b); - int c2int = 16777216 + c.hashCode(); - - try { - xPropertySet.setPropertyValue("CellBackColor", Integer.valueOf(c2int)); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Couldn't change CellFormat"); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Couldn't change CellFormat"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Couldn't change CellFormat"); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Couldn't change CellFormat"); - } - } -} diff --git a/sc/CppunitTest_sc_uniquecellformatsenumeration.mk b/sc/CppunitTest_sc_uniquecellformatsenumeration.mk new file mode 100644 index 000000000000..a46810ef88e9 --- /dev/null +++ b/sc/CppunitTest_sc_uniquecellformatsenumeration.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_uniquecellformatsenumeration)) + +$(eval $(call gb_CppunitTest_use_external,sc_uniquecellformatsenumeration,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_uniquecellformatsenumeration, \ + sc/qa/extras/scuniquecellformatsenumeration \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_uniquecellformatsenumeration, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_uniquecellformatsenumeration,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_uniquecellformatsenumeration)) + +$(eval $(call gb_CppunitTest_use_ure,sc_uniquecellformatsenumeration)) +$(eval $(call gb_CppunitTest_use_vcl,sc_uniquecellformatsenumeration)) + +$(eval $(call gb_CppunitTest_use_components,sc_uniquecellformatsenumeration,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_uniquecellformatsenumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 5d81f2c0d46e..c4d0d7d87c7e 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -162,6 +162,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_tablesheetsobj \ CppunitTest_sc_tablevalidationobj \ CppunitTest_sc_tabviewobj \ + CppunitTest_sc_uniquecellformatsenumeration \ CppunitTest_sc_viewpaneobj \ )) diff --git a/sc/qa/extras/scuniquecellformatsenumeration.cxx b/sc/qa/extras/scuniquecellformatsenumeration.cxx new file mode 100644 index 000000000000..ef9f8f61584b --- /dev/null +++ b/sc/qa/extras/scuniquecellformatsenumeration.cxx @@ -0,0 +1,133 @@ +/* -*- 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/calc_unoapi_test.hxx> +#include <test/container/xenumeration.hxx> + +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/sheet/XSpreadsheet.hpp> +#include <com/sun/star/sheet/XSpreadsheets.hpp> +#include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.hpp> +#include <com/sun/star/table/XCellRange.hpp> +#include <com/sun/star/uno/XInterface.hpp> + +#include <com/sun/star/uno/Reference.hxx> + +#include <rtl/string.hxx> +#include <sal/types.h> + +using namespace css; +using namespace css::uno; + +namespace sc_apitest +{ +struct RGBColor +{ + int m_nRed; + int m_nGreen; + int m_nBlue; + + RGBColor(int nRed, int nGreen, int nBlue) + : m_nRed(nRed) + , m_nGreen(nGreen) + , m_nBlue(nBlue) + { + } + + sal_Int32 hashCode() const { return (255 << 24) | (m_nRed << 16) | (m_nGreen << 8) | m_nBlue; } +}; + +class ScUniqueCellFormatsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration +{ +public: + ScUniqueCellFormatsEnumeration(); + + virtual uno::Reference<uno::XInterface> init() override; + virtual void setUp() override; + virtual void tearDown() override; + + CPPUNIT_TEST_SUITE(ScUniqueCellFormatsEnumeration); + + // XEnumeration + CPPUNIT_TEST(testHasMoreElements); + CPPUNIT_TEST(testNextElement); + + CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<lang::XComponent> m_xComponent; + void changeColor(const uno::Reference<sheet::XSpreadsheet>& xSheet, const OUString& sRangeName, + const RGBColor& rgb); +}; + +ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration() + : CalcUnoApiTest("/sc/qa/extras/testdocuments") +{ +} + +uno::Reference<uno::XInterface> ScUniqueCellFormatsEnumeration::init() +{ + uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); + + uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW); + + changeColor(xSheet0, "A1:A5", RGBColor(0, 255, 0)); + changeColor(xSheet0, "A6:B10", RGBColor(255, 0, 0)); + changeColor(xSheet0, "B1:B6", RGBColor(0, 0, 255)); + changeColor(xSheet0, "B7", RGBColor(0, 255, 0)); + changeColor(xSheet0, "B8:B10", RGBColor(0, 0, 255)); + changeColor(xSheet0, "C1:C10", RGBColor(0, 0, 255)); + changeColor(xSheet0, "D1:D10", RGBColor(0, 255, 0)); + + uno::Reference<sheet::XUniqueCellFormatRangesSupplier> xUCFRS(xSheet0, uno::UNO_QUERY_THROW); + uno::Reference<container::XEnumerationAccess> xEA(xUCFRS->getUniqueCellFormatRanges(), + uno::UNO_QUERY_THROW); + return xEA->createEnumeration(); +} + +void ScUniqueCellFormatsEnumeration::setUp() +{ + CalcUnoApiTest::setUp(); + m_xComponent = loadFromDesktop("private:factory/scalc"); + CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is()); +} + +void ScUniqueCellFormatsEnumeration::tearDown() +{ + closeDocument(m_xComponent); + CalcUnoApiTest::tearDown(); +} + +void ScUniqueCellFormatsEnumeration::changeColor(const uno::Reference<sheet::XSpreadsheet>& xSheet, + const OUString& sRangeName, const RGBColor& rgb) +{ + uno::Reference<table::XCellRange> xCellRange(xSheet->getCellRangeByName(sRangeName), + uno::UNO_QUERY_THROW); + uno::Reference<beans::XPropertySet> xPropertySet(xCellRange, uno::UNO_QUERY_THROW); + + sal_Int32 nColor = 16777216 + rgb.hashCode(); + uno::Any aValue; + aValue <<= nColor; + xPropertySet->setPropertyValue("CellBackColor", aValue); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScUniqueCellFormatsEnumeration); + +} // namespace sc_apitest + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce index 67dfcf739b30..305801ea20ce 100644 --- a/sc/qa/unoapi/sc_7.sce +++ b/sc/qa/unoapi/sc_7.sce @@ -24,7 +24,6 @@ # -o sc.ScTableRowObj -o sc.ScTableRowsObj # -o sc.ScTableSheetObj --o sc.ScUniqueCellFormatsEnumeration -o sc.ScUniqueCellFormatsObj # -o sc.ScTableSheetsObj -o sc.ScTableValidationObj |