[Libreoffice-commits] core.git: 2 commits - bean/com bean/Jar_officebean.mk connectivity/com connectivity/qa extensions/qa forms/qa framework/qa nlpsolver/src nlpsolver/ThirdParty odk/examples qadevOOo/runner reportbuilder/Jar_reportbuilder.mk reportbuilder/java scripting/java scripting/workben sfx2/qa swext/mediawiki sw/qa toolkit/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Wed Aug 13 01:24:48 PDT 2014
bean/Jar_officebean.mk | 1
bean/com/sun/star/beans/ContainerFactory.java | 7
bean/com/sun/star/beans/LocalOfficeConnection.java | 13
bean/com/sun/star/beans/LocalOfficeWindow.java | 2
bean/com/sun/star/beans/OfficeConnection.java | 20
bean/com/sun/star/beans/OfficeWindow.java | 46 -
bean/com/sun/star/comp/beans/ContainerFactory.java | 7
bean/com/sun/star/comp/beans/Controller.java | 8
bean/com/sun/star/comp/beans/OOoBean.java | 187 -----
bean/com/sun/star/comp/beans/OfficeConnection.java | 8
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java | 11
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java | 4
connectivity/qa/connectivity/tools/sdb/Connection.java | 18
extensions/qa/integration/extensions/MethodHandler.java | 5
forms/qa/complex/forms/CheckOGroupBoxModel.java | 5
forms/qa/integration/forms/DocumentHelper.java | 21
forms/qa/integration/forms/DocumentType.java | 17
forms/qa/integration/forms/DocumentViewHelper.java | 30
forms/qa/integration/forms/FormComponent.java | 18
forms/qa/integration/forms/FormLayer.java | 41 -
forms/qa/org/openoffice/xforms/Instance.java | 39 -
forms/qa/org/openoffice/xforms/Model.java | 5
framework/qa/complex/framework/autosave/ConfigHelper.java | 15
framework/qa/complex/framework/autosave/Protocol.java | 65 -
framework/qa/complex/framework/recovery/RecoveryTools.java | 28
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java | 14
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java | 16
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java | 22
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java | 13
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java | 44 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java | 7
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 13
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java | 5
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java | 50 -
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java | 5
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java | 11
odk/examples/DevelopersGuide/Charts/Helper.java | 5
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 66 -
odk/examples/DevelopersGuide/Database/RowSet.java | 12
odk/examples/DevelopersGuide/Database/Sales.java | 64 -
odk/examples/DevelopersGuide/Drawing/PageHelper.java | 32
odk/examples/DevelopersGuide/Forms/DocumentHelper.java | 6
odk/examples/DevelopersGuide/Forms/DocumentType.java | 16
odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java | 10
odk/examples/DevelopersGuide/Forms/FLTools.java | 58 -
odk/examples/DevelopersGuide/Forms/FormLayer.java | 16
odk/examples/DevelopersGuide/Forms/HsqlDatabase.java | 34
odk/examples/DevelopersGuide/Forms/InteractionRequest.java | 7
odk/examples/DevelopersGuide/Forms/SpreadsheetView.java | 23
odk/examples/DevelopersGuide/Forms/UNO.java | 5
odk/examples/DevelopersGuide/GUI/UnoDialogSample.java | 88 --
odk/examples/DevelopersGuide/GUI/UnoMenu.java | 5
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 114 ---
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java | 75 --
odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java | 5
odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java | 32
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java | 18
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java | 23
odk/examples/java/Inspector/HideableTreeModel.java | 37
odk/examples/java/Inspector/Inspector.java | 13
odk/examples/java/Inspector/Introspector.java | 17
odk/examples/java/Inspector/SourceCodeGenerator.java | 8
odk/examples/java/Inspector/UnoNode.java | 4
odk/examples/java/Inspector/XDialogProvider.java | 2
odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java | 6
odk/examples/java/Inspector/XTreePathProvider.java | 2
odk/examples/java/Spreadsheet/CalcAddins.java | 18
qadevOOo/runner/complexlib/Assurance.java | 203 -----
qadevOOo/runner/convwatch/DBHelper.java | 37
qadevOOo/runner/convwatch/DirectoryHelper.java | 8
qadevOOo/runner/convwatch/FileHelper.java | 7
qadevOOo/runner/convwatch/FilenameHelper.java | 8
qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java | 11
qadevOOo/runner/convwatch/HTMLOutputter.java | 155 ----
qadevOOo/runner/convwatch/INIOutputter.java | 5
qadevOOo/runner/convwatch/IniFile.java | 81 --
qadevOOo/runner/convwatch/LISTOutputter.java | 12
qadevOOo/runner/convwatch/OfficePrint.java | 28
qadevOOo/runner/convwatch/PRNCompare.java | 23
qadevOOo/runner/convwatch/PixelCounter.java | 18
qadevOOo/runner/graphical/BuildID.java | 21
qadevOOo/runner/graphical/DirectoryHelper.java | 8
qadevOOo/runner/graphical/FileHelper.java | 63 -
qadevOOo/runner/graphical/IniFile.java | 5
qadevOOo/runner/graphical/JPEGCreator.java | 10
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 50 -
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 196 -----
qadevOOo/runner/graphical/PixelCounter.java | 24
qadevOOo/runner/helper/ConfigHelper.java | 22
qadevOOo/runner/helper/ConfigurationRead.java | 30
qadevOOo/runner/helper/FileTools.java | 12
qadevOOo/runner/helper/ProcessHandler.java | 40 -
qadevOOo/runner/helper/StringHelper.java | 18
qadevOOo/runner/helper/URLHelper.java | 73 -
qadevOOo/runner/lib/Parameters.java | 38 -
qadevOOo/runner/lib/Status.java | 8
qadevOOo/runner/util/AccessibilityTools.java | 47 -
qadevOOo/runner/util/DBTools.java | 124 ---
qadevOOo/runner/util/DesktopTools.java | 22
qadevOOo/runner/util/DrawTools.java | 17
qadevOOo/runner/util/DynamicClassLoader.java | 17
qadevOOo/runner/util/FormTools.java | 17
qadevOOo/runner/util/SOfficeFactory.java | 161 ----
qadevOOo/runner/util/SysUtils.java | 69 -
qadevOOo/runner/util/UITools.java | 372 ----------
qadevOOo/runner/util/XMLTools.java | 126 ---
qadevOOo/runner/util/compare/DocComparator.java | 6
qadevOOo/runner/util/compare/GraphicalComparator.java | 19
qadevOOo/runner/util/dbg.java | 44 -
qadevOOo/runner/util/utils.java | 101 --
reportbuilder/Jar_reportbuilder.mk | 3
reportbuilder/java/org/libreoffice/report/ImageService.java | 13
reportbuilder/java/org/libreoffice/report/InputRepository.java | 2
reportbuilder/java/org/libreoffice/report/JobProgressIndicator.java | 69 -
reportbuilder/java/org/libreoffice/report/OutputRepository.java | 2
reportbuilder/java/org/libreoffice/report/ParameterMap.java | 27
reportbuilder/java/org/libreoffice/report/ReportAddIn.java | 36
reportbuilder/java/org/libreoffice/report/ReportEngineMetaData.java | 25
reportbuilder/java/org/libreoffice/report/ReportExpression.java | 42 -
reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java | 14
reportbuilder/java/org/libreoffice/report/ReportJob.java | 23
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn.java | 6
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java | 18
reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java | 32
reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression.java | 3
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext.java | 10
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java | 7
reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java | 5
scripting/java/com/sun/star/script/framework/browse/DialogFactory.java | 54 -
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 15
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 43 -
scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 4
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java | 14
scripting/java/org/openoffice/idesupport/JavaFinder.java | 10
scripting/java/org/openoffice/idesupport/LocalOffice.java | 36
scripting/java/org/openoffice/idesupport/OfficeInstallation.java | 15
scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java | 44 -
scripting/workben/ifc/scripting/ScriptingUtils.java | 6
scripting/workben/ifc/scripting/SecurityDialogUtil.java | 9
scripting/workben/installer/FileUpdater.java | 64 -
scripting/workben/installer/IdeUpdater.java | 46 -
scripting/workben/installer/IdeVersion.java | 4
scripting/workben/installer/InstUtil.java | 10
scripting/workben/installer/InstallWizard.java | 40 -
scripting/workben/installer/NavPanel.java | 10
scripting/workben/installer/Version.java | 4
scripting/workben/installer/XmlUpdater.java | 33
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 84 --
sw/qa/complex/writer/TextPortionEnumerationTest.java | 1
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 51 -
swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java | 6
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 29
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 32
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 21
toolkit/qa/complex/toolkit/Assert.java | 25
wizards/com/sun/star/wizards/common/Configuration.java | 65 -
wizards/com/sun/star/wizards/common/DebugHelper.java | 6
wizards/com/sun/star/wizards/common/Desktop.java | 122 ---
wizards/com/sun/star/wizards/common/FileAccess.java | 317 --------
wizards/com/sun/star/wizards/common/Helper.java | 74 -
wizards/com/sun/star/wizards/common/JavaTools.java | 107 --
wizards/com/sun/star/wizards/common/NamedValueCollection.java | 20
wizards/com/sun/star/wizards/common/NumberFormatter.java | 5
wizards/com/sun/star/wizards/common/NumericalHelper.java | 369 ---------
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 87 --
wizards/com/sun/star/wizards/common/Resource.java | 13
wizards/com/sun/star/wizards/common/SystemDialog.java | 55 -
wizards/com/sun/star/wizards/common/TemplateElement.java | 2
wizards/com/sun/star/wizards/db/CommandMetaData.java | 117 ---
wizards/com/sun/star/wizards/db/DBMetaData.java | 44 -
wizards/com/sun/star/wizards/db/FieldColumn.java | 12
wizards/com/sun/star/wizards/db/QueryMetaData.java | 25
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 15
wizards/com/sun/star/wizards/db/TableDescriptor.java | 27
wizards/com/sun/star/wizards/db/TypeInspector.java | 23
wizards/com/sun/star/wizards/document/DatabaseControl.java | 8
wizards/com/sun/star/wizards/document/FormHandler.java | 77 --
wizards/com/sun/star/wizards/document/OfficeDocument.java | 148 ---
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 7
wizards/com/sun/star/wizards/form/Finalizer.java | 5
wizards/com/sun/star/wizards/form/FormConfiguration.java | 8
wizards/com/sun/star/wizards/form/FormControlArranger.java | 13
wizards/com/sun/star/wizards/form/StyleApplier.java | 74 -
wizards/com/sun/star/wizards/form/UIControlArranger.java | 24
wizards/com/sun/star/wizards/query/Finalizer.java | 6
wizards/com/sun/star/wizards/report/CallReportWizard.java | 25
wizards/com/sun/star/wizards/report/DBColumn.java | 9
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 22
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 55 -
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 5
wizards/com/sun/star/wizards/table/FieldFormatter.java | 125 ---
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 25
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 22
wizards/com/sun/star/wizards/text/TextDocument.java | 121 ---
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 32
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 19
wizards/com/sun/star/wizards/text/TextTableHandler.java | 26
wizards/com/sun/star/wizards/ui/ButtonList.java | 48 -
wizards/com/sun/star/wizards/ui/ControlScroller.java | 32
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 8
wizards/com/sun/star/wizards/ui/FieldSelection.java | 16
wizards/com/sun/star/wizards/ui/FilterComponent.java | 12
wizards/com/sun/star/wizards/ui/PeerConfig.java | 30
wizards/com/sun/star/wizards/ui/SortingComponent.java | 21
wizards/com/sun/star/wizards/ui/UnoDialog.java | 155 ----
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 74 -
wizards/com/sun/star/wizards/ui/WizardDialog.java | 101 --
wizards/com/sun/star/wizards/ui/XCompletion.java | 4
wizards/com/sun/star/wizards/ui/event/DataAware.java | 28
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 9
wizards/com/sun/star/wizards/ui/event/Task.java | 26
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 62 -
xmerge/source/bridge/java/XMergeBridge.java | 18
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 72 -
xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java | 22
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 9
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java | 51 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java | 73 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java | 51 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 46 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 25
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java | 14
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java | 41 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 44 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java | 9
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 15
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java | 11
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java | 17
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java | 16
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 50 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java | 10
231 files changed, 408 insertions(+), 8218 deletions(-)
New commits:
commit 77fb64eb36d4c1f82c3fee81b83bfe338e6cf1a0
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 11 09:16:20 2014 +0200
connectivity: remove pre-Java1.5 workaround
Change-Id: Ie35a308d012e75e3aa73dc81d06f0a39a881760b
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 866f550..c1d22a8 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -58,16 +58,7 @@ final class NativeLibraries {
URL url = ((URLClassLoader) cl).findResource(sysname);
if (url != null) {
try {
- System.load(
- File.class.getConstructor(
- new Class[] {
- ClassLoader.getSystemClassLoader().
- loadClass("java.net.URI") }).
- newInstance(
- new Object[] {
- URL.class.getMethod("toURI", new Class[0]).
- invoke(url, (java.lang.Object[])null) }).
- getAbsolutePath());
+ System.load(new File(url.toURI()).getAbsolutePath());
} catch (Throwable t) {
throw new UnsatisfiedLinkError(
e.toString()+ " - " + t.toString());
commit 34bcf9b498bccb5c924f4cec850ff15d88df6f07
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 13 10:08:31 2014 +0200
java: remove dead methods
found by UCDetector
Change-Id: I219caa8e680dba5a395541a778df6144841c4dde
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 85278831..d7883a5 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Jar_add_sourcefiles,officebean,\
bean/com/sun/star/beans/NativeConnection \
bean/com/sun/star/beans/NativeService \
bean/com/sun/star/beans/OfficeConnection \
- bean/com/sun/star/beans/OfficeWindow \
bean/com/sun/star/comp/beans/ContainerFactory \
bean/com/sun/star/comp/beans/Controller \
bean/com/sun/star/comp/beans/Frame \
diff --git a/bean/com/sun/star/beans/ContainerFactory.java b/bean/com/sun/star/beans/ContainerFactory.java
index e3c0c9d..7b8e93f 100644
--- a/bean/com/sun/star/beans/ContainerFactory.java
+++ b/bean/com/sun/star/beans/ContainerFactory.java
@@ -29,10 +29,5 @@ import java.awt.Container;
public interface ContainerFactory
{
- /**
- * Creates an AWT container.
- *
- * @return An AWT container.
- */
- Container createContainer();
+
}
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index b4b5935..34c33f9 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -159,19 +159,6 @@ public class LocalOfficeConnection
}
/**
- * Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
- *
- * @param container This is an AWT container.
- * @return The office window instance.
- */
- public OfficeWindow createOfficeWindow(Container container)
- {
- return new LocalOfficeWindow(this);
- }
-
- /**
* Closes the connection.
*/
public void dispose()
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 63dc9ce..0d2021b 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -42,7 +42,7 @@ import com.sun.star.uno.XComponentContext;
*/
public class LocalOfficeWindow
extends java.awt.Canvas
- implements OfficeWindow, XEventListener
+ implements XEventListener
{
private transient OfficeConnection mConnection;
private transient XWindowPeer mParentProxy;
diff --git a/bean/com/sun/star/beans/OfficeConnection.java b/bean/com/sun/star/beans/OfficeConnection.java
index 4301600..272d237 100644
--- a/bean/com/sun/star/beans/OfficeConnection.java
+++ b/bean/com/sun/star/beans/OfficeConnection.java
@@ -39,13 +39,7 @@ public interface OfficeConnection
void setUnoUrl(String url)
throws java.net.MalformedURLException;
- /**
- * Sets an AWT container catory.
- *
- * @param containerFactory This is a application provided AWT container
- * factory.
- */
- void setContainerFactory(ContainerFactory containerFactory);
+
/**
* Retrieves the UNO component context.
@@ -56,15 +50,5 @@ public interface OfficeConnection
*/
XComponentContext getComponentContext();
- /**
- * Creates an office window.
- * The window is either a sub-class of java.awt.Canvas (local) or
- * java.awt.Container (RVP).
- *
- * This method does not add add the office window to its container.
- *
- * @param container This is an AWT container.
- * @return The office window instance.
- */
- OfficeWindow createOfficeWindow(Container container);
+
}
diff --git a/bean/com/sun/star/beans/OfficeWindow.java b/bean/com/sun/star/beans/OfficeWindow.java
deleted file mode 100644
index ebc46b8..0000000
--- a/bean/com/sun/star/beans/OfficeWindow.java
+++ /dev/null
@@ -1,46 +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.beans;
-
-import java.awt.Component;
-
-import com.sun.star.awt.XWindowPeer;
-
-/**
- * The concreate implementation of the OfficeWindow extends an
- * approperate type of visual component (java.awt.Canvas for local
- * and java.awt.Container for remote).
- * @deprecated
- */
-public interface OfficeWindow
-{
- /**
- * Retrieves an AWT component object associated with the OfficeWindow.
- *
- * @return The AWT component object associated with the OfficeWindow.
- */
- Component getAWTComponent();
-
- /**
- * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
- *
- * @return The UNO XWindowPeer object associated with the OfficeWindow.
- */
- XWindowPeer getUNOWindowPeer();
-}
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/com/sun/star/comp/beans/ContainerFactory.java
index d06a082..8e54884 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -29,10 +29,5 @@ import java.awt.Container;
public interface ContainerFactory
{
- /**
- * Creates an AWT container.
- *
- * @return An AWT container.
- */
- Container createContainer();
+
}
diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/com/sun/star/comp/beans/Controller.java
index 9e93c58..4a68980 100644
--- a/bean/com/sun/star/comp/beans/Controller.java
+++ b/bean/com/sun/star/comp/beans/Controller.java
@@ -83,13 +83,7 @@ public class Controller
// com.sun.star.frame.XDispatchProvider
- public com.sun.star.frame.XDispatch queryDispatch(
- /*IN*/ com.sun.star.util.URL aURL,
- /*IN*/ String aTargetFrameName,
- /*IN*/ int nSearchFlags )
- {
- return xDispatchProvider.queryDispatch( aURL, aTargetFrameName, nSearchFlags );
- }
+
public com.sun.star.frame.XDispatch[] queryDispatches(
/*IN*/ com.sun.star.frame.DispatchDescriptor[] aRequests )
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 85daec2..1357f6a 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -181,25 +181,7 @@ public class OOoBean
xConnectionListener = this.new EventListener("setOOoConnection");
}
- // @requirement FUNC.CON.STRT/0.4
- /** Starts a connection to an OOo instance which is lauched if not running.
- @throws HasConnectionException
- if a connection was already established.
-
- @throws NoConnectionException
- if the specified connection cannot be established
- */
- public void startOOoConnection( String aConnectionURL )
- throws java.net.MalformedURLException,
- HasConnectionException,
- NoConnectionException
- {
- // create a new connection from the given connection URL
- LocalOfficeConnection aConnection = new LocalOfficeConnection();
- aConnection.setUnoUrl( aConnectionURL );
- setOOoConnection( aConnection );
- }
// @requirement FUNC.CON.CHK/0.7
/** Returns true if this OOoBean is connected to an OOo instance,
@@ -331,31 +313,7 @@ public class OOoBean
return xDesktop;
}
- /** Resets this bean to an empty document.
-
- If a document is loaded and the content modified,
- the changes are dismissed. Otherwise nothing happens.
-
- This method is intended to be overridden in derived classes.
- This implementation simply calls clear.
- @param bClearStateToo
- Not only the document content but also the state of the bean,
- like visibility of child components is cleared.
-
- @deprecated There is currently no way to dismiss changes, except for loading
- of the unchanged initial document. Furthermore it is unclear how derived classes
- handle this and what exactly their state is (e.g. what members make up their state).
- Calling this method on a derived class requires knowledge about their implementation.
- Therefore a deriving class should declare their own clearDocument if needed. Clients
- should call the clearDocument of the deriving class or {@link #clear} which discards
- the currently displayed document.
- */
- public synchronized void clearDocument( boolean bClearStateToo )
- {
- // TBD
- clear();
- }
/** Resets the OOoBean to an empty status.
@@ -696,79 +654,9 @@ public class OOoBean
}
}
- /** Loads a document from a Java stream.
-
- See loadFromURL() for further information.
- */
- public void loadFromStream(
- final java.io.InputStream iInStream,
- final com.sun.star.beans.PropertyValue aArguments[] )
- throws
- // @requirement FUNC.CON.LOST/0.2
- NoConnectionException,
- java.io.IOException,
- com.sun.star.lang.IllegalArgumentException,
- com.sun.star.util.CloseVetoException
- {
- // wrap Java stream into UNO stream
-
- // copy stream....
- int s = 4096;
- int r=0 ,n = 0;
- byte[] buffer = new byte[s];
- byte[] newBuffer = null;
- while ((r = iInStream.read(buffer, n, buffer.length-n))>0) {
- n += r;
- if (iInStream.available() > buffer.length - n) {
- newBuffer = new byte[buffer.length*2];
- System.arraycopy(buffer, 0, newBuffer, 0, n);
- buffer = newBuffer;
- }
- }
- if (buffer.length != n) {
- newBuffer = new byte[n];
- System.arraycopy(buffer, 0, newBuffer, 0, n);
- buffer = newBuffer;
- }
- com.sun.star.io.XInputStream xStream =
- new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(buffer);
- // add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
- // call normal load method
- loadFromURL( "private:stream", aExtendedArguments );
- }
- /** Loads a document from a byte array.
-
- See loadFromURL() for further information.
- */
- public void loadFromByteArray(
- final byte aInBuffer[],
- final com.sun.star.beans.PropertyValue aArguments[] )
- throws
- // @requirement FUNC.CON.LOST/0.2
- NoConnectionException,
- java.io.IOException,
- com.sun.star.lang.IllegalArgumentException,
- com.sun.star.util.CloseVetoException
- {
- // wrap byte arrray into UNO stream
- com.sun.star.io.XInputStream xStream =
- new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(
- aInBuffer );
-
- // add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "InputStream", -1, xStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
-
- // call normal load method
- loadFromURL( "private:stream", aExtendedArguments );
- }
/** Stores a document to the given URL.
<p>
@@ -831,84 +719,9 @@ public class OOoBean
{ throw new NoConnectionException(); }
}
- /** Stores a document to a stream.
- See {@link #storeToURL storeToURL} for further information.
- @see #storeToURL storeToURL
- */
- public java.io.OutputStream storeToStream(
- java.io.OutputStream aOutStream,
- final com.sun.star.beans.PropertyValue aArguments[] )
- throws
- // @requirement FUNC.CON.LOST/0.2
- NoConnectionException,
- NoDocumentException,
- java.io.IOException,
- com.sun.star.lang.IllegalArgumentException
- {
- // wrap Java stream into UNO stream
- com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter aStream =
- new com.sun.star.lib.uno.adapter.OutputStreamToXOutputStreamAdapter(
- aOutStream );
-
- // add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
-
- // call normal store method
- storeToURL( "private:stream", aExtendedArguments );
-
- // get byte array from document stream
- try { aStream.closeOutput(); }
- catch ( com.sun.star.io.NotConnectedException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.BufferSizeExceededException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.IOException aExc )
- { throw new java.io.IOException(); }
- return aOutStream;
- }
- /** Stores a document to a byte array.
-
- See {@link #storeToURL storeToURL} for further information.
- @see #storeToURL storeToURL
- */
- public byte[] storeToByteArray(
- byte aOutBuffer[],
- final com.sun.star.beans.PropertyValue aArguments[] )
- throws
- // @requirement FUNC.CON.LOST/0.2
- NoConnectionException,
- NoDocumentException,
- java.io.IOException,
- com.sun.star.lang.IllegalArgumentException
- {
- // wrap byte arrray into UNO stream
- com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream =
- new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter(
- aOutBuffer );
-
- // add stream to arguments
- com.sun.star.beans.PropertyValue[] aExtendedArguments =
- addArgument( aArguments, new com.sun.star.beans.PropertyValue(
- "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) );
-
- // call normal store method
- storeToURL( "private:stream", aExtendedArguments );
-
- // get byte array from document stream
- try { aStream.closeOutput(); }
- catch ( com.sun.star.io.NotConnectedException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.BufferSizeExceededException aExc )
- { /* TDB */ }
- catch ( com.sun.star.io.IOException aExc )
- { throw new java.io.IOException(); }
- return aStream.getBuffer();
- }
// @requirement FUNC.BEAN.PROG/0.5
// @requirement API.SIM.SEAP/0.2
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 2786810..ec239d4 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -40,13 +40,7 @@ public interface OfficeConnection
void setUnoUrl(String url)
throws java.net.MalformedURLException;
- /**
- * Sets an AWT container catory.
- *
- * @param containerFactory This is a application provided AWT container
- * factory.
- */
- void setContainerFactory(ContainerFactory containerFactory);
+
/**
* Retrieves the UNO component context.
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index b2e0816..679d41e 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
@@ -56,11 +56,11 @@ public class NativeStorageAccess {
public native int read(String name,String key,byte[] b, int off, int len) throws java.io.IOException;
- public native int readInt(String name,String key) throws java.io.IOException;
+
public native void seek(String name,String key,long position) throws java.io.IOException;
public native void write(String name,String key,byte[] b, int offset, int length) throws java.io.IOException;
- public native void writeInt(String name,String key,int v) throws java.io.IOException;
+
}
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
index f530fa9..e3c006a 100644
--- a/connectivity/qa/connectivity/tools/sdb/Connection.java
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
@@ -48,24 +48,6 @@ public class Connection
return m_connection;
}
- public boolean execute( final String _sql ) throws SQLException
- {
- XStatement statement = createStatement();
- return statement.execute( _sql );
- }
-
- public XResultSet executeQuery( final String _sql ) throws SQLException
- {
- XStatement statement = createStatement();
- return statement.executeQuery( _sql );
- }
-
- public int executeUpdate( final String _sql ) throws SQLException
- {
- XStatement statement = createStatement();
- return statement.executeUpdate( _sql );
- }
-
public void refreshTables()
{
final XTablesSupplier suppTables = UnoRuntime.queryInterface(XTablesSupplier.class, m_connection);
diff --git a/extensions/qa/integration/extensions/MethodHandler.java b/extensions/qa/integration/extensions/MethodHandler.java
index 56eda09..c362016 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -50,10 +50,7 @@ public class MethodHandler implements XPropertyHandler
}
}
- static public XSingleComponentFactory getFactory()
- {
- return new ComponentFactory( MethodHandler.class );
- }
+
public void actuatingPropertyChanged(String _propertyName, Object _newValue, Object _oldValue, com.sun.star.inspection.XObjectInspectorUI _objectInspectorUI, boolean _firstTimeInit) throws com.sun.star.lang.NullPointerException
{
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 987af13..6f048a6 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -179,10 +179,7 @@ public class CheckOGroupBoxModel
return propertiesChanged;
}
- public void reset()
- {
- propertiesChanged = false;
- }
+
}
private XMultiServiceFactory getMSF()
diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java
index cbbb73d..41e6205 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -108,11 +108,7 @@ public class DocumentHelper
return blankDocument( orb, DocumentType.WRITER );
}
- /* ------------------------------------------------------------------ */
- public static DocumentHelper blankXMLForm( XMultiServiceFactory orb ) throws com.sun.star.uno.Exception
- {
- return blankDocument( orb, DocumentType.XMLFORM );
- }
+
/* ------------------------------------------------------------------ */
public static DocumentHelper blankDocument( XMultiServiceFactory orb, DocumentType eType ) throws com.sun.star.uno.Exception
@@ -260,22 +256,7 @@ public class DocumentHelper
return createSubForm( xContainer, sInitialName );
}
- /* ------------------------------------------------------------------ */
- /** retrieves the document model which a given form component belongs to
- */
- static public DocumentHelper getDocumentForComponent( Object aFormComponent, XMultiServiceFactory orb )
- {
- XChild xChild = UnoRuntime.queryInterface( XChild.class, aFormComponent );
- XModel xModel = null;
- while ( ( null != xChild ) && ( null == xModel ) )
- {
- XInterface xParent = (XInterface)xChild.getParent();
- xModel = UnoRuntime.queryInterface( XModel.class, xParent );
- xChild = UnoRuntime.queryInterface( XChild.class, xParent );
- }
- return new DocumentHelper( orb, xModel );
- }
/* ------------------------------------------------------------------ */
/** returns a URL which can be used to create a document of a certain type
diff --git a/forms/qa/integration/forms/DocumentType.java b/forms/qa/integration/forms/DocumentType.java
index 94e2fa4..105c31f 100644
--- a/forms/qa/integration/forms/DocumentType.java
+++ b/forms/qa/integration/forms/DocumentType.java
@@ -26,10 +26,7 @@ public class DocumentType extends com.sun.star.uno.Enum
super( value );
}
- public static DocumentType getDefault()
- {
- return WRITER;
- }
+
public static final DocumentType WRITER = new DocumentType(0);
public static final DocumentType CALC = new DocumentType(1);
@@ -37,16 +34,6 @@ public class DocumentType extends com.sun.star.uno.Enum
public static final DocumentType XMLFORM = new DocumentType(3);
public static final DocumentType UNKNOWN = new DocumentType(-1);
- public static DocumentType fromInt(int value)
- {
- switch(value)
- {
- case 0: return WRITER;
- case 1: return CALC;
- case 2: return DRAWING;
- case 3: return XMLFORM;
- default: return UNKNOWN;
- }
- }
+
}
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index b2b06ca..4026ba3 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -213,36 +213,6 @@ public class DocumentViewHelper
xControlWindow.setFocus();
}
- /* ------------------------------------------------------------------ */
- /** sets the focus to the first control
- */
- protected void grabControlFocus( ) throws java.lang.Exception
- {
- // the forms container of our document
- XIndexContainer xForms = dbfTools.queryIndexContainer( m_document.getFormComponentTreeRoot( ) );
- // the first form
- XIndexContainer xForm = dbfTools.queryIndexContainer( xForms.getByIndex( 0 ) );
- // the first control model which is no FixedText (FixedText's can't have the focus)
- for ( int i = 0; i<xForm.getCount(); ++i )
- {
- XPropertySet xControlProps = dbfTools.queryPropertySet( xForm.getByIndex( i ) );
- if ( FormComponentType.FIXEDTEXT != ((Short)xControlProps.getPropertyValue( "ClassId" )).shortValue() )
- {
- XControlModel xControlModel = UnoRuntime.queryInterface(
- XControlModel.class, xControlProps );
- // set the focus to this control
- grabControlFocus( xControlModel );
- // outta here
- break;
- }
- }
-
- // Note that we simply took the first control model from the hierarchy. This does state nothing
- // about the location of the respective control in the view. A control model is tied to a control
- // shape, and the shapes are where the geometry information such as position and size is hung up.
- // So you could easily have a document where the first control model is bound to a shape which
- // has a greater ordinate than any other control model.
- }
}
diff --git a/forms/qa/integration/forms/FormComponent.java b/forms/qa/integration/forms/FormComponent.java
index 51f92a1..89b8f91 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -108,13 +108,7 @@ public class FormComponent
return new String[]{};
}
- /* ------------------------------------------------------------------ */
- public boolean hasByName( String name )
- {
- if ( m_nameAccess != null )
- return m_nameAccess.hasByName( name );
- return false;
- }
+
/* ------------------------------------------------------------------ */
public int getCount()
@@ -150,15 +144,7 @@ public class FormComponent
return new com.sun.star.uno.Type( String.class );
}
- /* ------------------------------------------------------------------ */
- public boolean hasElements()
- {
- if ( m_indexAccess != null )
- return m_indexAccess.hasElements();
- else if ( m_nameAccess != null )
- return m_nameAccess.hasElements();
- return false;
- }
+
/* ------------------------------------------------------------------ */
public FormComponent getParent()
diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java
index 4c5ccbe..67c2c26 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.java
@@ -276,29 +276,7 @@ public class FormLayer
return null;
}
- /* ------------------------------------------------------------------ */
- /** retrieves the radio button model with the given name and the given tag
- * @param form
- * the parent form of the radio button model to find
- * @param name
- * the name of the radio button
- * @param tag
- * the tag of the radio button
- */
- public XPropertySet getRadioModelByTag( XPropertySet form, String name, String tag ) throws com.sun.star.uno.Exception, java.lang.Exception
- {
- XIndexAccess indexAccess = UnoRuntime.queryInterface( XIndexAccess.class, form );
- for ( int i=0; i<indexAccess.getCount(); ++i )
- {
- XPropertySet control = dbfTools.queryPropertySet( indexAccess.getByIndex( i ) );
-
- if ( ((String)control.getPropertyValue( "Name" )).equals( name ) )
- if ( ((String)control.getPropertyValue( "Tag" )).equals( tag ) )
- return control;
- }
- return null;
- }
/* ------------------------------------------------------------------ */
/** retrieves a control model with a given (integer) access path
@@ -320,24 +298,7 @@ public class FormLayer
return controlModel;
}
- /* ------------------------------------------------------------------ */
- /** retrieves a control model with a given (string) access path
- */
- public XPropertySet getControlModel( String[] _accessPath ) throws com.sun.star.uno.Exception
- {
- XNameAccess nameAcc = m_document.getFormComponentTreeRoot();
- XPropertySet controlModel = null;
- int i=0;
- while ( ( nameAcc != null ) && ( i < _accessPath.length ) )
- {
- controlModel = UnoRuntime.queryInterface( XPropertySet.class,
- nameAcc.getByName( _accessPath[i] ) );
- nameAcc = UnoRuntime.queryInterface( XNameAccess.class,
- controlModel );
- ++i;
- }
- return controlModel;
- }
+
/* ------------------------------------------------------------------ */
/** simulates a user's text input into a control given by control model
diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java
index e9614bb..e60a8e4 100644
--- a/forms/qa/org/openoffice/xforms/Instance.java
+++ b/forms/qa/org/openoffice/xforms/Instance.java
@@ -47,18 +47,7 @@ public class Instance
return createElement( m_domInstance, _elementName, null );
}
- /** creates a new element in the instance
- *
- * The element will be inserted immediately below a given XNode.
- *
- * @param _parentElement the node whose child shall be created
- * @param _elementName the name of the to-be-created element
- * @return the node of the newly created element
- */
- public XNode createElement( XNode _parentElement, String _elementName ) throws DOMException
- {
- return createElement( _parentElement, _elementName, null );
- }
+
/** creates a new element in the instance
*
@@ -115,31 +104,9 @@ public class Instance
throw new NoSuchElementException();
}
- /** creates an attribute for the root node of the instance
- *
- * @param _attribName
- * the name of the to-be-created attribute
- * @return
- * the DOM node, which has already been inserted into the DOM tree
- */
- public XNode createAttribute( String _attribName ) throws DOMException
- {
- return createAttribute( m_domInstance, _attribName, null );
- }
- /** creates an attribute for the root node of the instance
- *
- * @param _attribName
- * the name of the to-be-created attribute
- * @param _initialNodeValue
- * the initial value to set at the node. Might be null, in this case no value is set.
- * @return
- * the DOM node, which has already been inserted into the DOM tree
- */
- public XNode createAttribute( String _attribName, String _initialNodeValue ) throws DOMException
- {
- return createAttribute( m_domInstance, _attribName, _initialNodeValue );
- }
+
+
/** creates an attribute for the given node
*
diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java
index ff3829c..c8e5c88 100644
--- a/forms/qa/org/openoffice/xforms/Model.java
+++ b/forms/qa/org/openoffice/xforms/Model.java
@@ -38,10 +38,7 @@ public class Model
m_model );
}
- protected XModel getXModel()
- {
- return m_model;
- }
+
protected XFormsUIHelper1 getUIHelper()
{
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java
index 38a26a1..d9ab6f5 100644
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
@@ -61,20 +61,7 @@ class ConfigHelper
}
- public Object readRelativeKey(String sRelPath,
- String sKey )
- throws com.sun.star.container.NoSuchElementException
- {
- try
- {
- XPropertySet xPath = UnoRuntime.queryInterface(XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath));
- return xPath.getPropertyValue(sKey);
- }
- catch(com.sun.star.uno.Exception ex)
- {
- throw new com.sun.star.container.NoSuchElementException(ex.getMessage());
- }
- }
+
public void writeRelativeKey(String sRelPath,
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index c22372d..db53ea6 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -473,24 +473,7 @@ public class Protocol extends JComponent
}
- /**
- * For some modes it's necessary, that we write some additional
- * information to the log. E.g. for html we must generate close targets.
- */
- public synchronized void finish()
- {
- // Preferr HTML ... because we can't write ASCII and HTML contents to the same log file!
- String sContent;
- if ((m_nMode & MODE_HTML) == MODE_HTML)
- sContent = impl_generateHTMLFooter();
- else
- if ((m_nMode & MODE_ASCII) == MODE_ASCII)
- sContent = impl_generateAsciiFooter();
- else
- return;
- impl_writeToLogFile(m_sFileName, true, sContent);
- }
/**
@@ -533,47 +516,13 @@ public class Protocol extends JComponent
}
- /**
- * log different property arrays.
- *
- * @param lProps
- * the array of properties
- */
- public synchronized void log( /*IN*/ com.sun.star.beans.NamedValue[] lProps )
- {
- StringBuffer sValues = new StringBuffer(1000);
- impl_logPropertyArray(sValues, lProps);
- log(TYPE_SCOPE_OPEN | TYPE_INFO, "property array ["+lProps.length+"]:");
- log(TYPE_SCOPE_CLOSE | TYPE_INFO, sValues.toString() );
- }
- public synchronized void log( /*IN*/ com.sun.star.beans.PropertyValue[] lProps )
- {
- StringBuffer sValues = new StringBuffer(1000);
- impl_logPropertyArray(sValues, lProps);
- log(TYPE_SCOPE_OPEN | TYPE_INFO, "property array ["+lProps.length+"]:");
- log(TYPE_SCOPE_CLOSE | TYPE_INFO, sValues.toString() );
- }
- public synchronized void log( /*IN*/ com.sun.star.beans.NamedValue aProp )
- {
- StringBuffer sValue = new StringBuffer(1000);
- impl_logProperty(sValue, aProp);
- log(TYPE_SCOPE_OPEN | TYPE_INFO, "property:" );
- log(TYPE_SCOPE_CLOSE | TYPE_INFO, sValue.toString());
- }
- public synchronized void log( /*IN*/ com.sun.star.beans.PropertyValue aProp )
- {
- StringBuffer sValue = new StringBuffer(1000);
- impl_logProperty(sValue, aProp);
- log(TYPE_SCOPE_OPEN | TYPE_INFO, "property:" );
- log(TYPE_SCOPE_CLOSE | TYPE_INFO, sValue.toString());
- }
public synchronized void log( /*IN*/ Object aAny )
{
@@ -672,21 +621,7 @@ public class Protocol extends JComponent
}
- public synchronized void defineHyperlink( /*IN*/ String sTarget ,
- /*IN*/ String sDescription)
- {
- if ((m_nMode & MODE_HTML) != MODE_HTML)
- return;
-
- StringBuffer sLog = new StringBuffer(1000);
- sLog.append("<a href=\"");
- sLog.append(sTarget );
- sLog.append("\">" );
- sLog.append(sDescription);
- sLog.append("</a>" );
- log(TYPE_LINK, sLog.toString());
- }
/**
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index feb10f4..623f141 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -191,30 +191,7 @@ public class RecoveryTools {
}
}
- /**
- * This function close the office while calling terminate on the desktop. If
- * this failed, the <CODE>ProcessHandler</CODE> kills the process.
- * @param xMSF the <CODE>XMultiServiceFactory</CODE>
- * @return <CODE>TRUE</CODE> if no exception was thrown, otherwise <CODE>FALSE</CODE>
- */
- public boolean closeOffice(XMultiServiceFactory xMSF) {
- try {
- XDesktop desk = UnoRuntime.queryInterface(
- XDesktop.class, xMSF.createInstance(
- "com.sun.star.frame.Desktop"));
- xMSF = null;
- desk.terminate();
- log.println("Waiting until ProcessHandler loses the office...");
-
- }
- catch (java.lang.Exception e) {
- e.printStackTrace();
- return false;
- }
- waitForClosedOffice();
- return true;
- }
/**
* This function waits until the office is closed. If the closing time reach
@@ -237,10 +214,7 @@ public class RecoveryTools {
if (ph != null) ph.kill();
}
- public void killOffice(){
- helper.ProcessHandler ph = (helper.ProcessHandler) param.get("AppProvider");
- ph.kill();
- }
+
/**
* The office must be started WITH restore and crashreporter functionality.
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java
index 383e9c2..3941300 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java
@@ -64,21 +64,7 @@ public class BasicBound {
return value;
}
- public static BasicBound getBound(double[] data) {
- BasicBound bound = new BasicBound();
- if(data!=null) {
- if(data.length>0) {
- bound.minValue = data[0];
- bound.maxValue = data[0];
- for(int i=1; i<data.length; i++) {
- bound.minValue = Math.min(bound.minValue, data[i]);
- bound.maxValue = Math.max(bound.maxValue, data[i]);
- }
- }
- }
- return bound;
- }
public double randomAdjust (double value){
if(value > maxValue || value < minValue) {
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java
index 1721b24..8cbfaa1 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java
@@ -26,19 +26,5 @@ public class GlobalCompare {
return CompareValue.EQUAL_TO;
}
-/* check the magnitude of two array, the frontial is more important
- **/
- public static int compareArray(double[] fit1, double[] fit2) {
- if (fit1.length!=fit2.length) {
- return CompareValue.INVALID; //error
- }
- for (int i=0; i<fit1.length; i++) {
- if (fit1[i]>fit2[i]) {
- return CompareValue.LARGER_THAN; //Large than
- } else if (fit1[i]<fit2[i]){
- return CompareValue.LESS_THAN; //Less than
- }
- }
- return CompareValue.EQUAL_TO; //same
- }
+
}
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
index 78f08e5..bb7bf8d 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
@@ -45,13 +45,9 @@ public class GlobalString {
return v.toArray(new String[v.size()]);
}
- public static String[] getMeaningfulLines(String srcStr) throws Exception {
- return getMeaningfulLines(srcStr, NEGLECT_TAG);
- }
- public static String getMeaningfulLine(BufferedReader outReader) throws Exception {
- return getMeaningfulLine(outReader, NEGLECT_TAG);
- }
+
+
private static int getCharLoc(char data, String str) {
for(int i=0; i<str.length(); i++) {
@@ -126,18 +122,8 @@ public class GlobalString {
return nObj.toString();
}
- static public int toInteger(Object oVal) throws Exception {
- if(oVal==null) throw new Exception("Null string");
- return Integer.parseInt(oVal.toString());
- }
- static public double toDouble(Object oVal) throws Exception {
- if(oVal==null) throw new Exception("Null string");
- return Double.parseDouble(oVal.toString());
- }
- public static Object toObject(String key) throws Exception{
- Class cls = Class.forName(key);
- return cls.newInstance();
- }
+
+
}
\ No newline at end of file
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java
index b2177b8..666a8a0 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java
@@ -28,18 +28,7 @@ public class OutputMethods {
public OutputMethods() {
}
- public static String outputVectorAsStr(double[] vector){
- if(vector==null) return "NULL";
- String totalStr = "";
- for(int i=0;i<vector.length;i++){
- totalStr += vector[i];
- if(i!=vector.length-1) {
- totalStr += "\t";
- }
- }
- totalStr+="\r\n";
- return totalStr;
- }
+
public static void outputVector(double[] vector){
for(int i=0;i<vector.length;i++){
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
index 5a3f446..48d3b6d 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java
@@ -45,49 +45,13 @@ public static double doubleRangeRandom(double lowLimit,double upLimit){
return(num);
}
-/**This function returns true or false with a random probability.
- * @return int return value
- */
- public static boolean booleanRandom(){
- boolean value = true;
- double temp=Math.random();
- if (temp<0.5) value=false;
- return value;
- }
- public static int[] randomSelection(boolean[] types, int times) {
- int validNum = 0;
- for(int i=0; i<types.length; i++) {
- if(!types[i]) {
- validNum++;
- }
- }
- int[] totalIndices = new int[validNum];
- validNum = 0;
- for(int i=0; i<types.length; i++) {
- if(!types[i]) {
- totalIndices[validNum] = i;
- validNum++;
- if(validNum==totalIndices.length) break;
- }
- }
- return randomSelection(totalIndices, times);
- }
- public static int[] randomSelection(int low, int up, int times){
- int[] totalIndices = new int[up-low];
- for (int i=low; i<up; i++) {
- totalIndices[i] = i;
- }
- return randomSelection(totalIndices, times);
- }
- public static int getRealV(double randTypeV) {
- if(randTypeV<=0) return 0;
- int realV = (int)Math.ceil(randTypeV);
- if(Math.random()<(randTypeV-realV)) realV++;
- return realV;
- }
+
+
+
+
private static int[] randomSelection(int[] totalIndices, int times) {
if (times>=totalIndices.length) {
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
index c33d649..6fee1b7 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
@@ -68,10 +68,5 @@ public class SearchPoint extends BasicPoint implements IEncodeEngine {
return encodeInfo[0] == 0; //no constraint violations
}
- public void outputSelf() {
- System.out.println("#--> Location:");
- OutputMethods.outputVector(getLocation());
- System.out.println("#--> (CON & OPTIM):");
- OutputMethods.outputVector(getEncodeInfo());
- }
+
}
\ No newline at end of file
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
index 5bbd88a..98c6824 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
@@ -65,11 +65,7 @@ public abstract class ProblemEncoder {
designSpace.setElemAt(dd, i);
}
- protected void setDefaultXAt(int i, double min, double max) {
- DesignDim dd = new DesignDim();
- dd.paramBound = new BasicBound(min, max);
- designSpace.setElemAt(dd, i);
- }
+
//set the default information for evaluation each response
protected void setDefaultYAt(int i, double min, double max) {
@@ -78,12 +74,7 @@ public abstract class ProblemEncoder {
evalStruct.setElemAt(ee, i);
}
- protected void setDefaultYAt(int i, double min, double max, double weight) {
- EvalElement ee = new EvalElement();
- ee.targetBound = new BasicBound(min, max);
- ee.weight = weight;
- evalStruct.setElemAt(ee, i);
- }
+
//get a fresh point
public SearchPoint getFreshSearchPoint() {
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java
index aa9988c..2ddbf1b 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java
@@ -29,10 +29,7 @@ public class DesignDim {
public BasicBound paramBound = new BasicBound(); //the range of a parameter
- public void importData(DesignDim ipr) {
- this.grain = ipr.grain;
- this.paramBound = ipr.paramBound;
- }
+
public boolean isDiscrete() {
return grain!=0;
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
index bd620fa..0b98752 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
@@ -35,9 +35,7 @@ public class DesignSpace {
dimProps = new DesignDim[dim];
}
- public DesignDim getDimAt(int index) {
- return dimProps[index];
- }
+
public void setElemAt(DesignDim elem, int index) {
dimProps[index] = elem;
@@ -60,56 +58,26 @@ public class DesignSpace {
}
}
- public void randomAdjust (double[] location){
- for (int i=0; i<getDimension(); i++) {
- location[i] = dimProps[i].paramBound.randomAdjust(location[i]);
- }
- }
- public boolean satisfyCondition(double[] location){
- for (int i=0; i<getDimension(); i++) {
- if (!dimProps[i].paramBound.isSatisfyCondition(location[i])) {
- return false;
- }
- }
- /*If the limits are not violated, return TRUE*/
- return(true);
- }
+
+
public void mutationAt(double[] location, int i){
location[i] = dimProps[i].paramBound.getRandomValue();
}
- public double mutationUniformAtPointAsCenter (double pointX, int i){
- double length = this.getMagnitudeIn(i)/2;
- pointX += RandomGenerator.doubleRangeRandom(-1*length, length);
- return pointX;
- }
- public double getUpValueAt(int dimensionIndex) {
- return dimProps[dimensionIndex].paramBound.maxValue;
- }
- public double getLowValueAt(int dimensionIndex) {
- return dimProps[dimensionIndex].paramBound.minValue;
- }
+
+
public double getMagnitudeIn(int dimensionIndex) {
return dimProps[dimensionIndex].paramBound.getLength();
}
- public boolean initilizeGeneAtPointAsCenter(double[] tempX){
- if (tempX.length!=this.getDimension()) {
- return false;
- }
- for(int i=0;i<tempX.length;i++) {
- double length = this.getMagnitudeIn(i)/2;
- tempX[i]+=RandomGenerator.doubleRangeRandom(-1*length, length);
- }
- return true;
- }
+
public void initializeGene(double[] tempX){
for(int i=0;i<tempX.length;i++) tempX[i] = dimProps[i].paramBound.getRandomValue(); //Global.RandomGenerator.doubleRangeRandom(9.8, 10);
@@ -129,11 +97,5 @@ public class DesignSpace {
}
}
- public double[] getRealLoc(double[] imageLoc) {
- double[] realLoc = new double[imageLoc.length];
- System.arraycopy(imageLoc, 0, realLoc, 0, imageLoc.length);
- annulusAdjust(realLoc);
- return realLoc;
- }
}
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
index 7401af7..8a85b5a 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
@@ -360,10 +360,7 @@ public abstract class BaseNLPSolver extends WeakBase
return null;
}
- protected XCellRangeData getCellRangeData(CellRangeAddress cellRangeAddress) {
- return getCellRangeData(cellRangeAddress.Sheet, cellRangeAddress.StartColumn,
- cellRangeAddress.StartRow, cellRangeAddress.EndColumn, cellRangeAddress.EndRow);
- }
+
private XCellRangeData getCellRangeData(int sheet, int startCol, int startRow, int endCol, int endRow) {
try {
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
index 2aaa534..6c76260 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
@@ -142,16 +142,9 @@ public abstract class BaseDialog extends BaseControl {
super.finalize();
}
- public ModalState showModal() {
- xWindow.setVisible(true);
- xDialog.execute();
- return modalState;
- }
- public void close() {
- xDialog.endExecute();
- xWindow.setVisible(false);
- }
+
+
public void setCloseable(boolean closeable) {
setProperty("Closeable", new Boolean(closeable));
diff --git a/odk/examples/DevelopersGuide/Charts/Helper.java b/odk/examples/DevelopersGuide/Charts/Helper.java
index 0bad5c5..003fd33 100644
--- a/odk/examples/DevelopersGuide/Charts/Helper.java
+++ b/odk/examples/DevelopersGuide/Charts/Helper.java
@@ -81,10 +81,7 @@ public class Helper
- public XModel createPresentationDocument()
- {
- return createDocument( "simpress" );
- }
+
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 6c4bdf2..6fc9d90 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -91,79 +91,13 @@ public class DialogComponent {
}
}
- // XTestDialogHandler
- public String createDialog( String DialogURL, XModel xModel, XFrame xFrame ) {
- m_xFrame = xFrame;
- try {
- XMultiComponentFactory xMCF = m_xCmpCtx.getServiceManager();
- Object obj;
-
- // If valid we must pass the XModel when creating a DialogProvider object
- if( xModel != null ) {
- Object[] args = new Object[1];
- args[0] = xModel;
-
- obj = xMCF.createInstanceWithArgumentsAndContext(
- "com.sun.star.awt.DialogProvider2", args, m_xCmpCtx );
- }
- else {
- obj = xMCF.createInstanceWithContext(
- "com.sun.star.awt.DialogProvider2", m_xCmpCtx );
- }
-
- XDialogProvider2 xDialogProvider = UnoRuntime.queryInterface( XDialogProvider2.class, obj );
- XDialog xDialog = xDialogProvider.createDialogWithHandler( DialogURL, this );
- if( xDialog != null )
- xDialog.execute();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return "Created dialog \"" + DialogURL + "\"";
- }
- public void copyText( XDialog xDialog ) {
- XControlContainer xControlContainer = UnoRuntime.queryInterface(
- XControlContainer.class, xDialog );
- String aTextPropertyStr = "Text";
- String aText = "";
- XControl xTextField1Control = xControlContainer.getControl( "TextField1" );
- XControlModel xControlModel1 = xTextField1Control.getModel();
- XPropertySet xPropertySet1 = UnoRuntime.queryInterface(
- XPropertySet.class, xControlModel1 );
- try
- {
- aText = (String)xPropertySet1.getPropertyValue( aTextPropertyStr );
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- XControl xTextField2Control = xControlContainer.getControl( "TextField2" );
- XControlModel xControlModel2 = xTextField2Control.getModel();
- XPropertySet xPropertySet2 = UnoRuntime.queryInterface(
- XPropertySet.class, xControlModel2 );
- try
- {
- xPropertySet2.setPropertyValue( aTextPropertyStr, aText );
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- showMessageBox( "DialogComponent", "copyText() called" );
- }
- public void handleEvent() {
- showMessageBox( "DialogComponent", "handleEvent() called" );
- }
- public void handleEventWithArguments( XDialog xDialog, Object aEventObject ) {
- showMessageBox( "DialogComponent", "handleEventWithArguments() called\n\n" +
- "Event Object = " + aEventObject );
- }
private final String aHandlerMethod1 = "doit1";
private final String aHandlerMethod2 = "doit2";
diff --git a/odk/examples/DevelopersGuide/Database/RowSet.java b/odk/examples/DevelopersGuide/Database/RowSet.java
index 9b67a50..4c783bf 100644
--- a/odk/examples/DevelopersGuide/Database/RowSet.java
+++ b/odk/examples/DevelopersGuide/Database/RowSet.java
@@ -74,17 +74,7 @@ public class RowSet
System.exit(0);
}
- public static void printDataSources() throws com.sun.star.uno.Exception
- {
- // create a DatabaseContext and print all DataSource names
- XNameAccess xNameAccess = UnoRuntime.queryInterface(
- XNameAccess.class,
- xMCF.createInstanceWithContext("com.sun.star.sdb.DatabaseContext",
- xContext));
- String aNames [] = xNameAccess.getElementNames();
- for(int i=0;i<aNames.length;++i)
- System.out.println(aNames[i]);
- }
+
private static void useRowSet() throws com.sun.star.uno.Exception
{
diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java
index a18b0cd..ef1be66 100644
--- a/odk/examples/DevelopersGuide/Database/Sales.java
+++ b/odk/examples/DevelopersGuide/Database/Sales.java
@@ -106,40 +106,7 @@ public class Sales
}
}
- // create a scrollable resultset.
- public void retrieveSalesData2() throws com.sun.star.uno.Exception
- {
- // example for a programmatic way to do updates.
- XStatement stmt = con.createStatement();
- XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
-
- xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
- xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE));
- XResultSet srs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES");
- XRow row = UnoRuntime.queryInterface(XRow.class,srs);
-
- srs.afterLast();
- while (srs.previous()) {
- String name = row.getString(1);
- float price = row.getFloat(2);
- System.out.println(name + " " + price);
- }
-
- srs.last();
- XRowUpdate updateRow = UnoRuntime.queryInterface(XRowUpdate.class,srs);
- updateRow.updateFloat(2, (float)0.69);
-
- XResultSetUpdate updateRs = UnoRuntime.queryInterface(
- XResultSetUpdate.class,srs);
- updateRs.updateRow(); // this call updates the data in DBMS
-
- srs.last();
- updateRow.updateFloat(2, (float)0.99);
- updateRs.cancelRowUpdates();
- updateRow.updateFloat(2, (float)0.79);
- updateRs.updateRow();
- }
// inserts a row programmatically.
private void insertRow() throws com.sun.star.uno.Exception
@@ -186,38 +153,7 @@ public class Sales
updateRs.deleteRow();
}
- // refresh a row
- public void refreshRow() throws com.sun.star.uno.Exception
- {
- // example for a programmatic way to do updates.
- // first we need the 4 row
- insertRow();
- XStatement stmt = con.createStatement();
- XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt);
- xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE));
- xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.READ_ONLY));
- XResultSet rs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES");
- XRow row = UnoRuntime.queryInterface(XRow.class, rs);
- rs.absolute(4);
- float price1 = row.getFloat(2);
-
- // modifiy the 4 row
- XRowUpdate updateRow = UnoRuntime.queryInterface(XRowUpdate.class,rs);
- XResultSetUpdate updateRs = UnoRuntime. queryInterface(XResultSetUpdate.class,rs);
- updateRow.updateFloat(2, 150);
- updateRs.updateRow();
- // repositioning
- rs.absolute(4);
- rs.refreshRow();
- float price2 = row.getFloat(2);
- if (price2 != price1) {
- System.out.println("Prices are different.");
- }
- else
- System.out.println("Prices are equal.");
- deleteRow();
- }
// displays the column names
public void displayColumnNames() throws com.sun.star.uno.Exception
diff --git a/odk/examples/DevelopersGuide/Drawing/PageHelper.java b/odk/examples/DevelopersGuide/Drawing/PageHelper.java
index b6bb684..cbf8d9c 100644
--- a/odk/examples/DevelopersGuide/Drawing/PageHelper.java
+++ b/odk/examples/DevelopersGuide/Drawing/PageHelper.java
@@ -95,16 +95,7 @@ public class PageHelper
return xDrawPages.insertNewByIndex( nIndex );
}
- /** removes the given page
- */
- static public void removeDrawPage( XComponent xComponent, XDrawPage xDrawPage )
- {
- XDrawPagesSupplier xDrawPagesSupplier =
- UnoRuntime.queryInterface(
- XDrawPagesSupplier.class, xComponent );
- XDrawPages xDrawPages = xDrawPagesSupplier.getDrawPages();
- xDrawPages.remove( xDrawPage );
- }
+
/** get size of the given page
*/
@@ -156,26 +147,9 @@ public class PageHelper
return xDrawPages.insertNewByIndex( nIndex );
}
- /** removes the given page
- */
- static public void removeMasterPage( XComponent xComponent, XDrawPage xDrawPage )
- {
- XMasterPagesSupplier xMasterPagesSupplier =
- UnoRuntime.queryInterface(
- XMasterPagesSupplier.class, xComponent );
- XDrawPages xDrawPages = xMasterPagesSupplier.getMasterPages();
- xDrawPages.remove( xDrawPage );
- }
- /** return the corresponding masterpage for the giving drawpage
- */
- static public XDrawPage getMasterPage( XDrawPage xDrawPage )
- {
- XMasterPageTarget xMasterPageTarget =
- UnoRuntime.queryInterface(
- XMasterPageTarget.class, xDrawPage );
- return xMasterPageTarget.getMasterPage();
- }
+
+
/** sets given masterpage at the drawpage
*/
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
index ec77294..3bae7b1 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java
@@ -76,11 +76,7 @@ public class DocumentHelper
);
}
- /* ------------------------------------------------------------------ */
- public static DocumentHelper blankTextDocument( XComponentContext xCtx ) throws com.sun.star.uno.Exception
- {
- return blankDocument( xCtx, DocumentType.WRITER );
- }
+
/* ------------------------------------------------------------------ */
public static DocumentHelper blankDocument( XComponentContext xCtx, DocumentType eType ) throws com.sun.star.uno.Exception
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentType.java b/odk/examples/DevelopersGuide/Forms/DocumentType.java
index b5c9433..9835a26 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentType.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentType.java
@@ -26,25 +26,13 @@ public class DocumentType extends com.sun.star.uno.Enum
super( value );
}
- public static DocumentType getDefault()
- {
- return WRITER;
- }
+
public static final DocumentType WRITER = new DocumentType(0);
public static final DocumentType CALC = new DocumentType(1);
public static final DocumentType DRAWING = new DocumentType(2);
public static final DocumentType UNKNOWN = new DocumentType(-1);
- public static DocumentType fromInt(int value)
- {
- switch(value)
- {
- case 0: return WRITER;
- case 1: return CALC;
- case 2: return DRAWING;
- default: return UNKNOWN;
- }
- }
+
}
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
index 7594893..9cac2a8 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
@@ -104,15 +104,7 @@ class DocumentViewHelper
return xReturn;
}
- /* ------------------------------------------------------------------ */
- /** retrieves a dispatcher for the given URL, obtained at the current view of the document
- */
- public XDispatch getDispatcher( String sURL ) throws java.lang.Exception
- {
- URL[] aURL = new URL[] { new URL() };
- aURL[0].Complete = sURL;
- return getDispatcher( aURL );
- }
+
/* ------------------------------------------------------------------ */
/* retrieves the form controller belonging to a given logical form
diff --git a/odk/examples/DevelopersGuide/Forms/FLTools.java b/odk/examples/DevelopersGuide/Forms/FLTools.java
index 614d727..e15c454 100644
--- a/odk/examples/DevelopersGuide/Forms/FLTools.java
+++ b/odk/examples/DevelopersGuide/Forms/FLTools.java
@@ -45,33 +45,9 @@ import com.sun.star.form.*;
*/
public class FLTools
{
- /* ------------------------------------------------------------------ */
- static void dump_Object( Object aObject )
- {
- XServiceInfo xSI = UNO.queryServiceInfo( aObject );
- if ( null != xSI )
- System.out.println( "dumping object with name \"" + xSI.getImplementationName() + "\"" );
- else
- System.out.println( "object has no service info!" );
- }
- /* ------------------------------------------------------------------ */
- /** translates a string containing an URL into a complete
- <type scope="com.sun.star.util">URL</type> object.
- */
- static public URL parseURL( String sURL, XComponentContext xCtx ) throws java.lang.Exception
- {
- URL[] aURL = new URL[] { new URL() };
- aURL[0].Complete = sURL;
- // need an URLTransformer
- XURLTransformer xTransformer = UnoRuntime.queryInterface(
- XURLTransformer.class,
- xCtx.getServiceManager().createInstanceWithContext(
- "com.sun.star.util.URLTransformer", xCtx ) );
- xTransformer.parseStrict( aURL );
- return aURL[0];
- }
+
/* ------------------------------------------------------------------ */
/** returns the name of the given form component
@@ -122,39 +98,7 @@ public class FLTools
return sLabel;
}
- /* ------------------------------------------------------------------ */
- /** retrieves the index of a form component within its parent
- */
- static public int getIndexInParent( Object aContainer, Object aElement ) throws com.sun.star.uno.Exception
- {
- int nIndex = -1;
-
- // norm the element
- XInterface xElement = UnoRuntime.queryInterface(
- XInterface.class, aElement );
-
- // get the container
- XIndexContainer xIndexCont = UNO.queryIndexContainer( aContainer );
- if ( null != xIndexCont )
- {
- // loop through all children
- int nCount = xIndexCont.getCount();
- for ( int i = 0; i < nCount; ++i )
- {
- // compare with the element
- XInterface xCurrent = UnoRuntime.queryInterface(
- XInterface.class, xIndexCont.getByIndex( 0 ) );
- if ( xCurrent.equals( xElement ) )
- { // found
- nIndex = i;
- break;
- }
- }
- }
- // outta here
- return nIndex;
- }
/* ------------------------------------------------------------------ */
/** retrieves the parent of the given object
diff --git a/odk/examples/DevelopersGuide/Forms/FormLayer.java b/odk/examples/DevelopersGuide/Forms/FormLayer.java
index 1bd4866..b582ee4 100644
--- a/odk/examples/DevelopersGuide/Forms/FormLayer.java
+++ b/odk/examples/DevelopersGuide/Forms/FormLayer.java
@@ -43,21 +43,9 @@ public class FormLayer
m_insertPage = -1;
}
- /* ------------------------------------------------------------------ */
- /** sets the page which is to be used for subsequent insertions of controls/shapes
- */
- void setInsertPage( int page )
- {
- m_insertPage = page;
- }
- /* ------------------------------------------------------------------ */
- /** retrieves the page which is to be used for subsequent insertions of controls/shapes
- */
- final int getInsertPage( )
- {
- return m_insertPage;
- }
+
+
/* ------------------------------------------------------------------ */
/** creates a control in the document
diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
index 29593b0..df2c1b5 100644
--- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
+++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java
@@ -106,25 +106,9 @@ public class HsqlDatabase
return m_connection;
}
- /** executes the given SQL statement via the defaultConnection
- */
- public void executeSQL( String statementString ) throws SQLException
- {
- XStatement statement = defaultConnection().createStatement();
- statement.execute( statementString );
- }
- /** stores the database document
- */
- public void store() throws IOException
- {
- if ( m_databaseDocument != null )
- {
- XStorable storeDoc = UnoRuntime.queryInterface( XStorable.class,
- m_databaseDocument );
- storeDoc.store();
- }
- }
+
+
/** closes the database document
*
@@ -198,12 +182,7 @@ public class HsqlDatabase
return m_databaseDocument.getDataSource();
}
- /** returns the model interface of the underlying database document
- */
- XModel getModel()
- {
- return UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
- }
+
/** returns the URL of the ODB document represented by this instance
*/
@@ -212,12 +191,7 @@ public class HsqlDatabase
return m_databaseDocumentFile;
}
- /** creates a row set operating the database, with a given command/type
- */
- public RowSet createRowSet( int _commandType, String _command )
- {
- return new RowSet( m_context, getDocumentURL(), _commandType, _command );
- }
+
@Override
protected void finalize() throws Throwable
diff --git a/odk/examples/DevelopersGuide/Forms/InteractionRequest.java b/odk/examples/DevelopersGuide/Forms/InteractionRequest.java
index 8239e94..e961fc8 100644
--- a/odk/examples/DevelopersGuide/Forms/InteractionRequest.java
+++ b/odk/examples/DevelopersGuide/Forms/InteractionRequest.java
@@ -52,12 +52,7 @@ class InteractionRequest implements XInteractionRequest
m_aContinuations = new ArrayList<XInteractionContinuation>();
}
- /* ------------------------------------------------------------------ */
- public void addContinuation( XInteractionContinuation xCont )
- {
- if ( null != xCont )
- m_aContinuations.add( xCont );
- }
+
/* ------------------------------------------------------------------ */
public Object getRequest( )
diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
index 21dfb94..402ffe2 100644
--- a/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
+++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetView.java
@@ -36,28 +36,5 @@ public class SpreadsheetView extends DocumentViewHelper
super( orb, document, controller );
}
- /** activates the sheet with the given index
- */
- void activateSheet( int sheetIndex )
- {
- try
- {
- // get the sheet to activate
- XSpreadsheetDocument doc = UnoRuntime.queryInterface(
- XSpreadsheetDocument.class, getDocument().getDocument() );
- XIndexAccess sheets = UnoRuntime.queryInterface(
- XIndexAccess.class, doc.getSheets() );
-
- XSpreadsheet sheet = UnoRuntime.queryInterface(
- XSpreadsheet.class, sheets.getByIndex( sheetIndex ) );
- // activate
- XSpreadsheetView view = UnoRuntime.queryInterface(
- XSpreadsheetView.class, getController() );
- view.setActiveSheet( sheet );
- }
- catch( com.sun.star.uno.Exception e )
- {
- }
- }
}
diff --git a/odk/examples/DevelopersGuide/Forms/UNO.java b/odk/examples/DevelopersGuide/Forms/UNO.java
index f777c76..cd29249 100644
--- a/odk/examples/DevelopersGuide/Forms/UNO.java
+++ b/odk/examples/DevelopersGuide/Forms/UNO.java
@@ -73,10 +73,7 @@ public class UNO
return UnoRuntime.queryInterface( XComponent.class, aObject );
}
- public static XTablesSupplier queryTablesSupplier( Object aObject )
- {
- return UnoRuntime.queryInterface( XTablesSupplier.class, aObject );
- }
+
/* replace Foo with the identifier of your choice.
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
index 27df951..d332979 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
@@ -205,37 +205,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
}
- /**
- * @param _sRegistryPath the path a registryNode
- * @param _sImageName the name of the image
- */
- public String getImageUrl(String _sRegistryPath, String _sImageName) {
- String sImageUrl = "";
- try {
- // retrieve the configuration node of the extension
- XNameAccess xNameAccess = getRegistryKeyContent(_sRegistryPath);
- if (xNameAccess != null){
- if (xNameAccess.hasByName(_sImageName)){
- // get the Image Url and process the Url by the macroexpander...
- sImageUrl = (String) xNameAccess.getByName(_sImageName);
- Object oMacroExpander = this.m_xContext.getValueByName("/singletons/com.sun.star.util.theMacroExpander");
- XMacroExpander xMacroExpander = UnoRuntime.queryInterface(XMacroExpander.class, oMacroExpander);
- sImageUrl = xMacroExpander.expandMacros(sImageUrl);
- sImageUrl = sImageUrl.substring(new String("vnd.sun.star.expand:").length(), sImageUrl.length());
- sImageUrl = sImageUrl.trim();
- sImageUrl += "/" + _sImageName;
- }
- }
- } catch (Exception ex) {
- /* perform individual exception handling here.
- * Possible exception types are:
- * com.sun.star.lang.IllegalArgumentException,
- * com.sun.star.lang.WrappedTargetException,
- */
- ex.printStackTrace(System.err);
- }
- return sImageUrl;
- }
+
protected void createDialog(XMultiComponentFactory _xMCF) {
try {
@@ -266,16 +236,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
- public short executeDialogWithembeddedExampleSnippets() {
- if (m_xWindowPeer == null){
- createWindowPeer();
- }
- addRoadmap();
- insertRoadmapItem(0, true, "Introduction", 1);
- insertRoadmapItem(1, true, "Documents", 2);
- xDialog = UnoRuntime.queryInterface(XDialog.class, m_xDialogControl);
- return xDialog.execute();
- }
+
public short executeDialog() {
@@ -329,17 +290,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
}
- public void calculateDialogPosition(XWindow _xWindow) {
- Rectangle aFramePosSize = m_xModel.getCurrentController().getFrame().getComponentWindow().getPosSize();
- Rectangle CurPosSize = _xWindow.getPosSize();
- int WindowHeight = aFramePosSize.Height;
- int WindowWidth = aFramePosSize.Width;
- int DialogWidth = CurPosSize.Width;
- int DialogHeight = CurPosSize.Height;
- int iXPos = ((WindowWidth / 2) - (DialogWidth / 2));
- int iYPos = ((WindowHeight / 2) - (DialogHeight / 2));
- _xWindow.setPosSize(iXPos, iYPos, DialogWidth, DialogHeight, PosSize.POS);
- }
+
@@ -352,23 +303,10 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
return createWindowPeer(null);
}
- public void endExecute() {
- xDialog.endExecute();
- }
- public Object insertControlModel(String ServiceName, String sName, String[] sProperties, Object[] sValues) {
- try {
- Object oControlModel = m_xMSFDialogModel.createInstance(ServiceName);
- XMultiPropertySet xControlMultiPropertySet = UnoRuntime.queryInterface(XMultiPropertySet.class, oControlModel);
- xControlMultiPropertySet.setPropertyValues(sProperties, sValues);
- m_xDlgModelNameContainer.insertByName(sName, oControlModel);
- return oControlModel;
- } catch (com.sun.star.uno.Exception exception) {
- exception.printStackTrace(System.err);
- return null;
- }
- }
+
+
private XFixedText insertFixedText(XMouseListener _xMouseListener, int _nPosX, int _nPosY, int _nWidth, int _nStep, String _sLabel){
@@ -1094,9 +1032,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
return xFFModelPSet;
}
- public void convertUnits(){
- // iXPixelFactor = (int) (100000/xDevice.getInfo().PixelPerMeterX);
- }
+
private XTextComponent insertFileControl(XTextListener _xTextListener, int _nPosX, int _nPosY, int _nWidth){
@@ -1184,17 +1120,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
return xButton;
}
- /** gets the WindowPeer of a frame
- * @param _xTextDocument the instance of a textdocument
- * @return the windowpeer of the frame
- */
- public XWindowPeer getWindowPeer(XTextDocument _xTextDocument){
- XModel xModel = UnoRuntime.queryInterface(XModel.class, _xTextDocument);
- XFrame xFrame = xModel.getCurrentController().getFrame();
- XWindow xWindow = xFrame.getContainerWindow();
- XWindowPeer xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow);
- return xWindowPeer;
- }
+
public XFrame getCurrentFrame(){
XFrame xRetFrame = null;
diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu.java b/odk/examples/DevelopersGuide/GUI/UnoMenu.java
index dcedef2..5dbb015 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoMenu.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoMenu.java
@@ -152,10 +152,7 @@ public UnoMenu(XComponentContext _xContext, XMultiComponentFactory _xMCF) {
return xTopWindow;
}
- public void addMenuBar(XWindow _xWindow){
- XTopWindow xTopWindow = UnoRuntime.queryInterface(XTopWindow.class, _xWindow);
- addMenuBar(xTopWindow, this);
- }
+
public void itemSelected(MenuEvent menuEvent){
// find out which menu item has been triggered,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 4415995..7439b31 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -490,50 +490,7 @@ public class FunctionHelper
- /**
- * Dispatch an URL to given frame.
- * Caller can register himself for following result events for dispatched
- * URL too. Notifications are guaranteed (instead of dispatch())
- * Returning of the dispatch object isn't necessary.
- * Nobody must hold it alive longer the dispatch needs.
- *
- * @param xFrame frame which should be the target of this dispatch
- * @param aURL full parsed and converted office URL for dispatch
- * @param lProperties optional arguments for dispatch
- * @param xListener optional listener which is registered automatically for status events
- * (Note: Deregistration is not supported. Dispatcher does it automatically.)
- */
- public static void executeWithNotification(com.sun.star.frame.XFrame xFrame ,
- com.sun.star.util.URL aURL ,
- com.sun.star.beans.PropertyValue[] lProperties,
- com.sun.star.frame.XDispatchResultListener xListener )
- {
- try
- {
- // Query the frame for right interface which provides access to all available dispatch objects.
- com.sun.star.frame.XDispatchProvider xProvider = UnoRuntime.queryInterface(
- com.sun.star.frame.XDispatchProvider.class,
- xFrame);
- // Ask himn for right dispatch object for given URL.
- // Force THIS frame as target for following dispatch.
- // Attention: The interface XNotifyingDispatch is an optional one!
- com.sun.star.frame.XDispatch xDispatcher = xProvider.queryDispatch(aURL,"",0);
- com.sun.star.frame.XNotifyingDispatch xNotifyingDispatcher = UnoRuntime.queryInterface(
- com.sun.star.frame.XNotifyingDispatch.class,
- xDispatcher);
-
- // Dispatch the URL.
- if(xNotifyingDispatcher!=null)
- xNotifyingDispatcher.dispatchWithNotification(aURL,lProperties,xListener);
- }
- catch(com.sun.star.uno.RuntimeException exUno)
- {
- // Any UNO method of this scope can throw this exception.
- // But there is nothing we can do then.
- exUno.printStackTrace();
- }
- }
@@ -782,78 +739,7 @@ public class FunctionHelper
- /**
- * Try to close the document without any saving of modifications.
- * We can try it only! Controller and/or model of this document
- * can disagree with that. But mostly they doesn't do so.
- *
- * @param xDocument document which should be clcosed
- */
- public static void closeDocument(com.sun.star.lang.XComponent xDocument)
- {
- try
- {
- // Check supported functionality of the document (model or controller).
- com.sun.star.frame.XModel xModel =
- UnoRuntime.queryInterface(
- com.sun.star.frame.XModel.class, xDocument);
- if(xModel!=null)
- {
- // It's a full featured office document.
- // Reset the modify state of it and close it.
- // Note: Model can disgree by throwing a veto exception.
- com.sun.star.util.XModifiable xModify =
- UnoRuntime.queryInterface(
- com.sun.star.util.XModifiable.class, xModel);
-
- xModify.setModified(false);
- xDocument.dispose();
- }
- else
- {
- // It's a document which supports a controller .. or may by a pure
- // window only. If it's at least a controller - we can try to
- // suspend him. But - he can disagree with that!
- com.sun.star.frame.XController xController =
- UnoRuntime.queryInterface(
- com.sun.star.frame.XController.class, xDocument);
-
- if(xController!=null)
- {
- if(xController.suspend(true)==true)
- {
- // Note: Don't dispose the controller - destroy the frame
- // to make it right!
- com.sun.star.frame.XFrame xFrame = xController.getFrame();
- xFrame.dispose();
- }
- }
- }
- }
- catch(com.sun.star.beans.PropertyVetoException exVeto)
- {
- // Can be thrown by "setModified()" call on model.
- // He disagree with our request.
- // But there is nothing to do then. Following "dispose()" call wasn't
- // never called (because we catch it before). Closing failed -that's it.
- exVeto.printStackTrace();
- }
- catch(com.sun.star.lang.DisposedException exDisposed)
- {
- // If an UNO object was already disposed before - he throw this special
- // runtime exception. Of course every UNO call must be look for that -
- // but it's a question of error handling.
- // For demonstration this exception is handled here.
- exDisposed.printStackTrace();
- }
- catch(com.sun.star.uno.RuntimeException exRuntime)
- {
- // Every uno call can throw that.
- // Do nothing - closing failed - that's it.
- exRuntime.printStackTrace();
- }
- }
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
index d6e0563..782a3d2 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
@@ -67,18 +67,7 @@ public class OfficeConnect
- /**
- * close connection to remote office if it exist
- */
- public static synchronized void disconnect()
- {
- if(maConnection!=null)
- {
- mxServiceManager=null;
- mxOfficeContext=null;
- maConnection=null;
- }
- }
+
@@ -112,69 +101,7 @@ public class OfficeConnect
- /**
- * create uno components inside remote office process
- * After connection of these process to a running office we have access to
- * remote service manager of it.
- * So we can use it to create all existing services. Use this method to create
- * components by name and get her interface. Casting of it to right target
- * interface is part of your implementation.
- *
- * @param aType describe class type of created service
- * Returned object can be casted directly to this one.
- * Uno query was done by this method automatically.
- * @param sServiceSpecifier name of service which should be created
- * @return the new created service object
- */
- public static synchronized <T> T createRemoteInstance(
- Class<T> aType, String sServiceSpecifier)
- {
- T aResult = null;
- try
- {
- aResult = UnoRuntime.queryInterface(aType,
- mxServiceManager.createInstanceWithContext(
- sServiceSpecifier, mxOfficeContext));
- }
- catch (com.sun.star.uno.Exception ex)
- {
- System.err.println("Couldn't create Service of type "
- + sServiceSpecifier + ": " + ex);
- System.exit(0);
- }
- return aResult;
- }
-
-
- /**
- * same as "createRemoteInstance()" but supports additional parameter for
- * initializing created object
- *
- * @param lArguments optional arguments
- * They are used to initialize new created service.
- * @param aType Description of Parameter
- * @param sServiceSpecifier Description of Parameter
- * @return the new create service object
- */
- public static synchronized <T> T createRemoteInstanceWithArguments(
- Class<T> aType, String sServiceSpecifier, Any[] lArguments)
- {
- T aResult = null;
- try
- {
- aResult = UnoRuntime.queryInterface(aType,
- mxServiceManager.createInstanceWithArgumentsAndContext(
- sServiceSpecifier, lArguments, mxOfficeContext));
- }
- catch (com.sun.star.uno.Exception ex)
- {
- System.err.println("Couldn't create Service of type "
- + sServiceSpecifier + ": " + ex);
- System.exit(0);
- }
- return aResult;
- }
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
index c1ab843..45b2d04 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
@@ -72,10 +72,7 @@ public class PropChgHelper implements
return xPropSet;
}
- public String[] GetPropNames()
- {
- return aPropNames;
- }
+
public void LaunchEvent( LinguServiceEvent aEvt )
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
index faecbe5..f49e6a1 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
@@ -71,10 +71,7 @@ public class OfficeConnect
- public static synchronized OfficeConnect getConnection()
- {
- return maConnection;
- }
+
@@ -127,32 +124,7 @@ public class OfficeConnect
- /**
- * same as "createRemoteInstance()" but supports additional parameter for initializing created object
- *
- * @param lArguments optional arguments
- * They are used to initialize new created service.
- * @param aType Description of Parameter
- * @param sServiceSpecifier Description of Parameter
- * @return Description of the Returned Value
- */
- public <T> T createRemoteInstanceWithArguments(Class<T> aType, String sServiceSpecifier, Any[] lArguments)
- {
- T aResult = null;
- try
- {
- aResult = UnoRuntime.queryInterface(
- aType, mxServiceManager.createInstanceWithArgumentsAndContext(
- sServiceSpecifier, lArguments, mxOfficeContext));
- }
- catch (com.sun.star.uno.Exception ex)
- {
- System.err.println("Couldn't create Service of type " + sServiceSpecifier + ": " + ex);
- ex.printStackTrace();
- System.exit(0);
- }
- return aResult;
- }
+
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
index b0092d9..a289359 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
@@ -274,25 +274,9 @@ class ScriptSelectorPanel extends JPanel {
add(textField, BorderLayout.SOUTH);
}
- public void removeNode(DefaultMutableTreeNode node) {
- MutableTreeNode parent = (MutableTreeNode)(node.getParent());
- if (parent != null) {
- treeModel.removeNodeFromParent(node);
- }
- }
- public void addNode(DefaultMutableTreeNode parent, XBrowseNode xbn) {
- DefaultMutableTreeNode newNode =
- new DefaultMutableTreeNode(xbn) {
- @Override
- public String toString() {
- return ((XBrowseNode)getUserObject()).getName();
- }
- };
- treeModel.insertNodeInto(newNode, parent, parent.getChildCount());
- tree.scrollPathToVisible(new TreePath(newNode.getPath()));
- }
+
private void initNodes(XBrowseNode parent, DefaultMutableTreeNode top) {
if ( parent == null || parent.hasChildNodes() == false )
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index 109335f..513bfa1 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -163,30 +163,9 @@ public class ExampleAddIn
// XExampleAddIn
- public int getIncremented( int nValue )
- {
- return nValue + 1;
- }
- public com.sun.star.sheet.XVolatileResult getCounter(String aName)
- {
- if ( aResults == null )
- {
- // create the table of results, and start a thread to increment
- // all counters
- aResults = new java.util.HashMap<String, ExampleAddInResult>();
- ExampleAddInThread aThread = new ExampleAddInThread( aResults );
- aThread.start();
- }
- ExampleAddInResult aResult = aResults.get(aName);
- if ( aResult == null )
- {
- aResult = new ExampleAddInResult(aName);
- aResults.put( aName, aResult );
- }
- return aResult;
- }
+
// XAddIn
diff --git a/odk/examples/java/Inspector/HideableTreeModel.java b/odk/examples/java/Inspector/HideableTreeModel.java
index 7add3d7..6fea286 100644
--- a/odk/examples/java/Inspector/HideableTreeModel.java
+++ b/odk/examples/java/Inspector/HideableTreeModel.java
@@ -84,9 +84,7 @@ public class HideableTreeModel implements TreeModel {
}
- public void reload() {
- reload(getRoot());
- }
+
private void reload(Object node) {
@@ -101,9 +99,7 @@ public class HideableTreeModel implements TreeModel {
nodeChanged(path.getLastPathComponent());
}
- public void nodeInserted(Object node, Object child) {
- nodeInserted(node, child, -1);
- }
+
public void nodeInserted(Object node, Object child, int index) {
@@ -164,11 +160,7 @@ public class HideableTreeModel implements TreeModel {
}
- public ArrayList<TreePath> getExpandedPaths(JTree tree) {
- ArrayList<TreePath> expandedPaths = new ArrayList<TreePath>();
- addExpandedPaths(tree, tree.getPathForRow(0), expandedPaths);
- return expandedPaths;
- }
+
private void addExpandedPaths(JTree tree, TreePath path, ArrayList<TreePath> pathlist) {
@@ -181,11 +173,7 @@ public class HideableTreeModel implements TreeModel {
}
- public void expandPaths(JTree tree, ArrayList<TreePath> pathlist) {
- for(int i = 0; i < pathlist.size(); i++) {
- tree.expandPath(pathlist.get(i));
- }
- }
+
public boolean isLeaf(Object _oNode) {
@@ -241,23 +229,10 @@ public class HideableTreeModel implements TreeModel {
}
- public boolean isPathToNodeVisible(Object node) {
- Object[] path = getPathToRoot(node);
- for(int i = 0; i < path.length; i++) {
- if(!isNodeVisible(path[i])) {
- return false;
- }
- }
- return true;
- }
- public void ensurePathToNodeVisible(Object node) {
- Object[] path = getPathToRoot(node);
- for(int i = 0; i < path.length; i++) {
- setNodeVisible(path[i], true);
- }
- }
+
+
public Object getChild(Object parent, int index) {
diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java
index a537d9c..e28ca5f 100644
--- a/odk/examples/java/Inspector/Inspector.java
+++ b/odk/examples/java/Inspector/Inspector.java
@@ -441,17 +441,6 @@ public class Inspector{
return xFactory;
}
- /**
- * Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>
- * <p>
- * @return returns true if the operation succeeded
- * @param regKey the registryKey
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- return (Factory.writeRegistryServiceInfo(_Inspector.class.getName(), _Inspector.getServiceNames(), regKey)
- && InspectorAddon.__writeRegistryServiceInfo(regKey));
- }
+
}
diff --git a/odk/examples/java/Inspector/Introspector.java b/odk/examples/java/Inspector/Introspector.java
index e3cfc97..db4c40b 100644
--- a/odk/examples/java/Inspector/Introspector.java
+++ b/odk/examples/java/Inspector/Introspector.java
@@ -201,15 +201,7 @@ public class Introspector extends WeakBase{
}}
- protected XIdlField[] getFieldsOfType(Type _aType){
- try{
- XIdlClass xIdlClass = mxIdlReflection.forName(_aType.getTypeName());
- return xIdlClass.getFields();
- }
- catch( Exception e ) {
- System.err.println( e );
- return null;
- }}
+
public boolean hasMethods(Object _oUnoObject){
@@ -552,12 +544,7 @@ public class Introspector extends WeakBase{
}
- public static boolean isValid(Object _oObject){
- if (_oObject != null){
- return (!AnyConverter.isVoid(_oObject));
- }
- return false;
- }
+
public static boolean isArray(Object _oObject){
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index edd7c7e..de41566 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -659,13 +659,7 @@ private class UnoObjectDefinition{
}
- public boolean hasParameterObjects(){
- boolean breturn = false;
- if (m_oParameterObjects != null){
- breturn = m_oParameterObjects.length > 0;
- }
- return breturn;
- }
+
private String getVariableStemName(TypeClass _aTypeClass){
diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java
index 0439554..51e9932 100644
--- a/odk/examples/java/Inspector/UnoNode.java
+++ b/odk/examples/java/Inspector/UnoNode.java
@@ -324,9 +324,7 @@ public class UnoNode{
}
- public static String getNodeDescription(Object _oUnoObject, int _nIndex){
- return getNodeDescription(_oUnoObject) + "[" + (_nIndex + 1) + "]";
- }
+
public static String getNodeDescription(Object _oUnoObject){
diff --git a/odk/examples/java/Inspector/XDialogProvider.java b/odk/examples/java/Inspector/XDialogProvider.java
index e8bfadc..4bcc8e8 100644
--- a/odk/examples/java/Inspector/XDialogProvider.java
+++ b/odk/examples/java/Inspector/XDialogProvider.java
@@ -56,7 +56,7 @@ public interface XDialogProvider {
public void selectSourceCodeLanguage(int _nLanguage);
- public void paint();
+
// returns one of the constants defined in XLanguageSourceCodeGenerator
public int getLanguage();
diff --git a/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java b/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
index 630f3d9..6f5f9f4 100644
--- a/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/XLanguageSourceCodeGenerator.java
@@ -67,7 +67,7 @@ public interface XLanguageSourceCodeGenerator {
public String getshortTypeDescription();
- public String getunsignedshortTypeDescription();
+
public String getlongTypeDescription();
@@ -85,11 +85,11 @@ public interface XLanguageSourceCodeGenerator {
public String getstringTypeDescription(boolean _bAsHeaderSourceCode);
- public String gettypeTypeDescription(boolean _bAsHeaderSourceCode);
+
public String getanyTypeDescription(boolean _bAsHeaderSourceCode);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list