diff options
32 files changed, 134 insertions, 330 deletions
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 8539ff7b74..adee9a2110 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -36,7 +36,7 @@ #include <stdio.h> #define DECLARE_FN_POINTERS 1 #include "EApi.h" -static char *eBookLibNames[] = { +static const char *eBookLibNames[] = { "libebook-1.2.so.9", // evolution-2.8 "libebook-1.2.so.5", // evolution-2.4 and 2.6+ "libebook-1.2.so.3", // evolution-2.2 diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h index b0a3b2bf31..a6b7832e73 100644 --- a/connectivity/source/drivers/evoab2/EApi.h +++ b/connectivity/source/drivers/evoab2/EApi.h @@ -60,7 +60,7 @@ typedef int EContactField; EAPI_EXTERN const char *(*e_contact_field_name) ( EContactField field_id); EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); -EAPI_EXTERN const gpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); +EAPI_EXTERN gconstpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); // e-source.h typedef void ESource; #define E_SOURCE(a) ((ESource *)(a)) diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 5dbf5493a2..4bc618a99b 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -39,6 +39,9 @@ #include <com/sun/star/lang/DisposedException.hpp> #include "propertyids.hxx" #include <connectivity/dbexception.hxx> +#include <connectivity/dbtools.hxx> + +#include "resource/common_res.hrc" using namespace connectivity::evoab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 685d24a40f..501db8978e 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -478,7 +478,7 @@ OEvoabResultSet::getValue( sal_Int32 nColumnNum, GType nType, GValue *pStackValu { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum); - GValue aValue = { 0, 0 }; + GValue aValue = {0, {{0}}}; if (getValue (nFieldNumber, G_TYPE_STRING, &aValue)) { const char *pStr = g_value_get_string (&aValue); @@ -500,7 +500,7 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum); - GValue aValue = { 0, 0 }; + GValue aValue = {0, {{0}}}; if (getValue (nFieldNumber, G_TYPE_BOOLEAN, &aValue)) { bResult = g_value_get_boolean (&aValue); diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java index 3337c2eb8a..727f94a929 100644 --- a/scripting/examples/java/MemoryUsage/MemoryUsage.java +++ b/scripting/examples/java/MemoryUsage/MemoryUsage.java @@ -8,7 +8,6 @@ import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.frame.XComponentLoader; import com.sun.star.document.XEmbeddedObjectSupplier; -import com.sun.star.awt.ActionEvent; import com.sun.star.awt.Rectangle; import com.sun.star.beans.XPropertySet; import com.sun.star.beans.PropertyValue; diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index 382837defb..c3bc4541ab 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -31,7 +31,6 @@ package com.sun.star.script.framework.security; import com.sun.star.awt.ActionEvent; -import com.sun.star.awt.XActionListener; import com.sun.star.awt.ItemEvent; import com.sun.star.awt.XItemListener; import com.sun.star.awt.XButton; @@ -40,7 +39,6 @@ import com.sun.star.awt.XControl; import com.sun.star.awt.XControlModel; import com.sun.star.awt.XControlContainer; import com.sun.star.awt.XDialog; -import com.sun.star.awt.XFixedText; import com.sun.star.awt.XToolkit; import com.sun.star.awt.XWindow; @@ -52,14 +50,11 @@ import com.sun.star.lang.EventObject; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.lang.XTypeProvider; import com.sun.star.lang.XServiceInfo; import com.sun.star.lang.XInitialization; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.registry.XRegistryKey; -import com.sun.star.task.XJobExecutor; -import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.RuntimeException; diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java index 10648d4fad..fb01001cb2 100644 --- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java +++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java @@ -42,7 +42,6 @@ import com.sun.star.container.XNameContainer; import com.sun.star.awt.*; -import com.sun.star.script.framework.log.LogUtils; public class DialogFactory { diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java index 62d5b2f57c..8c46eb323d 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -31,7 +31,6 @@ package com.sun.star.script.framework.browse; import com.sun.star.beans.XIntrospectionAccess; -import com.sun.star.beans.PropertyAttribute; import com.sun.star.lib.uno.helper.PropertySet; @@ -60,7 +59,6 @@ import com.sun.star.script.framework.container.Parcel; import com.sun.star.script.framework.container.ParcelContainer; import com.sun.star.script.framework.browse.DialogFactory; -import java.io.*; import java.util.*; import javax.swing.JOptionPane; diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java index cf0ed4d38e..4d9858065e 100644 --- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java @@ -30,27 +30,16 @@ package com.sun.star.script.framework.browse; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.lib.uno.helper.PropertySet; -import com.sun.star.uno.Any; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; import com.sun.star.uno.XComponentContext; -import com.sun.star.beans.XIntrospectionAccess; import com.sun.star.script.XInvocation; import com.sun.star.script.browse.XBrowseNode; -import com.sun.star.script.browse.BrowseNodeTypes; import com.sun.star.script.framework.provider.ScriptProvider; import com.sun.star.script.framework.log.*; import com.sun.star.script.framework.container.*; -import com.sun.star.script.framework.browse.DialogFactory; -import java.io.*; -import java.util.*; -import javax.swing.JOptionPane; public class PkgProviderBrowseNode extends ProviderBrowseNode implements XBrowseNode, XInvocation diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java index ea223288d3..e88c8f26c7 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java @@ -30,7 +30,6 @@ package com.sun.star.script.framework.browse; -import com.sun.star.beans.PropertyAttribute; import com.sun.star.lib.uno.helper.PropertySet; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; @@ -53,7 +52,6 @@ import com.sun.star.script.framework.log.*; import com.sun.star.script.framework.container.*; import com.sun.star.script.framework.browse.DialogFactory; -import java.io.*; import java.util.*; import javax.swing.JOptionPane; diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java index 5cc7e709bc..af733956d3 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -33,7 +33,6 @@ import com.sun.star.script.browse.XBrowseNode; import com.sun.star.script.browse.BrowseNodeTypes; import com.sun.star.script.provider.XScriptContext; -import com.sun.star.beans.PropertyAttribute; import com.sun.star.lib.uno.helper.PropertySet; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Any; @@ -52,13 +51,10 @@ import com.sun.star.reflection.InvocationTargetException; import com.sun.star.container.NoSuchElementException; import com.sun.star.container.ElementExistException; -import java.io.File; import java.util.*; -import javax.swing.JOptionPane; import com.sun.star.script.framework.log.LogUtils; import com.sun.star.script.framework.provider.ScriptProvider; -import com.sun.star.script.framework.browse.DialogFactory; import com.sun.star.script.framework.container.*; public class ScriptBrowseNode extends PropertySet diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java index 49664d92e5..bd9a9206ab 100644 --- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java +++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java @@ -33,18 +33,10 @@ package com.sun.star.script.framework.container; import java.io.File; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.FileNotFoundException; import java.io.ByteArrayInputStream; import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Iterator; // import javax.xml.parsers.DocumentBuilderFactory; // import javax.xml.parsers.DocumentBuilder; diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java index dc8297d797..e07e47003d 100644 --- a/scripting/java/com/sun/star/script/framework/container/Parcel.java +++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java @@ -30,23 +30,15 @@ package com.sun.star.script.framework.container; import com.sun.star.script.framework.log.*; import com.sun.star.script.framework.io.*; -import com.sun.star.script.framework.browse.*; import com.sun.star.script.framework.provider.PathUtils; import com.sun.star.container.*; import com.sun.star.uno.Type; import com.sun.star.uno.UnoRuntime; -import com.sun.star.lang.*; -import com.sun.star.io.*; -import com.sun.star.frame.*; - -import com.sun.star.embed.*; import com.sun.star.ucb.XSimpleFileAccess; import com.sun.star.ucb.XSimpleFileAccess2; import java.io.*; -import java.util.*; -import java.net.*; public class Parcel implements XNameContainer { diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index c7072f71f3..29fd3b6980 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -37,19 +37,14 @@ import com.sun.star.script.framework.provider.PathUtils; import com.sun.star.container.*; import com.sun.star.uno.Type; import com.sun.star.lang.*; -import com.sun.star.frame.*; import com.sun.star.io.*; import java.io.*; import java.util.*; import com.sun.star.ucb.XSimpleFileAccess; import com.sun.star.ucb.XSimpleFileAccess2; import com.sun.star.lang.XMultiComponentFactory; -import com.sun.star.beans.XPropertySet; import com.sun.star.uno.XComponentContext; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.AnyConverter; -import com.sun.star.deployment.*; -import com.sun.star.embed.*; import com.sun.star.uri.XUriReference; import com.sun.star.uri.XUriReferenceFactory; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index bf851c0018..6e53f64289 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -30,20 +30,14 @@ package com.sun.star.script.framework.container; -import java.net.URLEncoder; -import java.net.URLDecoder; -import java.net.URLStreamHandler; import java.net.URL; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.util.Vector; import java.util.StringTokenizer; -import java.io.File; import java.io.InputStream; -import java.io.FileOutputStream; import java.io.OutputStream; import com.sun.star.script.framework.log.LogUtils; @@ -52,22 +46,13 @@ import com.sun.star.script.framework.provider.PathUtils; import com.sun.star.script.framework.io.XInputStreamImpl; - import com.sun.star.script.framework.container.ScriptEntry; import com.sun.star.script.framework.container.Parcel; -import com.sun.star.script.framework.io.XOutputStreamWrapper; -import com.sun.star.script.framework.io.UCBStreamHandler; import com.sun.star.script.framework.io.UCBStreamHandler; -import com.sun.star.io.XTruncate; -import com.sun.star.io.XOutputStream; - import com.sun.star.ucb.XSimpleFileAccess2; - -import com.sun.star.io.XStream; - import com.sun.star.uno.UnoRuntime; public class ScriptMetaData extends ScriptEntry implements Cloneable { diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java index 80307e1f80..4611b8e452 100644 --- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java @@ -36,7 +36,6 @@ import com.sun.star.script.framework.io.XInputStreamWrapper; import java.util.Map; import java.util.HashMap; -import java.util.StringTokenizer; import java.io.OutputStream; import java.io.InputStream; @@ -44,41 +43,10 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.uno.UnoRuntime; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XEventListener; -import com.sun.star.lang.EventObject; -import com.sun.star.lang.XComponent; - import com.sun.star.io.XOutputStream; import com.sun.star.io.XTruncate; - -import com.sun.star.uno.Type; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Any; - -import com.sun.star.ucb.Command; -import com.sun.star.ucb.XContentProvider; -import com.sun.star.ucb.XContent; -import com.sun.star.ucb.XCommandProcessor; -import com.sun.star.ucb.XContentIdentifier; -import com.sun.star.ucb.XContentIdentifierFactory; -import com.sun.star.ucb.XSimpleFileAccess; - -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.Property; - -import com.sun.star.sdbc.XRow; - import com.sun.star.deployment.XPackage; -import com.sun.star.deployment.XPackageManager; -import com.sun.star.deployment.XPackageManagerFactory; - -import com.sun.star.uno.XComponentContext; - -import com.sun.star.lang.XMultiComponentFactory; - -import com.sun.star.script.provider.XScriptContext; public class UnoPkgContainer extends ParcelContainer { diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java index d609d796a8..e03c6348e2 100644 --- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java +++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java @@ -29,11 +29,7 @@ ************************************************************************/ package com.sun.star.script.framework.io; import java.io.*; -import com.sun.star.io.XInputStream; import com.sun.star.io.XOutputStream; -import com.sun.star.io.XStream; -import com.sun.star.util.XModifiable; -import com.sun.star.script.framework.log.*; public class XOutputStreamWrapper extends OutputStream { diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java index 5145dbb3be..311bc0018e 100644 --- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java +++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java @@ -39,21 +39,13 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.XComponent; -import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.XComponentContext; - - import com.sun.star.io.XStream; import com.sun.star.io.XInputStream; import com.sun.star.io.XOutputStream; -import com.sun.star.io.XTruncate; -import com.sun.star.io.XSeekable; import com.sun.star.embed.XStorage; -import com.sun.star.embed.ElementModes; import com.sun.star.embed.XTransactedObject; import com.sun.star.document.XDocumentSubStorageSupplier; @@ -68,7 +60,6 @@ import com.sun.star.script.framework.provider.PathUtils; import java.util.*; import java.io.*; -import java.util.zip.*; public class XStorageHelper implements XEventListener diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java index 13f91b91bb..b2962a4fc5 100755 --- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java +++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java @@ -30,13 +30,7 @@ package com.sun.star.script.framework.provider; -import java.util.ArrayList; -import java.util.Vector; -import java.io.File; -import java.io.IOException; import java.net.*; -import com.sun.star.frame.XModel; -import com.sun.star.uno.XComponentContext; import com.sun.star.script.framework.log.LogUtils; import com.sun.star.script.framework.container.ScriptMetaData; diff --git a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java index d9a1da420c..df746b1605 100644 --- a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java +++ b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java @@ -32,27 +32,11 @@ package com.sun.star.script.framework.provider; import com.sun.star.frame.XModel; import com.sun.star.frame.XDesktop; import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XMultiComponentFactory; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.PropertyVetoException; -import com.sun.star.beans.XPropertyChangeListener; -import com.sun.star.beans.XVetoableChangeListener; -import com.sun.star.lang.WrappedTargetException; -import com.sun.star.lang.IllegalArgumentException; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.AnyConverter; -import com.sun.star.beans.PropertyAttribute; import com.sun.star.document.XScriptInvocationContext; -import com.sun.star.lib.uno.helper.PropertySet; -import com.sun.star.uno.Type; - -import java.util.HashMap; import com.sun.star.script.provider.XScriptContext; -import com.sun.star.script.framework.log.LogUtils; - /** * Description of the Class diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java index 7141acd2fe..75fb9a67e5 100644 --- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java +++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java @@ -30,28 +30,10 @@ package com.sun.star.script.framework.provider; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -import java.util.Vector; import java.util.StringTokenizer; -import java.net.URLStreamHandler; -import java.net.URL; -import java.net.URLDecoder; -import java.net.MalformedURLException; - import java.lang.reflect.Method; -import com.sun.star.uno.XComponentContext; - -import com.sun.star.script.framework.log.LogUtils; - - -import com.sun.star.util.XMacroExpander; -import com.sun.star.uno.Type; -import com.sun.star.uno.AnyConverter; import com.sun.star.frame.XModel; import com.sun.star.uno.IQueryInterface; diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 9f7d5feab6..bc92168f09 100755 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -51,7 +51,6 @@ import com.sun.star.beans.XPropertyChangeListener; import com.sun.star.beans.XPropertySetInfo; import com.sun.star.beans.Property; -import com.sun.star.uno.Type; import com.sun.star.beans.XIntrospectionAccess; import com.sun.star.script.XInvocation; @@ -90,7 +89,7 @@ import com.sun.star.deployment.XPackage; import com.sun.star.document.XScriptInvocationContext; import com.sun.star.frame.XTransientDocumentsDocumentContentFactory; import com.sun.star.uno.TypeClass; -import java.util.*; + public abstract class ScriptProvider implements XScriptProvider, XBrowseNode, XPropertySet, XInvocation, XInitialization, XTypeProvider, XServiceInfo, XNameContainer diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java index 5c8b74e99d..1a5f884476 100755 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -30,17 +30,11 @@ package com.sun.star.script.framework.provider.beanshell; import javax.swing.JTextArea; -import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.text.Document; import javax.swing.event.DocumentListener; import javax.swing.event.DocumentEvent; -import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Color; import java.awt.Font; @@ -48,8 +42,6 @@ import java.awt.FontMetrics; import java.awt.Polygon; import java.awt.Rectangle; import java.awt.Dimension; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; public class PlainSourceView extends JScrollPane implements ScriptSourceView, DocumentListener { diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java index e5ca728033..a177b82616 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java @@ -33,7 +33,6 @@ import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JButton; -import javax.swing.JFileChooser; import javax.swing.JOptionPane; import java.awt.FlowLayout; @@ -42,18 +41,13 @@ import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; import java.io.InputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.OutputStream; import java.io.IOException; import java.net.URL; import java.util.Map; import java.util.HashMap; -import bsh.Interpreter; - import com.sun.star.script.provider.XScriptContext; import com.sun.star.script.framework.provider.ScriptEditor; import com.sun.star.script.framework.container.ScriptMetaData; diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index abd65382ce..cb8a350141 100755 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -42,7 +42,6 @@ import com.sun.star.uno.Any; import com.sun.star.reflection.InvocationTargetException; import java.util.StringTokenizer; -import java.io.*; import java.net.URL; diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java index bce52cc4ca..60edbd0848 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java @@ -29,15 +29,11 @@ ************************************************************************/ package com.sun.star.script.framework.provider.beanshell; -import java.io.File; import java.io.InputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; -import java.lang.reflect.InvocationTargetException; import com.sun.star.script.provider.XScriptContext; public class ScriptSourceModel { diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index 09762b8579..948c711f2a 100755 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -30,7 +30,6 @@ package com.sun.star.script.framework.provider.java; import com.sun.star.frame.XModel; -import com.sun.star.frame.XDesktop; import com.sun.star.comp.loader.FactoryHelper; import com.sun.star.document.XScriptInvocationContext; import com.sun.star.uno.XComponentContext; diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index fc3231b56b..801511744d 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -48,7 +48,6 @@ import java.net.URL; import java.util.Map; import java.util.HashMap; -import javax.swing.JFrame; import javax.swing.SwingUtilities; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index b1630b122e..69bec65f7e 100755 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -29,7 +29,6 @@ ************************************************************************/ package com.sun.star.script.framework.provider.javascript; -import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.lang.XMultiServiceFactory; @@ -37,31 +36,14 @@ import com.sun.star.lang.XSingleServiceFactory; import com.sun.star.frame.XModel; import com.sun.star.registry.XRegistryKey; import com.sun.star.comp.loader.FactoryHelper; -import com.sun.star.lang.XTypeProvider; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.XInitialization; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.Any; -import com.sun.star.beans.XPropertySet; import com.sun.star.document.XScriptInvocationContext; -import com.sun.star.lang.IllegalArgumentException; -import com.sun.star.lang.WrappedTargetException; import com.sun.star.reflection.InvocationTargetException; -import com.sun.star.script.CannotConvertException; -import java.io.*; -import java.util.Vector; -import java.util.Map; -import java.net.MalformedURLException; import java.net.URL; -import com.sun.star.script.provider.XScriptProvider; import com.sun.star.script.provider.XScript; -import com.sun.star.script.provider.XScriptContext; -import com.sun.star.script.provider.ScriptErrorRaisedException; import com.sun.star.script.provider.ScriptExceptionRaisedException; import com.sun.star.script.provider.ScriptFrameworkErrorException; import com.sun.star.script.provider.ScriptFrameworkErrorType; @@ -72,13 +54,11 @@ import com.sun.star.script.framework.provider.ClassLoaderFactory; import com.sun.star.script.framework.provider.ScriptProvider; import com.sun.star.script.framework.provider.ScriptEditor; import com.sun.star.script.framework.container.ScriptMetaData; -import com.sun.star.script.framework.log.*; import org.mozilla.javascript.Context; import org.mozilla.javascript.ImporterTopLevel; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.JavaScriptException; -import org.mozilla.javascript.EcmaError; public class ScriptProviderForJavaScript { diff --git a/xmlhelp/source/com/sun/star/help/HelpFileDocument.java b/xmlhelp/source/com/sun/star/help/HelpFileDocument.java index 336228fee3..a86ddfa350 100644 --- a/xmlhelp/source/com/sun/star/help/HelpFileDocument.java +++ b/xmlhelp/source/com/sun/star/help/HelpFileDocument.java @@ -34,11 +34,9 @@ import java.io.File; import java.io.Reader; import java.io.FileInputStream; import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; //import java.io.FileReader; import java.io.StringReader; -import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java index 0f7f963ddc..6f00bcd4aa 100644 --- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java +++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java @@ -30,14 +30,12 @@ package com.sun.star.help; -import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.script.XInvocation;
-import com.sun.star.beans.XIntrospectionAccess;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.XComponentContext;
+import com.sun.star.lib.uno.helper.WeakBase; +import com.sun.star.lang.XServiceInfo; +import com.sun.star.script.XInvocation; +import com.sun.star.beans.XIntrospectionAccess; +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.XComponentContext; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -57,34 +55,32 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Date; -import javax.swing.*;
+public class HelpIndexer extends WeakBase + implements XServiceInfo, XInvocation +{ + static private final String __serviceName = + "com.sun.star.help.HelpIndexer"; + static private final String aCreateIndexMethodName = "createIndex"; -public class HelpIndexer extends WeakBase
- implements XServiceInfo, XInvocation
-{
- static private final String __serviceName =
- "com.sun.star.help.HelpIndexer";
- static private final String aCreateIndexMethodName = "createIndex";
-
public HelpIndexer() { } - public HelpIndexer(XComponentContext xCompContext)
- {
- }
-
+ public HelpIndexer(XComponentContext xCompContext) + { + } + /** * @param args the command line arguments */ public static void main( String[] args ) { boolean bExtensionMode = false; - mainImpl( args, bExtensionMode );
- }
-
- private static void mainImpl( String[] args, boolean bExtensionMode )
- {
+ mainImpl( args, bExtensionMode ); + } + + private static void mainImpl( String[] args, boolean bExtensionMode ) + { String aDirToZipStr = ""; String aLanguageStr = ""; String aModule = ""; @@ -151,7 +147,7 @@ public class HelpIndexer extends WeakBase File aIndexDir = new File( aDirToZipStr + File.separator + aIndexDirName ); File aCaptionFilesDir = new File( aDirToZipStr + File.separator + "caption" ); File aContentFilesDir = new File( aDirToZipStr + File.separator + "content" ); -
+ try { Date start = new Date(); @@ -166,12 +162,12 @@ public class HelpIndexer extends WeakBase writer.optimize(); } writer.close(); -
- if( bExtensionMode )
- {
+ + if( bExtensionMode ) + { deleteRecursively( aCaptionFilesDir ); deleteRecursively( aContentFilesDir ); - }
+ } else { if( nRet == -1 ) @@ -335,104 +331,104 @@ public class HelpIndexer extends WeakBase return aFile.delete(); } -
- //===================================================
- // XInvocation
- public XIntrospectionAccess getIntrospection()
- {
- return null;
- }
-
- public Object invoke( String aFunctionName, java.lang.Object[] aParams,
- short[][] aOutParamIndex, java.lang.Object[][] aOutParam )
- throws com.sun.star.lang.IllegalArgumentException,
- com.sun.star.script.CannotConvertException,
- com.sun.star.reflection.InvocationTargetException
- {
- if( !aFunctionName.equals( aCreateIndexMethodName ) )
- throw new com.sun.star.lang.IllegalArgumentException();
-
- aOutParamIndex[0] = new short[0];
- aOutParam[0] = new Object[0];
-
- int nParamCount = aParams.length;
- String aStrs[] = new String[nParamCount];
- for( int i = 0 ; i < nParamCount ; i++ )
- {
- try
- {
- aStrs[i] = AnyConverter.toString( aParams[i] );
- }
- catch( IllegalArgumentException e )
- {
- aStrs[i] = "";
- }
- }
-
+ + //=================================================== + // XInvocation + public XIntrospectionAccess getIntrospection() + { + return null; + } + + public Object invoke( String aFunctionName, java.lang.Object[] aParams, + short[][] aOutParamIndex, java.lang.Object[][] aOutParam ) + throws com.sun.star.lang.IllegalArgumentException, + com.sun.star.script.CannotConvertException, + com.sun.star.reflection.InvocationTargetException + { + if( !aFunctionName.equals( aCreateIndexMethodName ) ) + throw new com.sun.star.lang.IllegalArgumentException(); + + aOutParamIndex[0] = new short[0]; + aOutParam[0] = new Object[0]; + + int nParamCount = aParams.length; + String aStrs[] = new String[nParamCount]; + for( int i = 0 ; i < nParamCount ; i++ ) + { + try + { + aStrs[i] = AnyConverter.toString( aParams[i] ); + } + catch( IllegalArgumentException e ) + { + aStrs[i] = ""; + } + } + boolean bExtensionMode = true; - mainImpl( aStrs, bExtensionMode );
-
- return null;
- }
-
- public void setValue( String aPropertyName, java.lang.Object aValue )
- throws com.sun.star.beans.UnknownPropertyException,
- com.sun.star.script.CannotConvertException,
- com.sun.star.reflection.InvocationTargetException
- {
- throw new com.sun.star.beans.UnknownPropertyException();
- }
-
- public Object getValue( String aPropertyName )
- throws com.sun.star.beans.UnknownPropertyException
- {
- throw new com.sun.star.beans.UnknownPropertyException();
- }
-
- public boolean hasMethod( String aMethodName )
- {
- boolean bRet = (aMethodName.equals( aCreateIndexMethodName ) );
- return bRet;
- }
- public boolean hasProperty( String aName ) {
- return false;
- }
-
-
- /** This method returns an array of all supported service names.
- * @return Array of supported service names.
- */
- public String[] getSupportedServiceNames()
- {
- return getServiceNames();
- }
-
- /** This method is a simple helper function to used in the
- * static component initialisation functions as well as in
- * getSupportedServiceNames.
- */
- public static String[] getServiceNames()
- {
- String[] sSupportedServiceNames = { __serviceName };
- return sSupportedServiceNames;
- }
-
- /** This method returns true, if the given service will be
- * supported by the component.
- * @param sServiceName Service name.
- * @return True, if the given service name will be supported.
- */
- public boolean supportsService( String sServiceName )
- {
- return sServiceName.equals( __serviceName );
- }
-
- /** Return the class name of the component.
- * @return Class name of the component.
- */
- public String getImplementationName()
- {
- return HelpIndexer.class.getName();
- }
-}
-
+ mainImpl( aStrs, bExtensionMode ); + + return null; + } + + public void setValue( String aPropertyName, java.lang.Object aValue ) + throws com.sun.star.beans.UnknownPropertyException, + com.sun.star.script.CannotConvertException, + com.sun.star.reflection.InvocationTargetException + { + throw new com.sun.star.beans.UnknownPropertyException(); + } + + public Object getValue( String aPropertyName ) + throws com.sun.star.beans.UnknownPropertyException + { + throw new com.sun.star.beans.UnknownPropertyException(); + } + + public boolean hasMethod( String aMethodName ) + { + boolean bRet = (aMethodName.equals( aCreateIndexMethodName ) ); + return bRet; + } + public boolean hasProperty( String aName ) { + return false; + } + + + /** This method returns an array of all supported service names. + * @return Array of supported service names. + */ + public String[] getSupportedServiceNames() + { + return getServiceNames(); + } + + /** This method is a simple helper function to used in the + * static component initialisation functions as well as in + * getSupportedServiceNames. + */ + public static String[] getServiceNames() + { + String[] sSupportedServiceNames = { __serviceName }; + return sSupportedServiceNames; + } + + /** This method returns true, if the given service will be + * supported by the component. + * @param sServiceName Service name. + * @return True, if the given service name will be supported. + */ + public boolean supportsService( String sServiceName ) + { + return sServiceName.equals( __serviceName ); + } + + /** Return the class name of the component. + * @return Class name of the component. + */ + public String getImplementationName() + { + return HelpIndexer.class.getName(); + } +} + diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java index ceaa859f90..86d83b1ccf 100644 --- a/xmlhelp/source/com/sun/star/help/HelpSearch.java +++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java @@ -34,11 +34,8 @@ import com.sun.star.lib.uno.helper.Factory; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.lang.XSingleComponentFactory; import com.sun.star.lib.uno.helper.WeakBase; -import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.registry.XRegistryKey; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XTypeProvider; import com.sun.star.lang.XServiceInfo; import com.sun.star.uno.Type; import com.sun.star.uno.Any; @@ -48,7 +45,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.index.FilterIndexReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.Hits; |