diff options
34 files changed, 0 insertions, 791 deletions
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index a3f0aeee9c6f..2ada16a1c3b3 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -955,41 +955,6 @@ public class TestCaseOldAPI extends ComplexTestCase { - private XComponentContext getComponentContext( XMultiServiceFactory xFact ) - { - XComponentContext xResult = null; - - XPropertySet xProp = UnoRuntime.queryInterface( - XPropertySet.class, xFact ); - if( xProp != null ) - try - { - xResult = (XComponentContext) - AnyConverter.toObject( - new Type( XComponentContext.class ), - xProp.getPropertyValue( "DefaultContext" ) ); - } - catch( Exception ex ) - { - failed( ex.getMessage() ); - ex.printStackTrace( (PrintWriter)log ); - } - - return xResult; - } - - - - private void printInterfacesAndServices( Object oObj ) - { - log.println( "Services:" ); - util.dbg.getSuppServices( oObj ); - log.println( "Interfaces:" ); - util.dbg.printInterfaces( (XInterface)oObj, true ); - } - - - /// see rtl/math.hxx private boolean approxEqual( double a, double b ) { diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index 92060711130a..0919051ddb25 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -500,22 +500,6 @@ public class CellBinding extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ - /** sets the given cell range as list entry source for the given control - */ - private void setListSource( XPropertySet _listSink, short _sourceCol, short _rowStart, short _rowEnd ) throws com.sun.star.uno.Exception - { - CellRangeAddress listSourceAddress = new CellRangeAddress( (short)0, _sourceCol, _rowStart, _sourceCol, _rowEnd ); - NamedValue addressParameter = new NamedValue( "CellRange", listSourceAddress ); - - XListEntrySource listSource = UnoRuntime.queryInterface( XListEntrySource.class, - m_document.createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", new NamedValue[]{ addressParameter } ) - ); - XListEntrySink listSink = UnoRuntime.queryInterface( XListEntrySink.class, - _listSink ); - listSink.setListEntrySource( listSource ); - } - - /* ------------------------------------------------------------------ */ /** simulates a user action to check a radio button */ private void simulateUserRadioCheck( XPropertySet radioModel ) throws com.sun.star.uno.Exception diff --git a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java index ce2d0f60162b..b72e9c637212 100644 --- a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java +++ b/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java @@ -30,13 +30,6 @@ public class JavaLoaderFactory implements XSingleServiceFactory, XServiceInfo { "com.sun.star.loader.Java2" }; - private static final boolean DEBUG = false; - - private static final void DEBUG(String dbg) { - if (DEBUG) - System.err.println(" >>> JavaLoaderFactory - " + dbg); - } - protected XMultiServiceFactory multiServiceFactory = null; public JavaLoaderFactory(XMultiServiceFactory factory) { diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java index 7382a7d42762..b6e118301a37 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java +++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java @@ -182,36 +182,6 @@ public class ScriptSelector { show(ctxt); } - private void checkEnabled(XPropertySet props, String name, - JButton button) - { - boolean enable = false; - - try - { - if (props != null) - { - Object o = props.getPropertyValue(name); - enable = AnyConverter.toBoolean( - props.getPropertyValue(name)); - } - } - catch (com.sun.star.lang.IllegalArgumentException iae) - { - // leave enable set to false - } - catch (com.sun.star.beans.UnknownPropertyException upe) - { - // leave enable set to false - } - catch (com.sun.star.lang.WrappedTargetException wte) - { - // leave enable set to false - } - - button.setEnabled(enable); - } - private XBrowseNode getRootNode(XScriptContext ctxt) { XBrowseNode result = null; diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java index 4808dab72b11..b4cec85dc79e 100644 --- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java +++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java @@ -210,10 +210,6 @@ public class _XPopupMenuController extends MultiMethodTest { return com.sun.star.awt.MenuItemType.DONTKNOW; } - public void setItemType(com.sun.star.awt.MenuItemType param ) { - System.out.println("setItemType called."); - } - public void clear() { System.out.println("clear called."); } diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index b7508a038b2a..1384f0a4d70d 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -275,25 +275,6 @@ public class SDBCReportDataFactory implements DataSourceFactory return order.toString(); } - private XNameAccess getFieldsByCommandDescriptor(final int commandType, final String command, final XComponent[] out) throws SQLException - { - final Class[] parameter = new Class[3]; - parameter[0] = int.class; - parameter[1] = String.class; - parameter[2] = out.getClass(); - final XConnectionTools tools = UnoRuntime.queryInterface(XConnectionTools.class, connection); - try - { - tools.getClass().getMethod("getFieldsByCommandDescriptor", parameter); - return tools.getFieldsByCommandDescriptor(commandType, command, out); - } - catch (NoSuchMethodException ex) - { - } - - throw new SQLException(); - } - private XSingleSelectQueryComposer getComposer(final XConnectionTools tools, final String command, final int commandType) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index d2955364f46f..155357f39545 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -55,27 +55,6 @@ public class FormattedTextLayoutController { } - private VariablesCollection getVariablesCollection() - { - LayoutController parent = getParent(); - while (parent != null) - { - if (parent instanceof OfficeRepeatingStructureLayoutController) - { - final OfficeRepeatingStructureLayoutController orslc = - (OfficeRepeatingStructureLayoutController) parent; - if (orslc.isNormalFlowProcessing()) - { - return null; - } - - return orslc.getVariablesCollection(); - } - parent = parent.getParent(); - } - return null; - } - public boolean isValueChanged() { try @@ -155,21 +134,6 @@ public class FormattedTextLayoutController return join(getFlowController()); } - private OfficeDocument getDocument() - { - LayoutController parent = getParent(); - while (parent != null) - { - final Object node = parent.getNode(); - if (node instanceof OfficeDocument) - { - return (OfficeDocument) node; - } - parent = parent.getParent(); - } - return null; - } - private Element getParentTableCell() { LayoutController parent = getParent(); @@ -185,44 +149,4 @@ public class FormattedTextLayoutController return null; } - private String computeValueStyle() - { - final Element tce = getParentTableCell(); - if (tce == null) - { - return null; - } - - final String cellStyleName = (String) tce.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME); - if (cellStyleName == null) - { - return null; - } - final OfficeDocument document = getDocument(); - if (document == null) - { - return null; - } - - final OfficeStyle style = document.getStylesCollection().getStyle("table-cell", cellStyleName); - return (String) style.getAttribute(OfficeNamespaces.STYLE_NS, "data-style-name"); - } - - private String computeValueType() - { - final Element tce = getParentTableCell(); - if (tce == null) - { - // NO particular format means: Fallback to string and hope and pray .. - throw new IllegalStateException("A formatted text element must be a child of a Table-Cell."); - } - - final String type = (String) tce.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE); - if (type == null) - { - LOGGER.error("The Table-Cell does not have a office:value attribute defined. Your content will be messed up."); - return "string"; - } - return type; - } } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java index 4bc0ada7038c..82cf13a9a978 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java @@ -97,20 +97,6 @@ public class MasterPageFactory return result; } - public String getTemplate() - { - return template; - } - - public String getPageHeader() - { - return pageHeader; - } - - public String getPageFooter() - { - return pageFooter; - } } private static class PageLayoutKey @@ -129,21 +115,6 @@ public class MasterPageFactory this.footerHeight = footerHeight; } - public String getTemplateName() - { - return templateName; - } - - public CSSNumericValue getHeaderHeight() - { - return headerHeight; - } - - public CSSNumericValue getFooterHeight() - { - return footerHeight; - } - public boolean equals(final Object o) { if (this == o) diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index 7f1efcfbcf8c..117f9d6f05aa 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -644,10 +644,6 @@ public final class TypeDescription implements ITypeDescription { } } - public boolean isEmpty() { - return list.isEmpty(); - } - public TypeDescription[] toArray() { return list.toArray( new TypeDescription[list.size()]); 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 df018f488f99..a77e36f4e1c3 100644 --- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java +++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java @@ -111,25 +111,6 @@ public class DeployedUnoPackagesDB { } - private void clearEntries() { - NodeList langNodes; - Element main = document.getDocumentElement(); - int len; - - if ((langNodes = document.getElementsByTagName("language")) != null && - (len = langNodes.getLength()) != 0) - { - for (int i = len - 1; i >= 0; i--) { - try { - main.removeChild(langNodes.item(i)); - } - catch (DOMException de) { - // ignore - } - } - } - } - public boolean removePackage( String language, String url ) { Element main = document.getDocumentElement(); diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index e657063ed808..5377dacd94c1 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -261,8 +261,4 @@ public class UCBStreamHandler extends URLStreamHandler { return result; } - private String convertClassNameToFileName(String name) { - return name.replace('.', File.separatorChar) + ".class"; - } - } diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java index a349ff51d60f..9bd6d2576798 100644 --- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java +++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java @@ -120,33 +120,6 @@ public class Manifest { return result; } - private InputStream replaceNewlines(byte[] bytes) throws IOException { - InputStream result; - ByteArrayOutputStream out; - BufferedReader reader; - - reader = new BufferedReader(new InputStreamReader( - new ByteArrayInputStream(bytes))); - out = new ByteArrayOutputStream(); - - int previous = reader.read(); - out.write(previous); - int current; - - while ((current = reader.read()) != -1) { - if (((char)current == '\n' || (char)current == ' ') && - (char)previous == '\n') - continue; - else { - out.write(current); - previous = current; - } - } - result = new ByteArrayInputStream(out.toByteArray()); - - return result; - } - public void write(OutputStream out) throws IOException { XMLParserFactory.getParser().write(document, out); } diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java index 9fb261aa879e..03227ca56450 100644 --- a/scripting/workben/ifc/scripting/_XScriptSecurity.java +++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java @@ -362,29 +362,4 @@ public class _XScriptSecurity extends MultiMethodTest { return access; } - private XModel loadDocument(String name) { - XModel model = null; - SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF()); - - String fullname = util.utils.getFullTestURL(name); - - try { - Object obj = factory.loadDocument(fullname); - model = UnoRuntime.queryInterface(XModel.class, obj); - } - catch (com.sun.star.lang.IllegalArgumentException iae) { - return null; - } - catch (Exception e) { - return null; - } - - try { - Thread.sleep(5000); - } - catch (InterruptedException ie) { - } - - return model; - } } diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java index 420ba61e177e..079f7522c61e 100644 --- a/scripting/workben/installer/Register.java +++ b/scripting/workben/installer/Register.java @@ -27,48 +27,6 @@ public class Register{ "drafts.com.sun.star.script.framework.theScriptRuntimeManager=drafts.com.sun.star.script.framework.ScriptRuntimeManager"}; - private static String quotedString ( String stringToQuote ) { - String doubleQuote = "\""; - String result = new String ( doubleQuote + stringToQuote + doubleQuote ); - return result; - } - private static boolean regSingletons( String path, String progPath, String opSys, JLabel statusLabel ) { - try{ - boolean goodResult = false; - String[] env = new String[1]; - String regCmd = null; - ExecCmd command = new ExecCmd(); - for ( int i=0; i<singletonDefParams.length; i++){ - if ( opSys.indexOf( "Windows" ) == -1 ){ - // Not windows - env[0] = "LD_LIBRARY_PATH=" + progPath; - command.exec( "chmod a+x " + progPath + "regsingleton", null ); - regCmd = progPath + "regsingleton " + path + "user" + File.separator + "uno_packages" + File.separator + "cache" + File.separator + "services.rdb " + singletonDefParams[i]; - goodResult = command.exec( regCmd, env ); - } - else { - // Windows - regCmd = quotedString( progPath + "regsingleton.exe" ) + " " + quotedString( path + "user" + File.separator + "uno_packages" + File.separator + "cache" + File.separator + "services.rdb" ) + " " + quotedString( singletonDefParams[i] ); - goodResult = command.exec( regCmd,null ); - } - if ( !goodResult ){ - System.out.println("Regsingleton cmd failed, cmd: " + regCmd ); - statusLabel.setText("Regsingleton ScriptRuntimeForJava Failed, please view SFrameworkInstall.log"); - return false; - } - } - } - catch ( Exception e ) { - String message = "\nError installing scripting package, please view SFrameworkInstall.log."; - System.out.println(message); - e.printStackTrace(); - statusLabel.setText(message); - return false; - } - return true; - - - } public static boolean register(String path, JLabel statusLabel) { String[] packages = {"ooscriptframe.zip", "bshruntime.zip", "jsruntime.zip"}; diff --git a/scripting/workben/installer/Welcome.java b/scripting/workben/installer/Welcome.java index b9f1bca1ab59..8c99ca1919c0 100644 --- a/scripting/workben/installer/Welcome.java +++ b/scripting/workben/installer/Welcome.java @@ -51,20 +51,6 @@ public class Welcome extends javax.swing.JPanel implements ActionListener { String message = "\n\tOffice Scripting Framework Version 0.3" + "\n\n\n\tPlease ensure that you have exited from Office"; - /* String userDir = (String) System.getProperty( "user.dir" ); - boolean isValid = validateCurrentUserDir(userDir); - if( !isValid ) { - nextButtonEnable = false; - message = "Please run Installer from the program directory in a valid Office installation"; - setUpWelcomePanel(message); - return; - } - - int programPosition = userDir.lastIndexOf("program"); - String offInstallPth = null; - offInstallPth = userDir.substring( 0, programPosition ); - - wizard.storeLocation(offInstallPth); */ setUpWelcomePanel(message); }//GEN-END:initComponents @@ -76,70 +62,8 @@ public class Welcome extends javax.swing.JPanel implements ActionListener { NavPanel nav = new NavPanel(wizard, false, nextButtonEnable, true, "", InstallWizard.VERSIONS); nav.setNextListener(this); add(nav, java.awt.BorderLayout.SOUTH); - - //Banner br = new Banner(); - //add(br, java.awt.BorderLayout.WEST); - } - - - private boolean validateCurrentUserDir(String userDir){ - - - - Properties props = null; - - File fileVersions = null; - try - { - fileVersions = InstUtil.buildSversionLocation(); - } - catch(IOException eFnF) - { - System.err.println("Cannot find sversion.ini/.sversionrc"); - JOptionPane.showMessageDialog(this, eFnF.getMessage(), "File not Found", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); } - try { - props = InstUtil.getOfficeVersions(fileVersions); - } - catch (IOException eIO) { - //Message about no installed versions found - System.err.println("Failed to parse SVERSION"); - JOptionPane.showMessageDialog(this, "There was a problem reading from the Office settings file.", "Parse Error", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); - } - - - boolean versionMatch = false; - - for( int i = 0; i < versions.length; i++ ) { - String key = versions[i]; - String progPath = props.getProperty( key ); - if ( progPath != null ){ - progPath = progPath + File.separator + "program"; - - File tmpFile = new File(progPath + File.separator + "oostubversion.txt"); - try{ - tmpFile.createNewFile(); - - if( new File(userDir + File.separator + "oostubversion.txt").exists()) - { - versionMatch = true; - break; - } - } - catch( IOException e) - { - // Fail silently - } - tmpFile.delete(); - } - } - return versionMatch; - } - - public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT); diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 3cdb1587cadd..7871d7eed97b 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -4034,8 +4034,6 @@ public class TextPortionEnumerationTest new FuzzyTester().doTest(intree, outtree); } - private void dumpTree(TreeNode tree) { dumpTree(tree, "> "); } - private void dumpTree(TreeNode tree, String prefix) { System.out.println(prefix + tree.toString()); diff --git a/toolkit/test/accessibility/EventListener.java b/toolkit/test/accessibility/EventListener.java index 66fe5da5de67..8d7efd5ac37f 100644 --- a/toolkit/test/accessibility/EventListener.java +++ b/toolkit/test/accessibility/EventListener.java @@ -31,16 +31,6 @@ public class EventListener } - private static String objectToString(Object aObject) - { - if (aObject == null) - return null; - else - return aObject.toString(); - } - - - /** This method handles accessibility objects that are being disposed. */ public void disposing (XAccessibleContext xContext) diff --git a/toolkit/test/accessibility/OfficeConnection.java b/toolkit/test/accessibility/OfficeConnection.java index 63679e249119..51e185c50be7 100644 --- a/toolkit/test/accessibility/OfficeConnection.java +++ b/toolkit/test/accessibility/OfficeConnection.java @@ -58,11 +58,6 @@ public class OfficeConnection connect (msDefaultHost, mnDefaultPort); } - private void connect (String hostname) - { - connect (hostname, mnDefaultPort); - } - /** @descr Connect to a already running LibreOffice application that has been started with a command line argument like "--accept=socket,host=localhost,port=5678;urp;" diff --git a/toolkit/test/accessibility/TopWindowListener.java b/toolkit/test/accessibility/TopWindowListener.java index 46cc4429ea83..85cbc39f3e22 100644 --- a/toolkit/test/accessibility/TopWindowListener.java +++ b/toolkit/test/accessibility/TopWindowListener.java @@ -136,32 +136,6 @@ class TopWindowListener - /** This method exists for debugging. It prints a list of all top - level windows. - */ - private void ShowAllTopLevelWindows () - { - XExtendedToolkit xToolkit = maOffice.getExtendedToolkit(); - if (xToolkit != null) - { - int nTopWindowCount = xToolkit.getTopWindowCount(); - for (int i=0; i<nTopWindowCount; i++) - { - try - { - System.out.println (i + " : " + xToolkit.getTopWindow (i)); - } - catch (Exception e) - { - System.out.println ("caught exception; " + e); - } - } - } - } - - - - // XTopWindowListener public void windowOpened (final com.sun.star.lang.EventObject aEvent) throws RuntimeException diff --git a/ucb/qa/complex/tdoc/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java index d97349937dbd..19c91e0a895b 100644 --- a/ucb/qa/complex/tdoc/_XContent.java +++ b/ucb/qa/complex/tdoc/_XContent.java @@ -56,11 +56,6 @@ public class _XContent { private boolean disposed = false; private boolean firedEvent = false; - public void reset() { - disposed = false; - firedEvent = false; - } - public void contentEvent(com.sun.star.ucb.ContentEvent contentEvent) { firedEvent = true; } diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java index 815209a32ce8..df6ea2d1723f 100644 --- a/ucb/qa/complex/ucb/UCB.java +++ b/ucb/qa/complex/ucb/UCB.java @@ -75,63 +75,6 @@ public class UCB { return xCmdProcessor.execute(aCommand, 0, null); } - private List listFiles(String path, Verifier verifier) throws Exception { - Object xContent = getContent(path); - - OpenCommandArgument2 aArg = new OpenCommandArgument2(); - aArg.Mode = OpenMode.ALL; - aArg.Priority = 32768; - - // Fill info for the properties wanted. - aArg.Properties = new Property[] { new Property()}; - - aArg.Properties[0].Name = "Title"; - aArg.Properties[0].Handle = -1; - - XDynamicResultSet xSet; - - xSet = - UnoRuntime.queryInterface(XDynamicResultSet.class, executeCommand(xContent, "open", aArg)); - - XResultSet xResultSet = xSet.getStaticResultSet(); - - List<String> files = new ArrayList<String>(); - - if (xResultSet.first()) - { - // obtain XContentAccess interface for child content access and XRow for properties - XContentAccess xContentAccess = UnoRuntime.queryInterface(XContentAccess.class, xResultSet); - XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet); - do - { - // Obtain URL of child. - String aId = xContentAccess.queryContentIdentifierString(); - // First column: Title (column numbers are 1-based!) - String aTitle = xRow.getString(1); - if (aTitle.length() == 0 && xRow.wasNull()) - { - //ignore - } - else - { - files.add(aTitle); - } - } while (xResultSet.next()); // next child - } - - if (verifier != null) - { - for (int i = 0; i < files.size(); i++) - { - if (!verifier.verify(files.get(i))) - { - files.remove(i--); - } - } - } - return files; - } - public Object getContentProperty( Object content, String propName, diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index afcab2a472a1..16cded8b34bc 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -1352,97 +1352,6 @@ public class NumericalHelper return aShortVal; } - /** - * Helper class for roman numbering - */ - private static class RomanNumbering - { - - /** the used roman lettesrs **/ - private static final String[] ROMAN_EQUIV = new String[] - { - "I", "V", "X", "L", "C", "D", "M" - }; - /** max number that can be converted **/ - private static final int MAX_NUMBER = 3999; - /** min number that can be converted **/ - private static final int MIN_NUMBER = 1; - /** ASCII code for the number 0 **/ - private static final int ASCII_CODE_0 = 48; - /** special number for the conversion algorithm **/ - private static final int FOUR = 4; - /** special number for the conversion algorithm **/ - private static final int FIVE = 5; - /** special number for the conversion algorithm **/ - private static final int NINE = 9; - - /** - * Get the roman equivalent to an arabic number, e.g. 17 -> XVII. - * The allowed range for numbers goes from 1 to 3999. These can be - * converted using ASCII letters (3999 -> MMMCMXCIX). - * @param n the arabic number - * @return the roman equivalent as string - * @throws com.sun.star.script.BasicErrorException if the number cannot be converted. - */ - public static String getRomanEquivalent(int n) - throws Exception - { - StringBuffer romanNumber = new StringBuffer(); - try - { - if (n > MAX_NUMBER || n < MIN_NUMBER) - { - DebugHelper.exception(1 /*BasicErrorCode.SbERR_OUT_OF_RANGE*/, PropertyNames.EMPTY_STRING); - } - String number = NumericalHelper.toString(new Integer(n)); - /* converison idea: every digit is written with a maximum of two - * different roman symbols, using three in total, e.g. CC, CD, - * DCC, CM for the hundreds (meaning 200, 400, 700 and 900). - * So every digit is converted separately with regard to the - * special cases 4 and 9. - */ - int symbolIndex = 0; - for (int i = number.length() - 1; i >= 0; i--) - { - StringBuffer romanDigit = new StringBuffer(); - int b = number.charAt(i) - ASCII_CODE_0; - if (b == FOUR) - { // special case IV - romanDigit.append(ROMAN_EQUIV[symbolIndex]); - romanDigit.append(ROMAN_EQUIV[symbolIndex + 1]); - } - else if (b == NINE) - { // special case IX - romanDigit.append(ROMAN_EQUIV[symbolIndex]); - romanDigit.append(ROMAN_EQUIV[symbolIndex + 2]); - } - else - { - if (b >= FIVE) - { // special case V - romanDigit.append(ROMAN_EQUIV[symbolIndex + 1]); - b = b - FIVE; - } - for (int j = 0; j < b; j++) - { // append I's - romanDigit.append(ROMAN_EQUIV[symbolIndex]); - } - } - // next group of three symbols - symbolIndex += 2; - // append in reverse: we are starting at the right - romanNumber.append(romanDigit.reverse()); - } - } - catch (com.sun.star.lang.IllegalArgumentException e) - { -//TODO does not do anything anyway DebugHelper.exception(e); - } - // reverse again to get the number - return romanNumber.reverse().toString(); - } - } - public static boolean representsIntegerNumber(double _dblvalue) { double dblsecvalue = ((int) _dblvalue); diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java index 03465a57b61a..e8c2f108c234 100644 --- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java +++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java @@ -124,19 +124,6 @@ public class ColumnPropertySet } } - private int getPrecision() - { - try - { - return ((Integer) xPropertySet.getPropertyValue("Precision")).intValue(); - } - catch (Exception e) - { - e.printStackTrace(System.err); - return 0; - } - } - private void setType(int _nType, String _sTypeName, Integer precision) { if (_sTypeName.equals(PropertyNames.EMPTY_STRING)) @@ -197,8 +184,4 @@ public class ColumnPropertySet } } - private int getType() - { - return nType; - } } diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 9e550ed3a21e..b581898dd5a5 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -170,11 +170,6 @@ public class Control extends Shape return controlname; } - private void setDefaultValue(Object DatabaseField) - { - oDefaultValue = Helper.getUnoPropertyValue(DatabaseField, "DefaultValue"); - } - public int getPreferredWidth(String sText) { Size aPeerSize = getPreferredSize(sText); diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index f8b919c7e626..4b49ebc737b6 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -171,18 +171,6 @@ public class FormControlArranger return bisreducable; } - private int getControlGroupWidth() - { - if (m_dbControlWidth > m_LabelWidth) - { - return m_dbControlWidth; - } - else - { - return m_LabelWidth; - } - } - private void checkJustifiedPosition(int a) { int nBaseWidth = nFormWidth + cXOffset; @@ -648,18 +636,6 @@ public class FormControlArranger } } - private int assignFieldLength(int _fieldlength) - { - if (_fieldlength >= 65535) - { - return -1; - } - else - { - return _fieldlength; - } - } - public int getFormHeight() { return m_controlMaxPosY - cYOffset; diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index e1f2b86ea2d1..b44e595c5cd9 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -238,19 +238,6 @@ public class UIControlArranger m_aButtonList.addItemListener(this); } - public void setToLeftAlign() - { - Helper.setUnoPropertyValue(UnoDialog.getModel(optAlignLeft), PropertyNames.PROPERTY_STATE, new Short((short) 1)); - } - - /* (non-Javadoc) - * @see javax.swing.ListModel#addListDataListener(javax.swing.event.ListDataListener) - */ - public void addListDataListener(ListDataListener arg0) - { - // TODO Auto-generated method stub - } - public void itemStateChanged(ItemEvent arg0) { try @@ -284,30 +271,6 @@ public class UIControlArranger } /* (non-Javadoc) - * @see javax.swing.event.ListDataListener#contentsChanged(javax.swing.event.ListDataEvent) - */ - public void contentsChanged(ListDataEvent arg0) - { - // TODO Auto-generated method stub - } - - /* (non-Javadoc) - * @see javax.swing.event.ListDataListener#intervalAdded(javax.swing.event.ListDataEvent) - */ - public void intervalAdded(ListDataEvent arg0) - { - // TODO Auto-generated method stub - } - - /* (non-Javadoc) - * @see javax.swing.event.ListDataListener#intervalRemoved(javax.swing.event.ListDataEvent) - */ - public void intervalRemoved(ListDataEvent arg0) - { - // TODO Auto-generated method stub - } - - /* (non-Javadoc) * @see com.sun.star.lang.XEventListener#disposing(com.sun.star.lang.EventObject) */ public void disposing(EventObject arg0) diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 4e186e322ac0..7bce85cc5e6d 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -179,18 +179,6 @@ public class ReportBuilderImplementation extends ReportImplementationHelper } } - private void sleep(int _nSeconds) - { - try - { - Thread.sleep(_nSeconds * 1000); - } - catch (java.lang.InterruptedException e) - { - } - - } - private void switchOffPropertyBrowser() { try @@ -462,11 +450,6 @@ public class ReportBuilderImplementation extends ReportImplementationHelper dispose(); } - private XConnection getConnection() - { - return getRecordParser().DBConnection; - } - public void initializeFieldColumns(final int _nType, final String TableName, final String[] FieldNames) { getRecordParser().initializeFieldColumns(FieldNames, TableName); diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index 7737c02026e7..9b4281297427 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -382,12 +382,6 @@ public class PrimaryKeyHandler implements XFieldSelectionListener Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueExisting), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenableAutoValueCheckBox)); } - private void toggleSeveralPrimeKeyFields() - { - boolean bdoEnable = (this.optUseSeveral.getState()); - curPrimaryKeySelection.toggleListboxControls(Boolean.valueOf(bdoEnable)); - } - public String[] getPrimaryKeyFields(TableDescriptor _curtabledescriptor) { if (chkcreatePrimaryKey.getState() == 0) diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 97844cca8967..5ce45963b124 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -543,16 +543,6 @@ public class AggregateComponent extends ControlScroller } } - private String getSelectedFieldName() - { - return xFieldListBox.getSelectedItem(); - } - - private String getSelectedFunction() - { - return xFunctionListBox.getSelectedItem(); - } - private void setVisible(boolean _bvisible) { CurUnoDialog.setControlVisible(getFunctionControlName(index), _bvisible); diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 10b80afbb5fb..c14ce73fa1f6 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -359,11 +359,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener return pageStart + i; } - private int getImageIndexFor(int i) - { - return i - pageStart; - } - public void contentsChanged(ListDataEvent event) { } @@ -636,12 +631,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener return UnoRuntime.queryInterface(XControl.class, control).getModel(); } - private void setBorder(Object control, Short border) - { - Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - } - - public Object[] getSelectedObjects() { return new Object[] diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 7998a8fd3224..e61b31364529 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -765,12 +765,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener return UnoRuntime.queryInterface(XControl.class, control).getModel(); } - //TODO what is when the image does not display an image? - private void setBorder(Object control, Short border) - { - Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - } - private int getImageFromEvent(Object event) { Object image = ((EventObject) event).Source; diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 094b58844cf5..fed0a32424de 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -521,26 +521,6 @@ public class UnoDialog implements EventNames /** * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against - * the property "visible". Therefore a control meant to be invisible is placed on a step far far away. - * @param controlname the name of the control - * @param iStep change the step if you want to make the control invisible - */ - private void setControlVisible(String controlname, int iStep) - { - try - { - int iCurStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP)); - setControlProperty(controlname, PropertyNames.PROPERTY_STEP, new Integer(iStep)); - } - catch (com.sun.star.lang.IllegalArgumentException exception) - { - exception.printStackTrace(System.err); - } - } - - /** - * The problem with setting the visibility of controls is that changing the current step - * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. * Afterwards the step property of the dialog has to be set with "repaintDialogStep". As the performance * of that method is very bad it should be used only once for all controls diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index c068cd114ef1..fbf72b7a0df7 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -338,17 +338,6 @@ public class UnoDialog2 extends UnoDialog return xDlgContainer.getControl(componentName); } - private void setControlPropertiesDebug(Object model, String[] names, Object[] values) - { - for (int i = 0; i < names.length; i++) - { - System.out.println(" Settings: " + names[i]); - Helper.setUnoPropertyValue(model, names[i], values[i]); - } - - - } - public Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues, Class<? extends XInterface> type) { return UnoRuntime.queryInterface(type, insertControlModel2(serviceName, componentName, sPropNames, oPropValues)); diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index 416efe9a7c37..5d3675bc8d09 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -72,24 +72,6 @@ public class UnoDataAware extends DataAware Helper.setUnoPropertyValue(unoModel, unoPropName, value); } - private String stringof(Object value) - { - if (value.getClass().isArray()) - { - StringBuffer sb = new StringBuffer("["); - for (int i = 0; i < ((short[]) value).length; i++) - { - sb.append(((short[]) value)[i]).append(" , "); - } - sb.append("]"); - return sb.toString(); - } - else - { - return value.toString(); - } - } - /** * Try to get from an arbitrary object a boolean value. * Null returns Boolean.FALSE; |