diff options
53 files changed, 91 insertions, 135 deletions
diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index b46f4a3f62e0..aff906105cd8 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -139,7 +139,7 @@ public class ListBox extends TestCase } /* ------------------------------------------------------------------ */ - private String[] impl_getTypedValue( final String _asType, final int _rowNum ) + private String[] impl_getTypedValue( final String _asType ) { Map< String, String[] > valueMap = new HashMap< String, String[] >(); valueMap.put( "bigint", new String[] { "1111111111", "222222222" } ); @@ -207,7 +207,7 @@ public class ListBox extends TestCase XPreparedStatement statement = connection.prepareStatement( sql.toString() ); XParameters statementParameters = UnoRuntime.queryInterface( XParameters.class, statement ); - final String[] keyValues = impl_getTypedValue( keyTypes[i], 0 ); + final String[] keyValues = impl_getTypedValue( keyTypes[i] ); for ( int row=0; row<displayValues.length; ++row ) { diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java index 72336546445e..02553e81c27e 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java @@ -35,7 +35,6 @@ import com.sun.star.lib.uno.helper.Factory; import com.sun.star.lang.XSingleComponentFactory; import com.sun.star.lib.uno.helper.WeakBase; -import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XServiceInfo; /** This class capsulates the class, that implements the minimal component, a diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index 74f53fdaef2c..eb1c5770f784 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -124,7 +124,7 @@ public class DialogComponent { return "Created dialog \"" + DialogURL + "\""; } - public void copyText( XDialog xDialog, Object aEventObject ) { + public void copyText( XDialog xDialog ) { XControlContainer xControlContainer = UnoRuntime.queryInterface( XControlContainer.class, xDialog ); String aTextPropertyStr = "Text"; diff --git a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java index 2e61fb25622d..c22e6701394b 100644 --- a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java +++ b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java @@ -77,7 +77,7 @@ public class ImageControlSample extends UnoDialogSample{ new Object[] { new Integer(16), "This code-sample demonstrates how to create an ImageControlSample within a dialog", Boolean.TRUE, "HeaderLabel", new Integer(6), new Integer(6), new Integer(210)}); // add the model to the NameContainer of the dialog model oImageControlSample.m_xDlgModelNameContainer.insertByName("Headerlabel", oFTHeaderModel); - XPropertySet xICModelPropertySet = oImageControlSample.insertImageControl(xMCF, 68, 30, 32, 90); + XPropertySet xICModelPropertySet = oImageControlSample.insertImageControl(68, 30, 32, 90); oImageControlSample.insertButton(oImageControlSample, 90, 75, 50, "~Close dialog", (short) PushButtonType.OK_value); oImageControlSample.createWindowPeer(); // note: due to issue i76718 ("Setting graphic at a controlmodel required dialog peer") the graphic of the image control @@ -101,7 +101,7 @@ public class ImageControlSample extends UnoDialogSample{ } - public XPropertySet insertImageControl(XMultiComponentFactory _xMCF, int _nPosX, int _nPosY, int _nHeight, int _nWidth){ + public XPropertySet insertImageControl(int _nPosX, int _nPosY, int _nHeight, int _nWidth){ XPropertySet xICModelPropertySet = null; try{ // create a unique name by means of an own implementation... diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index 07fa1106086f..71d2314ccda1 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -167,7 +167,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis oUnoDialogSample.insertFileControl(oUnoDialogSample, 106, 290, 200 ); oUnoDialogSample.insertButton(oUnoDialogSample, 106, 320, 50, "~Close dialog", (short) PushButtonType.OK_value); oUnoDialogSample.createWindowPeer(); - oUnoDialogSample.addRoadmap(oUnoDialogSample.getRoadmapItemStateChangeListener()); + oUnoDialogSample.addRoadmap(); oUnoDialogSample.insertRoadmapItem(0, true, "Introduction", 1); oUnoDialogSample.insertRoadmapItem(1, true, "Documents", 2); oUnoDialogSample.xDialog = UnoRuntime.queryInterface(XDialog.class, oUnoDialogSample.m_xDialogControl); @@ -274,7 +274,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis if (m_xWindowPeer == null){ createWindowPeer(); } - addRoadmap(getRoadmapItemStateChangeListener()); + addRoadmap(); insertRoadmapItem(0, true, "Introduction", 1); insertRoadmapItem(1, true, "Documents", 2); xDialog = UnoRuntime.queryInterface(XDialog.class, m_xDialogControl); @@ -1411,7 +1411,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis XSingleServiceFactory m_xSSFRoadmap; XIndexContainer m_xRMIndexCont; - public void addRoadmap(XItemListener _xItemListener) { + public void addRoadmap() { XPropertySet xDialogModelPropertySet = null; try { // create a unique name by means of an own implementation... diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java index a48e46956826..225262732e49 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java @@ -121,7 +121,7 @@ public class UnoDialogSample2 extends UnoDialogSample { oUnoDialogSample2.createWindowPeer(); // add the roadmap control. Note that the roadmap may not be created before the windowpeer of the dialog exists // (see http://qa.openoffice.org/issues/show_bug.cgi?id=67369) - oUnoDialogSample2.addRoadmap(oUnoDialogSample2.getRoadmapItemStateChangeListener()); + oUnoDialogSample2.addRoadmap(); oUnoDialogSample2.insertRoadmapItem(0, true, "Introduction", 1); oUnoDialogSample2.insertRoadmapItem(1, true, "Supported Services", 2); oUnoDialogSample2.insertRoadmapItem(2, true, "Interfaces", 3); diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index 2e089b14c2b7..442a56f40195 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -210,7 +210,7 @@ public class ConvWatch // Status end String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; - INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, "", ""); + INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, ""); INIoutput.createHeader(); // TODO: version info was fine @@ -272,7 +272,7 @@ public class ConvWatch String sNameNoSuffix = FileHelper.getNameNoSuffix(sBasename); String sINIFile = _sFilenamePrefix + sNameNoSuffix + ".ini"; - INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, _sFilenamePrefix, ""); + INIOutputter INIoutput = INIOutputter.create(_sOutputPath, sINIFile, _sFilenamePrefix); INIoutput.createHeader(); // LLA? what if the are no values in the list? true or false; INIoutput.writeSection("global"); diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index 2a76f6c53358..b8a0691629e2 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -204,7 +204,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase sHTMLName = m_sInputPath.substring(n + 1); sHTMLName += ".html"; } - HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath, sHTMLName, "", ""); + HTMLOutputter HTMLoutput = HTMLOutputter.create(m_sOutputPath, sHTMLName, ""); HTMLoutput.header( m_sOutputPath ); HTMLoutput.indexSection( m_sOutputPath ); LISTOutputter LISToutput = LISTOutputter.create(m_sOutputPath, "allfiles.txt"); diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index 7d99bda6f0ab..b749169f851a 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -34,7 +34,7 @@ public class HTMLOutputter String ls; HTMLOutputter() {} - public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix, String _sTitle ) + public static HTMLOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) { FileHelper.makeDirectories("", _sOutputPath); HTMLOutputter a = new HTMLOutputter(); diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index 3169e42cb3bf..30d6a0d913f7 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -32,7 +32,7 @@ public class INIOutputter */ String ls; - public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix, String _sTitle ) + public static INIOutputter create( String _sOutputPath, String _sHTMLFilename, String _sNamePrefix ) { FileHelper.makeDirectories("", _sOutputPath); INIOutputter a = new INIOutputter(); diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 81c426928c47..38955f252004 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -149,10 +149,10 @@ public class PRNCompare String[] aRefList = createJPEGFromPostscript(m_sOutputPath, m_sReferencePath, m_sReferenceFile, getResolutionInDPI()); // TODO: Assume, that Postscript is already in the OutputPath, this may change. String[] aPSList = createJPEGFromPostscript(m_sOutputPath, m_sOutputPath, m_sPostScriptFile, getResolutionInDPI()); - StatusHelper[] aList = createDiffs(m_sOutputPath, - aRefList, + StatusHelper[] aList = createDiffs(aRefList, aPSList, - getMaxPages(), m_tUseBorderMove); + getMaxPages(), + m_tUseBorderMove); return aList; } @@ -342,7 +342,7 @@ public class PRNCompare } - public StatusHelper[] createDiffs(String _sOutputPath, String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove) + public StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove) { if (_nMaxDiffs < 1) { diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index b7723fd779a1..36109cc93650 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -91,7 +91,7 @@ class graphics_stuff return 0; } - public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter) + public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) { for (int y = 0; y < _h; y++) { for (int x = 0; x < _w; x++) { @@ -105,7 +105,7 @@ class graphics_stuff int h = _aImage.getHeight(); CountPixel aCountNotWhite = new CountNotWhite(); - countPixel(_aImage, 0, 0, w, h, aCountNotWhite); + countPixel(_aImage, w, h, aCountNotWhite); return aCountNotWhite.getCount(); } @@ -115,7 +115,7 @@ class graphics_stuff int h = _aImage.getHeight(); CountPixel aCountNotBlack = new CountNotBlack(); - countPixel(_aImage, 0, 0, w, h, aCountNotBlack); + countPixel(_aImage, w, h, aCountNotBlack); return aCountNotBlack.getCount(); } } diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index 65a2ce6f8360..0e2be21334b0 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -292,10 +292,6 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) return ""; } - public void runThroughOneFileInIndex(String _sPath, String _sBasename, ParameterHelper _aParam) - { - - } /** * Run through a given index.ini or run through a given directory, * find all postscript or pdf files. diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java index 10dab09451d9..0c0fd711d724 100644 --- a/qadevOOo/runner/graphical/PixelCounter.java +++ b/qadevOOo/runner/graphical/PixelCounter.java @@ -118,7 +118,7 @@ class CountNotBlack extends CountPixel class graphics_stuff { - public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter) + public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) { for (int y = 0; y < _h; y++) { for (int x = 0; x < _w; x++) { @@ -132,7 +132,7 @@ class graphics_stuff final int h = _aImage.getHeight(); CountPixel aCountNotWhite = new CountNotWhite(); - countPixel(_aImage, 0, 0, w, h, aCountNotWhite); + countPixel(_aImage, w, h, aCountNotWhite); return aCountNotWhite.getCount(); } @@ -142,7 +142,7 @@ class graphics_stuff final int h = _aImage.getHeight(); CountPixel aCountNotBlack = new CountNotBlack(); - countPixel(_aImage, 0, 0, w, h, aCountNotBlack); + countPixel(_aImage, w, h, aCountNotBlack); return aCountNotBlack.getCount(); } } diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 2e92a5711868..085f8f2e80cf 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -228,7 +228,7 @@ public class APIDescGetter extends DescGetter System.out.println("## reading from jar"); } - entry = getFromClassPath(job, debug); + entry = getFromClassPath(job); } boolean foundInterface = false; @@ -515,7 +515,7 @@ public class APIDescGetter extends DescGetter return entries; } - protected DescEntry getFromClassPath(String aEntry, boolean debug) + protected DescEntry getFromClassPath(String aEntry) { int dotindex = aEntry.indexOf('.'); diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java index 6d3b4eb7c50c..3af899f97dcb 100644 --- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java +++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java @@ -28,7 +28,7 @@ import util.PropertyName; import util.utils; /** - * Implementaion of the interface CwsDataExchange + * Implementation of the interface CwsDataExchange * @see share.CwsDataExchange */ public class CwsDataExchangeImpl implements CwsDataExchange @@ -39,7 +39,7 @@ public class CwsDataExchangeImpl implements CwsDataExchange private final BuildEnvTools bet; private final boolean mDebug; - public CwsDataExchangeImpl(String cwsName, TestParameters param, LogWriter log) throws ParameterNotFoundException + public CwsDataExchangeImpl(TestParameters param, LogWriter log) throws ParameterNotFoundException { this.param = param; this.log = log; diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index a2f0015d1125..3e4553755fa1 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -24,7 +24,6 @@ import com.sun.star.awt.XWindow; import com.sun.star.frame.XController; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; -import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 467a9ce6a600..377b6eaa8d56 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -263,7 +263,7 @@ public class DBTools { * Creates class instance. * @param xMSF <code>XMultiServiceFactory</code>. */ - public DBTools(XMultiServiceFactory xMSF, PrintWriter _logger ) + public DBTools(XMultiServiceFactory xMSF ) { this.xMSF = xMSF ; try { diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index a03ff4045d8d..eae018a1608b 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -70,7 +70,7 @@ public class DataSource synchronized ( this ) { if ( m_document == null ) - m_document = new DatabaseDocument( m_orb, this ); + m_document = new DatabaseDocument( this ); } return m_document; } diff --git a/qadevOOo/runner/util/db/DatabaseDocument.java b/qadevOOo/runner/util/db/DatabaseDocument.java index f67ad90485e1..d620a8248b70 100644 --- a/qadevOOo/runner/util/db/DatabaseDocument.java +++ b/qadevOOo/runner/util/db/DatabaseDocument.java @@ -22,7 +22,6 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XModel; import com.sun.star.frame.XStorable; import com.sun.star.io.IOException; -import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.sdb.XDocumentDataSource; import com.sun.star.sdb.XOfficeDatabaseDocument; import com.sun.star.uno.UnoRuntime; @@ -32,7 +31,7 @@ import com.sun.star.uno.UnoRuntime; */ public class DatabaseDocument { - protected DatabaseDocument( final XMultiServiceFactory _orb, final DataSource _dataSource ) + protected DatabaseDocument( final DataSource _dataSource ) { m_dataSource = _dataSource; diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 0322f4abc7af..091be8f0f739 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -292,7 +292,7 @@ public class CheckModuleAPI extends ComplexTestCase { // cws version: all added modules must be tested final String cws = version.substring(4, version.length()); - final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(cws, param, log); + final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log); final ArrayList<String> addedModules = cde.getModules(); final ArrayList<String> moduleNames = new ArrayList<String>(); @@ -546,7 +546,7 @@ public class CheckModuleAPI extends ComplexTestCase // cws version: all added modules must be tested final String cws = version.substring(4, version.length()); - final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(cws, param, log); + final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log); cde.setUnoApiCwsStatus(status); } catch (ParameterNotFoundException ex) diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 0e0d0e582872..b63b2491fd52 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -165,7 +165,7 @@ public class ORowSet extends TestCase { origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); - dbTools = new DBTools( m_orb, _log ); + dbTools = new DBTools( m_orb ); // creating DataSource and registering it in DatabaseContext String dbURL = (String) Param.get("test.db.url"); diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index 8109ae63cee0..5ace649a9690 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -397,7 +397,7 @@ public class GenericModelTest extends TestCase { log.println("copy '"+sourceTestDB + "' -> '" + destTestDB + "'"); utils.copyFile(xMSF, sourceTestDB, destTestDB); - m_dbTools = new DBTools( xMSF, log ); + m_dbTools = new DBTools( xMSF ); String tmpDir = utils.getOfficeTemp((xMSF)); m_srcInf = m_dbTools.newDataSourceInfo(); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 8f42343a2b4a..26be61c77b0c 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -233,7 +233,7 @@ public class ODatabaseForm extends TestCase { origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); - dbTools = new DBTools( tParam.getMSF(), log ); + dbTools = new DBTools( tParam.getMSF() ); // creating DataSource and registering it in DatabaseContext String dbURL = (String) tParam.get("test.db.url"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index cfd35362d233..9855b6b2991c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -329,7 +329,7 @@ public class SwXMailMerge extends TestCase { xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; - DBTools dbt = new DBTools( Param.getMSF(), log ); + DBTools dbt = new DBTools( Param.getMSF() ); // registering source in DatabaseContext log.println("register database '"+tmpDatabaseUrl+"' as '"+databaseName+"'" ); dbt.reRegisterDB(databaseName, newSource) ; @@ -388,7 +388,7 @@ public class SwXMailMerge extends TestCase { protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing connections..."); XMultiServiceFactory xMsf = Param.getMSF(); - DBTools dbt = new DBTools( xMsf, log ); + DBTools dbt = new DBTools( xMsf ); if (Param.containsKey("uniqueSuffix")){ int uniqueSuffix = Param.getInt("uniqueSuffix"); diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 48177154468d..5b5704c32cb3 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -220,7 +220,7 @@ public class SDBCReportDataFactory implements DataSourceFactory } } - private String getOrderStatement(final int commandType, final String command, final List sortExpressions) + private String getOrderStatement(final List sortExpressions) { final StringBuffer order = new StringBuffer(); final int count = sortExpressions.size(); @@ -493,7 +493,7 @@ public class SDBCReportDataFactory implements DataSourceFactory WrappedTargetException, NoSuchElementException { - final StringBuffer order = new StringBuffer(getOrderStatement(commandType, command, (ArrayList<?>) parameters.get(SORT_EXPRESSIONS))); + final StringBuffer order = new StringBuffer(getOrderStatement((ArrayList<?>) parameters.get(SORT_EXPRESSIONS))); if (order.length() > 0 && commandType != CommandType.TABLE) { String statement = command; diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index b9d6d3953f4d..c0216b1fc30d 100644 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java @@ -351,7 +351,7 @@ public class ReportDesignerTest return sFileType; } - private String getOutputPath(int _nType) + private String getOutputPath() { String sOutputPath = util.utils.getOfficeTemp/*Dir*/(getMSF());// (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); @@ -374,7 +374,7 @@ public class ReportDesignerTest */ private void storeComponent(String _sName, Object _xComponent, int _nType) { - String sOutputPath = getOutputPath(_nType); + String sOutputPath = getOutputPath(); // add DocumentPoolName sOutputPath += getDocumentPoolName(_nType); 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 98c54a6ff5f6..48cb3edd25b4 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -293,7 +293,7 @@ public class ScriptMetaData extends ScriptEntry { URL url = null; int indexOfColon = path.indexOf(":"); String scheme = path.substring( 0, indexOfColon ); - UCBStreamHandler handler = new UCBStreamHandler( parent.parent.m_xCtx, scheme, parent.m_xSFA); + UCBStreamHandler handler = new UCBStreamHandler( scheme, parent.m_xSFA); path += UCBStreamHandler.separator; url = new URL(null, path, handler); 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 1f799d1469bd..613b628d8687 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -23,13 +23,11 @@ import java.io.*; import java.util.*; import java.util.zip.*; -import com.sun.star.uno.XComponentContext; import com.sun.star.ucb.XSimpleFileAccess; import com.sun.star.uno.UnoRuntime; import com.sun.star.io.XInputStream; import com.sun.star.io.XOutputStream; import com.sun.star.io.XTruncate; - import com.sun.star.script.framework.log.LogUtils; import com.sun.star.script.framework.provider.PathUtils; @@ -41,7 +39,7 @@ public class UCBStreamHandler extends URLStreamHandler { private HashMap<String,InputStream> m_jarStreamMap = new HashMap<String,InputStream>(12); public static String m_ucbscheme; - public UCBStreamHandler( XComponentContext ctxt, String scheme, XSimpleFileAccess xSFA ) + public UCBStreamHandler( String scheme, XSimpleFileAccess xSFA ) { LogUtils.DEBUG( "UCBStreamHandler ctor, scheme = " + scheme ); UCBStreamHandler.m_ucbscheme = scheme; 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 a752648f999f..78459c2d0409 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -109,20 +109,20 @@ public class PlainSourceView extends JScrollPane /* Implementation of DocumentListener interface */ public void insertUpdate(DocumentEvent e) { - doChanged(e); + doChanged(); } public void removeUpdate(DocumentEvent e) { - doChanged(e); + doChanged(); } public void changedUpdate(DocumentEvent e) { - doChanged(e); + doChanged(); } /* If the number of lines in the JTextArea has changed then update the GlyphGutter */ - public void doChanged(DocumentEvent e) { + public void doChanged() { isModified = true; if (linecount != ta.getLineCount()) { diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.java b/smoketest/com/sun/star/comp/smoketest/TestExtension.java index e2253b4b5322..ed57f2f96e8d 100644 --- a/smoketest/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java @@ -21,7 +21,6 @@ package com.sun.star.comp.smoketest; import com.sun.star.lib.uno.helper.Factory; import com.sun.star.lang.XSingleComponentFactory; import com.sun.star.lib.uno.helper.WeakBase; -import com.sun.star.uno.XComponentContext; import com.sun.star.registry.XRegistryKey; import com.sun.star.lang.XServiceInfo; diff --git a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java index 4198739311f5..fe4f3464e21e 100644 --- a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java +++ b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java @@ -20,7 +20,6 @@ package org.libreoffice.smoketest; import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XServiceInfo; import com.sun.star.ucb.XCommandEnvironment; diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index af1c333cf05b..ab673ed7bdc4 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -83,7 +83,7 @@ class AccTreeNode HandlerDescriptor aDescriptor = maHandlers.get(i); aDescriptor.maHandler = aDescriptor.maHandler.createHandler (mxContext); aDescriptor.mnChildCount = - aDescriptor.maHandler.getChildCount (this); + aDescriptor.maHandler.getChildCount (); } } @@ -161,7 +161,7 @@ class AccTreeNode HandlerDescriptor aDescriptor = maHandlers.get(i); if (aDescriptor.mnChildCount < 0) aDescriptor.mnChildCount = - aDescriptor.maHandler.getChildCount (this); + aDescriptor.maHandler.getChildCount (); return aDescriptor; } @@ -211,7 +211,7 @@ class AccTreeNode // search with next handler HandlerDescriptor aDescriptor = getHandlerDescriptor (i); if (nIndex < aDescriptor.mnChildCount) - return aDescriptor.maHandler.getChildNoCreate (this, nIndex); + return aDescriptor.maHandler.getChildNoCreate (nIndex); else nIndex -= aDescriptor.mnChildCount; } @@ -236,8 +236,8 @@ class AccTreeNode HandlerDescriptor aDescriptor = getHandlerDescriptor (i); if (nIndex < aDescriptor.mnChildCount) { - bStatus = aDescriptor.maHandler.removeChild (this, nIndex); - aDescriptor.mnChildCount = aDescriptor.maHandler.getChildCount (this); + bStatus = aDescriptor.maHandler.removeChild (nIndex); + aDescriptor.mnChildCount = aDescriptor.maHandler.getChildCount (); break; } else @@ -334,7 +334,7 @@ class AccTreeNode { AccessibleTreeHandler aHandler = (AccessibleTreeHandler)aDescriptor.maHandler; AccessibleTreeNode aNode = aHandler.addAccessibleChild (this, xChild); - aDescriptor.mnChildCount = aHandler.getChildCount (this); + aDescriptor.mnChildCount = aHandler.getChildCount (); return aNode; } } @@ -363,7 +363,7 @@ class AccTreeNode { aDescriptor.maHandler.update(this); // Get updated number of children. - int nChildCount = aDescriptor.maHandler.getChildCount (this); + int nChildCount = aDescriptor.maHandler.getChildCount (); aDescriptor.mnChildCount = nChildCount; // Fill in the indices of the updated children. for (int j=0; j<nChildCount; j++) diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index a7cbbaf13e70..6cec54febf75 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import javax.swing.event.TreeModelEvent; -import javax.swing.event.TreeModelListener; import javax.swing.tree.TreePath; import com.sun.star.accessibility.XAccessible; diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index cf0f49220203..736d2f3101c6 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -240,16 +240,6 @@ class CanvasShape - /** Callback for disposing events. - */ - public void disposing (com.sun.star.lang.EventObject e) - { - System.out.println ("Disposing"); - } - - - - /** Compute whether the specified point lies inside the object's bounding box. */ diff --git a/toolkit/test/accessibility/NodeHandler.java b/toolkit/test/accessibility/NodeHandler.java index e6da882ac075..73a36aa917a4 100644 --- a/toolkit/test/accessibility/NodeHandler.java +++ b/toolkit/test/accessibility/NodeHandler.java @@ -48,7 +48,7 @@ abstract class NodeHandler } /** return the number of children this object has */ - public int getChildCount(Object aObject) + public int getChildCount() { synchronized (maChildList) { @@ -77,7 +77,7 @@ abstract class NodeHandler } } - public AccessibleTreeNode getChildNoCreate (AccessibleTreeNode aParent, int nIndex) + public AccessibleTreeNode getChildNoCreate (int nIndex) { synchronized (maChildList) { @@ -87,7 +87,7 @@ abstract class NodeHandler /** Remove the specified child from the list of children. */ - public boolean removeChild (AccessibleTreeNode aNode, int nIndex) + public boolean removeChild (int nIndex) { try { @@ -124,12 +124,6 @@ abstract class NodeHandler // They have default implementations for no actions and read-only. - /** May this child be changed? */ - public boolean isChildEditable (AccessibleTreeNode aNode, int nIndex) - { - return false; - } - /** get names of supported actions */ public String[] getActions (AccessibleTreeNode aNode) { diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java index e8c2f108c234..10458ac87204 100644 --- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java +++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java @@ -76,7 +76,7 @@ public class ColumnPropertySet { xPropertySet.setPropertyValue("Precision", precision); } - setType(nType, sTypeName, precision); + setType(sTypeName, precision); for (int i = 0; i < _aNewColPropertyValues.length; i++) { String sPropName = _aNewColPropertyValues[i].Name; @@ -124,7 +124,7 @@ public class ColumnPropertySet } } - private void setType(int _nType, String _sTypeName, Integer precision) + private void setType(String _sTypeName, Integer precision) { if (_sTypeName.equals(PropertyNames.EMPTY_STRING)) { diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index a4fe38852e9c..ef1b026468a9 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -82,7 +82,7 @@ public class CommandMetaData extends DBMetaData super(xMSF); } - public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames) + public void initializeFieldColumns(String _CommandName, String[] _FieldNames) { this.setCommandName(_CommandName); FieldColumns = new FieldColumn[_FieldNames.length]; @@ -271,7 +271,7 @@ public class CommandMetaData extends DBMetaData throw new com.sun.star.uno.RuntimeException(); } - public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode) + public boolean getFieldNamesOfCommand(String _commandname, int _commandtype) { try { @@ -660,10 +660,6 @@ public class CommandMetaData extends DBMetaData return skeycolumnnames; } - public void openFormDocument(boolean _bReadOnly) - { - } - public void setCommandComposingAttributes() { try diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 4b994ac667d9..3db987015417 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -200,7 +200,7 @@ public class QueryMetaData extends CommandMetaData return oTable.getColumns().getElementNames(); } - public void initializeFieldTitleSet(boolean _bAppendMode) + public void initializeFieldTitleSet() { try { diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index b581898dd5a5..c29266578cc3 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -67,23 +67,23 @@ public class Control extends Shape { super(_oFormHandler, _aPoint, _aSize); xFormName = _xFormName; - createControl(_icontroltype, _aPoint, _aSize, null, _FieldName); + createControl(_icontroltype, null, _FieldName); } public Control(FormHandler _oFormHandler, XShapes _xGroupShapes, XNameContainer _xFormName, int _icontroltype, Point _aPoint, Size _aSize) { super(_oFormHandler, _aPoint, _aSize); xFormName = _xFormName; - createControl(_icontroltype, _aPoint, _aSize, _xGroupShapes, null); + createControl(_icontroltype, _xGroupShapes, null); } public Control(FormHandler _oFormHandler, int _icontroltype, Point _aPoint, Size _aSize) { super(_oFormHandler, _aPoint, _aSize); - createControl(_icontroltype, _aPoint, _aSize, null, null); + createControl(_icontroltype, null, null); } - public void createControl(int _icontroltype, Point _aPoint, Size _aSize, XShapes _xGroupShapes, String _FieldName) + public void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName) { try { diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index 540c503bdf0f..35f00c6ed500 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -62,7 +62,7 @@ public class OfficeDocument private XWindowPeer xWindowPeer; /** Creates a new instance of OfficeDocument */ - public OfficeDocument(XMultiServiceFactory _xMSF) + public OfficeDocument() { } diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index 4b49ebc737b6..1527c0665d90 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -329,7 +329,7 @@ public class FormControlArranger } } - public void positionControls(int _icurArrangement, Point _aStartPoint, Size _aFormSize, short _iAlign, Short _NBorderType) + public void positionControls(int _icurArrangement, Point _aStartPoint, short _iAlign, Short _NBorderType) { try { diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index bd89cbc1d3ba..55f4f9f011e3 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -240,8 +240,8 @@ public class FormDocument extends TextDocument { oMainControlForm.oFormController.positionControls(oMainControlForm.curArrangement, oMainControlForm.aStartPoint, - oMainControlForm.getFormSize(), - curUIControlArranger.getAlignValue(), _NBorderType); + curUIControlArranger.getAlignValue(), + _NBorderType); } } @@ -262,7 +262,7 @@ public class FormDocument extends TextDocument { // oSubControlForm.oFormController.adjustYPositions(_idiffheight); oSubControlForm.setStartPoint(new Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() + oMainControlForm.aStartPoint.Y + SOFORMGAP)); - oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, oSubControlForm.getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType); + oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType); } } @@ -404,11 +404,11 @@ public class FormDocument extends TextDocument else { adaptControlStyles = !oFormController.areControlsexisting(); - oFormController.positionControls(_curArrangement, aStartPoint, getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType); + oFormController.positionControls(_curArrangement, aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType); } if (adaptControlStyles) { - curStyleApplier.applyStyle(false, true); + curStyleApplier.applyStyle(true); } if ((Name.equals(SOMAINFORM)) && (oControlForms.size() > 1)) { diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index eda38213af72..5d2407213d73 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -120,7 +120,7 @@ public class FormWizard extends DatabaseObjectWizard { final String sTableName = curSubFormFieldSelection.getSelectedCommandName(); String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames(); - curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames); + curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames); } else { @@ -172,7 +172,7 @@ public class FormWizard extends DatabaseObjectWizard { final String sTableName = curDBCommandFieldSelection.getSelectedCommandName(); final String[] aFieldNames = curDBCommandFieldSelection.getSelectedFieldNames(); - curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames); + curFormDocument.oMainFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames); final String[] aMainFieldNames = curFormDocument.oMainFormDBMetaData.getFieldNames(); try @@ -190,7 +190,7 @@ public class FormWizard extends DatabaseObjectWizard { final String sTableName = curSubFormFieldSelection.getSelectedCommandName(); final String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames(); - curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames); + curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames); final String[] aSubFieldNames = curFormDocument.oSubFormDBMetaData.getFieldNames(); try diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 40f551592561..2a8b19a78931 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -21,7 +21,6 @@ import com.sun.star.awt.XListBox; import com.sun.star.awt.XRadioButton; import com.sun.star.beans.XPropertySet; import com.sun.star.container.XNameAccess; -import com.sun.star.lang.EventObject; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.AnyConverter; @@ -186,7 +185,7 @@ public class StyleApplier return (short) -1; } - public void applyStyle(boolean _bmodifyBackground, boolean _bapplyalways) + public void applyStyle(boolean _bapplyalways) { short iStyle = getStyleIndex(); if ((iStyle != iOldLayoutPos) || _bapplyalways) diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index f082d8fc5d3a..2ab4b9217fe5 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -139,7 +139,7 @@ public class QueryWizard extends DatabaseObjectWizard return m_createdQuery; } - public void enableRoadmapItems(String[] _FieldNames, boolean _bEnabled) + public void enableRoadmapItems(boolean _bEnabled) { try { @@ -324,7 +324,7 @@ public class QueryWizard extends DatabaseObjectWizard { case SOFIELDSELECTION_PAGE: m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames()); - m_DBMetaData.initializeFieldTitleSet(true); + m_DBMetaData.initializeFieldTitleSet(); m_DBMetaData.setNumericFields(); searchForOutdatedFields(); break; @@ -387,7 +387,7 @@ public class QueryWizard extends DatabaseObjectWizard boolean bEnabled = NewItems.length > 0; setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED, bEnabled); setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED, bEnabled); - enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved + enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved } public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 593b63529a61..77ed2f34e8ad 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -149,7 +149,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi } } - public void importReportData(final XMultiServiceFactory _xMSF, final Dataimport _CurDataimport, IReportDocument _CurReportDocument, PropertyValue[] _properties) + public void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties) { if (CurReportDocument.reconnectToDatabase(_xMSF, _properties)) { @@ -167,6 +167,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi { CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource ); showProgressDisplay(true); - importReportData(xMSF, this, CurReportDocument, properties); + importReportData(xMSF, properties); } } diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index e64375b0b1af..f5ceb87fed1b 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -55,7 +55,7 @@ public class FieldFormatter implements XItemListener String suntitled; Integer IFieldFormatStep; - public FieldFormatter(TableWizard _CurUnoDialog, TableDescriptor _curTableDescriptor) + public FieldFormatter(TableWizard _CurUnoDialog) { this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100); @@ -390,11 +390,6 @@ public class FieldFormatter implements XItemListener txtfieldname.setText(_ColumnName); } - public XPropertySet clonePropertySet(XPropertySet _xPropertySet) - { - return null; - } - public void itemStateChanged(ItemEvent arg0) { String fieldname = xlstFieldNames.getSelectedItem(); diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index d7ac335dfb6b..e58b5cc2a549 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -381,7 +381,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueExisting), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenableAutoValueCheckBox)); } - public String[] getPrimaryKeyFields(TableDescriptor _curtabledescriptor) + public String[] getPrimaryKeyFields() { if (chkcreatePrimaryKey.getState() == 0) { diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 70ce06bccaa2..f3e74be9abf2 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -237,7 +237,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener public void buildSteps() { curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields); - curFieldFormatter = new FieldFormatter(this, curTableDescriptor); + curFieldFormatter = new FieldFormatter(this); if ( this.curTableDescriptor.supportsPrimaryKeys() ) { curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor); @@ -254,7 +254,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener String catalogname = curFinalizer.getCatalogName(); if (curTableDescriptor.supportsPrimaryKeys()) { - String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor); + String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(); if (keyfieldnames != null) { if (keyfieldnames.length > 0) diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index 3a014aa22cce..0b3712e00c73 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -23,7 +23,6 @@ import com.sun.star.container.XIndexAccess; import com.sun.star.container.XNameAccess; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.WrappedTargetException; -import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.style.XStyleFamiliesSupplier; import com.sun.star.text.XPageCursor; import com.sun.star.text.XTextContent; diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 80b5b9c3ae03..437f3ac39ca4 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -222,7 +222,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { curCommandName = sSelectedTableName; // sLocList[iSelPos]; CurDBMetaData.setTableByName(curCommandName); - binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode); + binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE); } else { @@ -231,14 +231,14 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< CurDBMetaData.setCommandType(CommandType.TABLE); curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sTablePrefix); CurDBMetaData.setTableByName(curCommandName); - binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode); + binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE); } else { CurDBMetaData.setCommandType(CommandType.QUERY); curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sQueryPrefix); CurDBMetaData.setQueryByName(curCommandName); - binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY, AppendMode); + binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY); } } if (binitialize) diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 7bc43dd540db..dbcba18b2b9a 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -179,11 +179,6 @@ public class FilterComponent public void disposing(EventObject eventObject) { } - - public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent) - { - getfilterstate(); - } } public static String getIndexNumber(String _sStr) @@ -948,7 +943,7 @@ public class FilterComponent return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "Text")); } - protected String getDateTimeString(boolean bgetDate) + protected String getDateTimeString() { double dblValue = ((Double) getValue()).doubleValue(); NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter(); |