[Libreoffice-commits] core.git: chart2/qa chart2/source qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Stephan Bergmann
sbergman at redhat.com
Tue Jan 24 12:38:35 UTC 2017
chart2/qa/unoapi/sch.sce | 1
chart2/source/controller/accessibility/AccStatisticsObject.cxx | 52 -----
chart2/source/controller/accessibility/AccStatisticsObject.hxx | 47 ----
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sch/com.sun.star.comp.chart.AccStatisticsObject.csv | 25 --
qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 103 ----------
6 files changed, 229 deletions(-)
New commits:
commit 80cec5faa5c69d4cf01dd7fc8a7e0dc1ed6f73ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 24 13:37:59 2017 +0100
AccStatisticsObject is apparently dead code
Change-Id: I4e04b13538d1242ea38d1400df0ced813171bc5e
diff --git a/chart2/qa/unoapi/sch.sce b/chart2/qa/unoapi/sch.sce
index 54419b5..54842bf 100644
--- a/chart2/qa/unoapi/sch.sce
+++ b/chart2/qa/unoapi/sch.sce
@@ -25,7 +25,6 @@
#i79073 -o sch.AccGrid
#i79073 -o sch.AccLegend
#i79073 -o sch.AccLegendEntry
-#i79073 -o sch.AccStatisticsObject
#i79073 -o sch.AccTitle
#i79073 -o sch.AccWall
#i79073 -o sch.AccessibleDocumentView
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
deleted file mode 100644
index fbdc160..0000000
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include "AccStatisticsObject.hxx"
-#include <vcl/svapp.hxx>
-#include <svx/svditer.hxx>
-
-namespace chart
-{
-
-AccStatisticsObject::AccStatisticsObject( const AccessibleElementInfo& rAccInfo )
- : AccessibleChartElement( rAccInfo, false/*NoChildren*/, true/*AlwaysTransparent*/ )
-
-{
- SolarMutexGuard aSolarGuard;
-}
-
-AccStatisticsObject::~AccStatisticsObject()
-{
-}
-
-OUString SAL_CALL AccStatisticsObject::getAccessibleName()
- throw (css::uno::RuntimeException)
-{
- return getToolTipText();
-}
-
-OUString SAL_CALL AccStatisticsObject::getImplementationName()
- throw (css::uno::RuntimeException)
-{
- return OUString( "StatisticsObject" );
-}
-
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
deleted file mode 100644
index 4688ae4..0000000
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_ACCSTATISTICSOBJECT_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_ACCSTATISTICSOBJECT_HXX
-
-#include "AccessibleChartElement.hxx"
-
-#include "ObjectIdentifier.hxx"
-
-namespace chart
-{
-
-class AccStatisticsObject : public AccessibleChartElement
-{
-public:
- explicit AccStatisticsObject( const AccessibleElementInfo& rAccInfo );
-
- virtual ~AccStatisticsObject();
-
- // ________ XAccessibleContext ________
- virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException);
-
- // ________ XServiceInfo ________
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
-};
-
-} // accessibility
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 7708c34..869d17a 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1024,7 +1024,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sch/AccGrid \
qadevOOo/tests/java/mod/_sch/AccLegend \
qadevOOo/tests/java/mod/_sch/AccLegendEntry \
- qadevOOo/tests/java/mod/_sch/AccStatisticsObject \
qadevOOo/tests/java/mod/_sch/AccTitle \
qadevOOo/tests/java/mod/_sch/AccWall \
qadevOOo/tests/java/mod/_sch/ChartArea \
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.chart.AccStatisticsObject.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.chart.AccStatisticsObject.csv
deleted file mode 100644
index a0b7888..0000000
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.chart.AccStatisticsObject.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"removeEventListener()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"containsPoint()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getAccessibleAtPoint()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getBounds()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getLocation()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getLocationOnScreen()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getSize()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"grabFocus()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getForeground()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleComponent";"getBackground()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessible";"getAccessibleContext()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleChildCount()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleChild()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleParent()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleIndexInParent()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleRole()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleDescription()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleName()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleRelationSet()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleStateSet()"
-"AccStatisticsObject";"com::sun::star::accessibility::XAccessibleContext";"getLocale()"
diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
deleted file mode 100644
index 82f380c..0000000
--- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
+++ /dev/null
@@ -1,103 +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._sch;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.AccessibilityTools;
-import util.SOfficeFactory;
-import util.utils;
-
-import com.sun.star.accessibility.AccessibleRole;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleComponent;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.awt.XWindow;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.chart.XChartDocument;
-import com.sun.star.frame.XModel;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-public class AccStatisticsObject extends TestCase {
-
- XChartDocument xChartDoc = null;
-
- @Override
- protected TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) throws Exception {
-
- if (xChartDoc != null) cleanup(Param, log);
- log.println( "creating a chart document" );
- SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
- log.println( "creating a chartdocument" );
- xChartDoc = SOF.createChartDoc();
- log.println("Display MeanValue");
- XPropertySet diagProps = UnoRuntime.queryInterface(XPropertySet.class, xChartDoc.getDiagram());
- diagProps.setPropertyValue("MeanValue",Boolean.TRUE);
-
- XInterface oObj = null;
-
- XModel aModel = UnoRuntime.queryInterface(XModel.class, xChartDoc);
-
- XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
- XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-
- XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
- xRoot, AccessibleRole.SHAPE, "", "AccStatisticsObject");
-
-
- oObj = cont;
-
- log.println("ImplementationName " + utils.getImplName(oObj));
- log.println("AccessibleName " + cont.getAccessibleName());
-
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- final XAccessibleComponent acc = UnoRuntime.queryInterface(
- XAccessibleComponent.class,oObj);
- tEnv.addObjRelation("EventProducer",
- new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
- public void fireEvent() {
- acc.grabFocus();
- }
- });
-
- return tEnv;
-
- }
-
- /**
- * Called while disposing a <code>TestEnvironment</code>.
- * Disposes text document.
- * @param Param test parameters
- * @param log writer to log information while testing
- */
- @Override
- protected void cleanup( TestParameters Param, PrintWriter log) {
- if( xChartDoc!=null ) {
- log.println( " closing xChartDoc" );
- util.DesktopTools.closeDoc(xChartDoc);
- xChartDoc = null;
- }
- }
-
-}
More information about the Libreoffice-commits
mailing list