[Libreoffice-commits] core.git: 3 commits - nlpsolver/Jar_nlpsolver.mk odk/examples odk/Package_examples.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java ucb/qa wizards/com wizards/Jar_commonwizards.mk
Noel Grandin
noel at peralex.com
Wed Aug 13 00:45:03 PDT 2014
nlpsolver/Jar_nlpsolver.mk | 1
odk/Package_examples.mk | 1
odk/examples/java/Inspector/XMethodParametersDialog.java | 37 ----------
reportbuilder/Jar_reportbuilder.mk | 1
reportbuilder/java/org/libreoffice/report/ReportFunction.java | 35 ---------
ucb/qa/complex/ucb/UCB.java | 4 -
wizards/Jar_commonwizards.mk | 1
wizards/com/sun/star/wizards/common/Desktop.java | 26 -------
wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java | 24 ------
9 files changed, 130 deletions(-)
New commits:
commit b20a5c7be0769c05c645d20b765726b279b4245d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 09:43:19 2014 +0200
fix makefile
after my commit cc6bd12 "java: remove unused enum values"
Change-Id: I9f2f151c0c9a40f39fc235fa65b8324b9cb40027
diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk
index e116be8..5dca8ac 100644
--- a/nlpsolver/Jar_nlpsolver.mk
+++ b/nlpsolver/Jar_nlpsolver.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/ProgressBar \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button \
- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState \
commit d01a7e744016a1f28ccb4376dcc6db16e6fc18d9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Aug 8 13:31:17 2014 +0200
java: remove unused member class
found by UCDetector
Change-Id: Id02478d3d151bd01cea50aeb454c02c2bc4d1baf
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index fc6d158..ad0e161 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -327,32 +327,6 @@ public class Desktop
}
}
- /**
- * @deprecated used to retrieve the most common paths used in the office application
- */
- public class OfficePathRetriever
- {
-
- public String TemplatePath;
- public String BitmapPath;
- public String UserTemplatePath;
- public String WorkPath;
-
- public OfficePathRetriever(XMultiServiceFactory xMSF)
- {
- try
- {
- TemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
- UserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", PropertyNames.EMPTY_STRING);
- BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/../wizard/bitmap");
- WorkPath = FileAccess.getOfficePath(xMSF, "Work", PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING);
- }
- catch (NoValidPathException nopathexception)
- {
- }
- }
- }
-
private static String getTemplatePath(XMultiServiceFactory _xMSF)
{
try
commit 4155c28ae1700e853d598077a08a6ba6c1a94e06
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 09:29:24 2014 +0200
java: remove unused interfaces
found by UCDetector
Change-Id: Ide8b3b5c9969048aff84eed16b9eea096abad349
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 4463c8f..80577e9 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -468,7 +468,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,
java/Inspector/XDialogProvider.java \
java/Inspector/XInstanceInspector.idl \
java/Inspector/XLanguageSourceCodeGenerator.java \
- java/Inspector/XMethodParametersDialog.java \
java/Inspector/XTreeControlProvider.java \
java/Inspector/XTreePathProvider.java \
java/Inspector/XUnoFacetteNode.java \
diff --git a/odk/examples/java/Inspector/XMethodParametersDialog.java b/odk/examples/java/Inspector/XMethodParametersDialog.java
deleted file mode 100644
index 8bad4f1..0000000
--- a/odk/examples/java/Inspector/XMethodParametersDialog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * the BSD license.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Sun Microsystems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *************************************************************************/
-
-public interface XMethodParametersDialog {
-
-}
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 9c40a87..4dd3030 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Jar_add_sourcefiles,reportbuilder,\
reportbuilder/java/org/libreoffice/report/ReportExecutionException \
reportbuilder/java/org/libreoffice/report/ReportExpression \
reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData \
- reportbuilder/java/org/libreoffice/report/ReportFunction \
reportbuilder/java/org/libreoffice/report/ReportJob \
reportbuilder/java/org/libreoffice/report/ReportJobDefinition \
reportbuilder/java/org/libreoffice/report/ReportJobFactory \
diff --git a/reportbuilder/java/org/libreoffice/report/ReportFunction.java b/reportbuilder/java/org/libreoffice/report/ReportFunction.java
deleted file mode 100644
index 668f11c..0000000
--- a/reportbuilder/java/org/libreoffice/report/ReportFunction.java
+++ /dev/null
@@ -1,35 +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 org.libreoffice.report;
-
-/**
- * Functions are statefull computation components.
- *
- * Functions are allowed to have a state, but are considered
- * immutable (the same is true for expressions). Functions are
- * allowed to update their state on every call to 'advance', which
- * signals, that the cursor has been moved.
- *
- * Functions have no way to 'reset' their state, if a reset is needed,
- * the report engine is urged to query a new instance from the ReportAddin.
- */
-public interface ReportFunction extends ReportExpression
-{
-
- public ReportFunction advance(DataRow row);
-}
diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index 7c2ed71..be511c9 100644
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.java
@@ -104,10 +104,6 @@ public class UCB {
return ucb.queryContent(id);
}
- public static interface Verifier {
- public boolean verify(Object object);
- }
-
@Test public void checkWrongFtpConnection() {
try {
String acountUrl = "ftp://noname:nopasswd@*nohost.invalid";
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index a13a114..3932223 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
wizards/com/sun/star/wizards/ui/UIConsts \
wizards/com/sun/star/wizards/ui/UnoDialog \
wizards/com/sun/star/wizards/ui/UnoDialog2 \
- wizards/com/sun/star/wizards/ui/XCommandSelectionListener \
wizards/com/sun/star/wizards/ui/XFieldSelectionListener \
wizards/com/sun/star/wizards/ui/XPathSelectionListener \
wizards/com/sun/star/wizards/ui/XCompletion \
diff --git a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java b/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
deleted file mode 100644
index 2731e0b..0000000
--- a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
+++ /dev/null
@@ -1,24 +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.wizards.ui;
-
-public interface XCommandSelectionListener
-{
- public void CommandSelected(String CommandName);
-}
More information about the Libreoffice-commits
mailing list