[Libreoffice-commits] core.git: 2 commits - qadevOOo/runner ridljar/com ridljar/Jar_ridl.mk

[Stephan Bergmann]

 qadevOOo/runner/util/ValueChanger.java |    7 ------
 ridljar/Jar_ridl.mk                    |    1 
 ridljar/com/sun/star/uno/Union.java    |   37 ---------------------------------
 3 files changed, 45 deletions(-)

New commits:
commit 301764855ed9f4a4c28b98013361f7174e0f7c7b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 15 09:19:55 2015 +0200

    com.sun.star.table.BorderLine is already handled further up
    
    Change-Id: I104c778e107259904fa4a830d3685a6506250fbb

diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
index 5793877..df54d5b 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -641,13 +641,6 @@ public class ValueChanger {
                 newValue = ST6;
             if (oldValue.equals(ST6))
                 newValue = ST1;
-        } else if (oldValue instanceof com.sun.star.table.BorderLine) {
-            com.sun.star.table.BorderLine _newValue = (com.sun.star.table.BorderLine) oldValue;
-            _newValue.Color += 1000;
-            _newValue.InnerLineWidth += 2;
-            _newValue.LineDistance += 3;
-            _newValue.OuterLineWidth += 3;
-            newValue = _newValue;
         } else if (oldValue instanceof com.sun.star.sheet.DataPilotFieldOrientation) {
             com.sun.star.sheet.DataPilotFieldOrientation FO1 = com.sun.star.sheet.DataPilotFieldOrientation.PAGE;
             com.sun.star.sheet.DataPilotFieldOrientation FO2 = com.sun.star.sheet.DataPilotFieldOrientation.COLUMN;
commit 366e1238bd41eecf6727784402592fd5c278fe8f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 15 09:14:53 2015 +0200

    [API CHANGE] Remove deprecated com.sun.star.uno.Union class
    
    ...which had never been useful for anything, as UNOIDL does not have a union
    concept.  In light of coverity#1327215 "UwF: Unwritten field," seems cleaner to
    just remove that class completely than to silence that somewhat bogus (as the
    class is non-final, so derivations could actually set m_value) Coverity warning.
    
    Change-Id: Iaef9003a84e2c2f73adb2744bd759460cb149f68

diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index d76429b..cdee781 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
     ridljar/com/sun/star/uno/IQueryInterface \
     ridljar/com/sun/star/uno/ITypeDescription \
     ridljar/com/sun/star/uno/Type \
-    ridljar/com/sun/star/uno/Union \
     ridljar/com/sun/star/uno/UnoRuntime \
 ))
 
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
deleted file mode 100644
index 4c7da7b..0000000
--- a/ridljar/com/sun/star/uno/Union.java
+++ /dev/null
@@ -1,37 +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 com.sun.star.uno;
-
-/**
- * Deprecated, UNOIDL does not have a union concept.
- */
- at Deprecated
-public class Union {
-    /**
-     * Get the value in the union.
-     * <p>The representation of the value is an any.</p>
-     *  @return the any value.
-     */
-    public final Object getValue() {
-        return m_value;
-    }
-
-    protected Object m_value;
-}
-