tdf#45904 Move _XMergeable Java Tests to C++

Change-Id: I37dc759a64301810a7d32a3f160b9bcbf546dd01
Reviewed-on: https://gerrit.libreoffice.org/60211
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

5 files changed, 0 insertions, 72 deletions

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index e34817674a7e..cbde0376703a 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -722,7 +722,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/util/_XFlushable \
     qadevOOo/tests/java/ifc/util/_XImportable \
     qadevOOo/tests/java/ifc/util/_XIndent \
-    qadevOOo/tests/java/ifc/util/_XMergeable \
     qadevOOo/tests/java/ifc/util/_XModeSelector \
     qadevOOo/tests/java/ifc/util/_XModifiable \
     qadevOOo/tests/java/ifc/util/_XModifyBroadcaster \
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 c68950d5a7f1..6e73814c7386 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -21,8 +21,6 @@
 "ScCellCursorObj";"com::sun::star::table::CellProperties";"DiagonalTLBR#optional"
 "ScCellCursorObj";"com::sun::star::table::CellProperties";"DiagonalBLTR#optional"
 "ScCellCursorObj";"com::sun::star::table::CellProperties";"ShrinkToFit#optional"
-"ScCellCursorObj";"com::sun::star::util::XMergeable";"merge()"
-"ScCellCursorObj";"com::sun::star::util::XMergeable";"getIsMerged()"
 "ScCellCursorObj";"com::sun::star::util::XSearchable";"createSearchDescriptor()"
 "ScCellCursorObj";"com::sun::star::util::XSearchable";"findAll()"
 "ScCellCursorObj";"com::sun::star::util::XSearchable";"findFirst()"
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 1c44171c7ee6..46426fd1af09 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -21,8 +21,6 @@
 "ScCellRangeObj";"com::sun::star::table::CellProperties";"DiagonalTLBR#optional"
 "ScCellRangeObj";"com::sun::star::table::CellProperties";"DiagonalBLTR#optional"
 "ScCellRangeObj";"com::sun::star::table::CellProperties";"ShrinkToFit#optional"
-"ScCellRangeObj";"com::sun::star::util::XMergeable";"merge()"
-"ScCellRangeObj";"com::sun::star::util::XMergeable";"getIsMerged()"
 "ScCellRangeObj";"com::sun::star::util::XSearchable";"createSearchDescriptor()"
 "ScCellRangeObj";"com::sun::star::util::XSearchable";"findAll()"
 "ScCellRangeObj";"com::sun::star::util::XSearchable";"findFirst()"
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 a195cb4bee9b..992fc793726a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -21,8 +21,6 @@
 "ScTableSheetObj";"com::sun::star::table::CellProperties";"DiagonalTLBR#optional"
 "ScTableSheetObj";"com::sun::star::table::CellProperties";"DiagonalBLTR#optional"
 "ScTableSheetObj";"com::sun::star::table::CellProperties";"ShrinkToFit#optional"
-"ScTableSheetObj";"com::sun::star::util::XMergeable";"merge()"
-"ScTableSheetObj";"com::sun::star::util::XMergeable";"getIsMerged()"
 "ScTableSheetObj";"com::sun::star::util::XSearchable";"createSearchDescriptor()"
 "ScTableSheetObj";"com::sun::star::util::XSearchable";"findAll()"
 "ScTableSheetObj";"com::sun::star::util::XSearchable";"findFirst()"
diff --git a/qadevOOo/tests/java/ifc/util/_XMergeable.java b/qadevOOo/tests/java/ifc/util/_XMergeable.java
deleted file mode 100644
index 011990645044..000000000000
--- a/qadevOOo/tests/java/ifc/util/_XMergeable.java
+++ /dev/null
@@ -1,65 +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.util;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.util.XMergeable;
-
-
-/**
- * Testing <code>com.sun.star.util.XMergeable</code>
- * interface methods :
- * <ul>
- *  <li><code> merge()</code></li>
- *  <li><code> getIsMerged()</code></li>
- * </ul> <p>
- * Test is <b> NOT </b> multithread compliant. <p>
- * @see com.sun.star.util.XMergeable
- */
-public class _XMergeable extends MultiMethodTest {
-
-    public XMergeable oObj = null;                // oObj filled by MultiMethodTest
-
-    /**
-     * Checks the property <code>IsMerged</code> and sets it
-     * to the opposite value. <p>
-     * Has <b> OK </b> status if the property value has changed. <p>
-     */
-    public void _getIsMerged () {
-
-        boolean isMerged = oObj.getIsMerged();
-        oObj.merge(!isMerged);
-        tRes.tested("getIsMerged()", isMerged != oObj.getIsMerged());
-    }
-
-    /**
-     * Checks the property <code>IsMerged</code> and sets it
-     * to the opposite value. <p>
-     * Has <b> OK </b> status if the property value has changed. <p>
-     */
-    public void _merge () {
-
-        boolean isMerged = oObj.getIsMerged();
-        oObj.merge(!isMerged);
-        tRes.tested("merge()", isMerged != oObj.getIsMerged());
-    }
-} // finish class _XMergeable
-
-