diff options
149 files changed, 222 insertions, 312 deletions
diff --git a/forms/qa/integration/forms/TableCellTextBinding.java b/forms/qa/integration/forms/TableCellTextBinding.java index 8a1d1fb8ce18..2fe0736bb929 100644 --- a/forms/qa/integration/forms/TableCellTextBinding.java +++ b/forms/qa/integration/forms/TableCellTextBinding.java @@ -195,8 +195,4 @@ public class TableCellTextBinding } } - public void disposing(com.sun.star.lang.EventObject eventObject) - { - // not interested in - } } diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index c71c3df9a33e..3e5694d48a0e 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -487,7 +487,6 @@ public class EventTest { // get the position and the range of a scroll bar XWindow xWindow = AccessibilityTools.getCurrentWindow( - getMSF(), xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 95314dbf3b17..6b2ff6f0c51c 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -81,7 +81,7 @@ public class AcceleratorsConfigurationTest String sConfigPath = "org.openoffice.Office.Accelerators"; boolean bReadOnly = false; - XNameAccess m_xConfig2 = openConfig(m_xSmgr, sConfigPath, bReadOnly); + XNameAccess m_xConfig2 = openConfig(sConfigPath, bReadOnly); if (m_xConfig2 != null) { m_xPrimaryKeys = UnoRuntime.queryInterface(XNameAccess.class, m_xConfig2.getByName("PrimaryKeys")); @@ -694,7 +694,7 @@ public class AcceleratorsConfigurationTest String sConfigPath = "org.openoffice.Setup"; boolean bReadOnly = true; - XNameAccess xRootConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly); + XNameAccess xRootConfig = openConfig(sConfigPath, bReadOnly); if (xRootConfig != null) { @@ -714,7 +714,7 @@ public class AcceleratorsConfigurationTest { String sConfigPath = "org.openoffice.Setup"; boolean bReadOnly = false; - XNameAccess xRootConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly); + XNameAccess xRootConfig = openConfig(sConfigPath, bReadOnly); if (xRootConfig != null) { @@ -729,7 +729,7 @@ public class AcceleratorsConfigurationTest /** @todo document me. */ - private XNameAccess openConfig(XMultiServiceFactory xSMGR, + private XNameAccess openConfig( String sConfigPath, boolean bReadOnly) throws java.lang.Exception diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index f621a5a5ef0b..59d8abc6b58d 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -293,7 +293,7 @@ public class CheckContextMenuInterceptor System.out.println("try to open contex menu..."); new AccessibilityTools(); - xWindow = AccessibilityTools.getCurrentWindow(xMSF, aModel); + xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index c022e17d9b97..7a5d2acdec9f 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -102,7 +102,7 @@ public class RecoveryTest extends ComplexTestCase { handleRecoveryDialogAfterCrash(expectedDocumentCount); startOffice(); handleRecoveryDialog_QuickExit(expectedDocumentCount); - handleCrashReporterDialog(true, true); + handleCrashReporterDialog(true); checkDocumentCount(expectedDocumentCount); } @@ -264,7 +264,7 @@ public class RecoveryTest extends ComplexTestCase { } } - private void handleCrashReporterDialog(boolean cancel, boolean YesNo){ + private void handleCrashReporterDialog(boolean cancel){ try{ log.println("try to get Crash Reporter Dialog..."); diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java index 02111c0d89f4..d5004c477928 100644 --- a/framework/qa/complex/imageManager/CheckImageManager.java +++ b/framework/qa/complex/imageManager/CheckImageManager.java @@ -75,7 +75,7 @@ public class CheckImageManager { fail("Exception. " + e.getMessage()); } XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager()); - performChecks(xImageManager, "ModuleUIConfig", xManager); + performChecks(xImageManager, "ModuleUIConfig"); } public void checkImageManager() { @@ -89,10 +89,10 @@ public class CheckImageManager { } XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager()); - performChecks(xImageManager, "UIConfig", xManager); + performChecks(xImageManager, "UIConfig"); } - private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) { + private void performChecks(XImageManager xImageManager, String testObjectName) { util.dbg.printInterfaces(xImageManager); OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(); diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 3e2b37bda924..955fa0b1dd38 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -219,7 +219,7 @@ public class CheckXComponentLoader @Test public void checkUsingOfMediaDescriptor() { InteractionHandler xHandler = new InteractionHandler(); - StatusIndicator xIndicator = new StatusIndicator(StatusIndicator.SHOWSTATUS_LOG); + StatusIndicator xIndicator = new StatusIndicator(); PropertyValue[] lProps = new PropertyValue[3]; diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index d83651ed861d..691b4c76b605 100644 --- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -53,7 +53,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator * ctor * It's initialize an object of this class with default values. */ - public StatusIndicator( int nOut) + public StatusIndicator() { m_bWasUsed = false; } diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index f23cf0e9ffa4..0c01ef32228e 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -563,7 +563,10 @@ public class PathSettingsTest System.out.println(" FAIL: Did not change value on property " + name + "."); bResult = false; } - newVal = changeToIncorrectValue(val); + /* + * Change the given String to an incorrect path URL. + */ + newVal = "fileblablabla"; System.out.println(" Try to change to incorrect value '" + newVal + "'"); try { @@ -650,16 +653,6 @@ public class PathSettingsTest } /** - * Change the given String to an incorrect path URL. - * @return The changed path URL. - */ - private String changeToIncorrectValue(String path) - { - // return an illegal path - return "fileblablabla"; - } - - /** * Listener implementation which sets a flag when * listener was called. */ diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index 2a75a94ef132..7208c58b30f5 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -69,7 +69,6 @@ public class ChartHelper } public XChartDocument insertOLEChartInWriter( - String sChartName, Point aUpperLeft, Size aExtent, String sChartServiceName ) @@ -143,7 +142,6 @@ public class ChartHelper } public XChartDocument insertOLEChartInDraw( - String sChartName, Point aUpperLeft, Size aExtent, String sChartServiceName ) diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java index eff07574eeb0..bf16e57bb40e 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java @@ -78,7 +78,6 @@ public class ChartInDraw // insert a new chart into the "Chart" sheet of the // spreadsheet document XChartDocument aChartDoc = aChartHelper.insertOLEChartInDraw( - "BarChart", aPos, aExtent, "com.sun.star.chart.BarDiagram" ); diff --git a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java index 34678a1eccad..d9585c31ff6c 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java @@ -86,7 +86,6 @@ public class ChartInWriter // insert a new chart into the "Chart" sheet of the // spreadsheet document XChartDocument aChartDoc = aChartHelper.insertOLEChartInWriter( - "BarChart", aPos, aExtent, "com.sun.star.chart.AreaDiagram" ); diff --git a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java index c1227b2d2721..95b476125c55 100644 --- a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java @@ -89,7 +89,6 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener // insert a new chart into the "Chart" sheet of the // spreadsheet document maChartDocument = aChartHelper.insertOLEChartInDraw( - "ChartWithCalcData", aPos, aExtent, "com.sun.star.chart.XYDiagram" ); diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java index 76baa819a222..72336546445e 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java @@ -58,7 +58,7 @@ public class LicenseTest { * @param xmultiservicefactoryInitialization A special service factory * could be introduced while initializing. */ - public _LicenseTest(XComponentContext xCompContext) { + public _LicenseTest() { } /** This method returns an array of all supported service names. diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index ef0223a7c1e5..b7723fd779a1 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -91,15 +91,10 @@ class graphics_stuff return 0; } - public static void handlesinglepixel(int x, int y, int pixel) - { - } - public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter) { for (int y = 0; y < _h; y++) { for (int x = 0; x < _w; x++) { - // handlesinglepixel(x+i, y+j, pixels[j * w + i]); _aPixelCounter.count(img.getPixel(x,y)); } } diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index ef1e7513db73..2e92a5711868 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -259,7 +259,7 @@ public class APIDescGetter extends DescGetter } protected static DescEntry[] getSubEntries(BufferedReader cvsFile, - DescEntry parent, boolean debug) + DescEntry parent) { String line = ""; String old_ifc_name = ""; @@ -621,7 +621,7 @@ public class APIDescGetter extends DescGetter theEntry.entryName + "'"); } - DescEntry[] subEntries = getSubEntries(csvFile, theEntry, debug); + DescEntry[] subEntries = getSubEntries(csvFile, theEntry); theEntry.SubEntryCount = subEntries.length; theEntry.SubEntries = subEntries; @@ -708,7 +708,7 @@ public class APIDescGetter extends DescGetter return setErrorDescription(aEntry, "couldn't find file '" + aUrl + "'"); } - DescEntry[] subEntries = getSubEntries(csvFile, aEntry, debug); + DescEntry[] subEntries = getSubEntries(csvFile, aEntry); aEntry.SubEntryCount = subEntries.length; aEntry.SubEntries = subEntries; @@ -759,7 +759,7 @@ public class APIDescGetter extends DescGetter System.out.println("## reading from File " + descPath); } - scenario = getScenarioFromDirectory(descPath, job, debug); + scenario = getScenarioFromDirectory(descPath, job); } else { @@ -768,14 +768,13 @@ public class APIDescGetter extends DescGetter System.out.println("## reading from jar"); } - scenario = getScenarioFromClassPath(job, debug); + scenario = getScenarioFromClassPath(job); } return scenario; } - protected String[] getScenarioFromDirectory(String descPath, String job, - boolean debug) + protected String[] getScenarioFromDirectory(String descPath, String job) { String[] modules = null; ArrayList<String> componentList = new ArrayList<String>(); @@ -829,7 +828,7 @@ public class APIDescGetter extends DescGetter } - protected String[] getScenarioFromClassPath(String job, boolean debug) + protected String[] getScenarioFromClassPath(String job) { String subdir = "/"; diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java index 873edc4782ed..7fd2fb011e36 100644 --- a/qadevOOo/runner/helper/PropertyHandlerImpl.java +++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java @@ -18,7 +18,6 @@ package helper; import com.sun.star.inspection.LineDescriptor; -import com.sun.star.inspection.XPropertyControlFactory; import com.sun.star.inspection.XPropertyHandler; /** @@ -236,10 +235,4 @@ public class PropertyHandlerImpl implements XPropertyHandler{ return false; } - /** - * This method currently does nothing - */ - public void describePropertyLine(String string, LineDescriptor[] lineDescriptor, XPropertyControlFactory xPropertyControlFactory) { - } - } diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 531946d88eb9..a0c93f34896c 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -447,7 +447,7 @@ public class MultiPropertyTest extends MultiMethodTest * The method produces new value of the property from the oldValue. * It returns the result of ValueChanger.changePValue method. * Subclasses can override the method to return their own value, - * when the changePValue beahviour is not enough, for example, + * when the changePValue behavior is not enough, for example, * when oldValue is null. */ protected Object getNewValue(String propName, Object oldValue) @@ -459,7 +459,7 @@ public class MultiPropertyTest extends MultiMethodTest /** * The method compares obj1 and obj2. It calls * MultiPropertyTest.compare, but subclasses can override to change - * the behaviour, since normally compare calls Object.equals method + * the behavior, since normally compare calls Object.equals method * which is not appropriate in some cases(e.g., structs with equals * not overridden). */ @@ -471,7 +471,7 @@ public class MultiPropertyTest extends MultiMethodTest /** * The method returns a String representation of the obj. It calls * MultipropertyTest.toString(Object), but subclasses can override - * to change the behaviour. + * to change the behavior. */ protected String toString(Object obj) { diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index 521dff7a30bc..d398f209cba4 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -59,7 +59,7 @@ public class RunnerService implements XJob, XServiceInfo, * ct'tor * Construct an own office provider for tests */ - public RunnerService(XMultiServiceFactory xMSF) { + public RunnerService() { } public Object execute(NamedValue[] args) { diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index baa6bb4a4e7a..48fe2062af11 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -90,11 +90,6 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { return true; } - // check the database afterwards - protected boolean checkDataBase(LogWriter log) { - return true; - } - protected boolean insertEntry(LogWriter log) { executeSQLCommand("SELECT id AS \"entry.id\", name AS \"entry.name\" FROM entry WHERE name = \"$EntryLongName\";", true); diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index e13bfcf58c68..a2f0015d1125 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -43,17 +43,15 @@ public class AccessibilityTools { return UnoRuntime.queryInterface(XAccessible.class, xObject); } - public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf, - XModel xModel) { - return getWindow(msf, xModel, true); + public static XWindow getCurrentContainerWindow(XModel xModel) { + return getWindow(xModel, true); } - public static XWindow getCurrentWindow(XMultiServiceFactory msf, - XModel xModel) { - return getWindow(msf, xModel, false); + public static XWindow getCurrentWindow(XModel xModel) { + return getWindow(xModel, false); } - private static XWindow getWindow(XMultiServiceFactory msf, XModel xModel, + private static XWindow getWindow(XModel xModel, boolean containerWindow) { XWindow xWindow = null; diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 97fb2c53fab2..9d48c946ac97 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -49,7 +49,7 @@ public class BasicMacroTools { XComponent xDoc) throws java.lang.Exception { try { mMSF = msf; - mDispProv = makeDispatchProvider(mMSF, xModel); + mDispProv = makeDispatchProvider(xModel); mParser = makeParser(mMSF); Object DocLibCont = null; @@ -82,7 +82,7 @@ public class BasicMacroTools { throws java.lang.Exception { try { mMSF = msf; - mDispProv = makeDispatchProvider(mMSF, xModel); + mDispProv = makeDispatchProvider(xModel); mParser = makeParser(mMSF); Object ASLC = null; @@ -107,8 +107,7 @@ public class BasicMacroTools { } } - private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory mMSF, - XModel aModel) + private static XDispatchProvider makeDispatchProvider(XModel aModel) throws java.lang.Exception { XController xController = aModel.getCurrentController(); XFrame xFrame = xController.getFrame(); diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index 72ca975c540e..dec23a20f8ae 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -215,12 +215,9 @@ public class SOfficeFactory { * * @see XChartDocument */ - public XChartDocument createChartDoc(String frameName) + public XChartDocument createChartDoc() throws com.sun.star.uno.Exception { -// XComponent oDoc = loadDocument( -// util.utils.getFullTestURL("emptyChart.sds")); - XComponent oDoc = loadDocument("private:factory/schart"); if (oDoc != null) { diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index db99c090b7ab..0df280360c83 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -53,14 +53,14 @@ public class UITools { public UITools(XMultiServiceFactory msf, XModel xModel) { mMSF = msf; - mXRoot = makeRoot(mMSF, xModel); + mXRoot = makeRoot(xModel); } public UITools(XMultiServiceFactory msf, XTextDocument xTextDoc) { mMSF = msf; XModel xModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); - mXRoot = makeRoot(mMSF, xModel); + mXRoot = makeRoot(xModel); } public UITools(XMultiServiceFactory msf, XWindow xWindow) @@ -69,9 +69,9 @@ public class UITools { mXRoot = makeRoot(xWindow); } - private static XAccessible makeRoot(XMultiServiceFactory msf, XModel aModel) + private static XAccessible makeRoot(XModel aModel) { - XWindow xWindow = AccessibilityTools.getCurrentWindow(msf, aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); return AccessibilityTools.getAccessibleObject(xWindow); } diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java index 01a5b717846a..950eee89cfbc 100644 --- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java +++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java @@ -85,8 +85,7 @@ public class Job { } - public static XSingleServiceFactory __getServiceFactory(String implName, - XMultiServiceFactory multiFactory, + public static XSingleServiceFactory __getServiceFactory(XMultiServiceFactory multiFactory, XRegistryKey regKey) { XSingleServiceFactory xSingleServiceFactory = null; xSingleServiceFactory = FactoryHelper.getServiceFactory(_Implementation.class, diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 1209ac99af94..9b3a2b54a709 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -459,7 +459,6 @@ public class _XUserInputInterception extends MultiMethodTest { util.DesktopTools.bringWindowToFront(xModel); XWindow xWindow = AccessibilityTools.getCurrentWindow( - tParam.getMSF(), xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java index bd295d1dc9ff..dd19cf8f52a4 100644 --- a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java @@ -34,7 +34,6 @@ public class _XHierarchicalPropertySet extends MultiMethodTest { boolean res = true; if (hpsi != null) { - res = checkHPSI(hpsi); } else { log.println( "The component doesn't provide HierarchicalPropertySetInfo"); @@ -119,13 +118,6 @@ public class _XHierarchicalPropertySet extends MultiMethodTest { tRes.tested("setHierarchicalPropertyValue()", res); } - protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) { - log.println("Checking the resulting HierarchicalPropertySetInfo"); - log.println("### NOT yet implemented"); - - return true; - } - protected boolean checkType(String name, String type, Object value) { boolean result = true; diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java index f915f6175c4c..9bcc3436e1c1 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java @@ -34,7 +34,6 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest { boolean res = true; if (hpsi != null) { - res = checkHPSI(hpsi); } else { log.println( "The component doesn't provide HierarchicalPropertySetInfo"); @@ -113,13 +112,6 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest { tRes.tested("setHierarchicalPropertyValues()", res); } - protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) { - log.println("Checking the resulting HierarchicalPropertySetInfo"); - log.println("### NOT yet implemented"); - - return true; - } - protected boolean checkType(String[] name, String[] type, Object[] value) { boolean result = true; diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index dbfd307fc195..9c5bb63e46df 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -76,7 +76,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { log.println("try to open contex menu..."); new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), docModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(docModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index 3f81fd01de8d..5fb682a45365 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -157,7 +157,7 @@ public class _XRangeSelection extends MultiMethodTest { XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); System.out.println("Name: " + xModel.getCurrentController().getFrame().getName()); - XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), xModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java index a12dc1b1681e..abf5b541efbc 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java @@ -46,7 +46,6 @@ public class _XRemoteContentProviderAcceptor extends MultiMethodTest { public void doneWithRemoteContentProviders (XRemoteContentProviderAcceptor xRCPA) { } - public void disposing (com.sun.star.lang.EventObject obj) {} } diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index fbce478c2d90..e9b41cb1819c 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -156,7 +156,7 @@ public class _XContextMenuInterception extends MultiMethodTest { log.println("try to open contex menu..."); new AccessibilityTools(); - xWindow = AccessibilityTools.getCurrentWindow(xMSF, xModel); + xWindow = AccessibilityTools.getCurrentWindow(xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java index 5269f3320a56..3eed73afe2ee 100644 --- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java @@ -75,10 +75,10 @@ public class NestedRegistry extends TestCase { /** * Creates a temporary copy of file, which is deleted when VM exits. * @param src Source file path. - * @param dst Destination file path. + * @param dst Destination file path. * @throws java.io.IOException If any problems occur during copiing. */ - protected void copyFile(String src, String dst, PrintWriter log) + protected void copyFile(String src, String dst) throws java.io.IOException { File srcF = new File(src) ; File dstF = new File(dst) ; @@ -139,8 +139,8 @@ public class NestedRegistry extends TestCase { log.println("creating copies of the registry for XSimpleRegistry"); try { String source = utils.getFullTestDocName("XSimpleRegistry.rdb"); - copyFile(source, openF, log) ; - copyFile(source, mergeF, log) ; + copyFile(source, openF) ; + copyFile(source, mergeF) ; } catch (java.io.IOException e) { log.println("Exception occurred while copying files"); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 27b1558e6331..b01d3239d91d 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -135,8 +135,7 @@ public class various extends TestCase { * Creates object which can call <code>accept</code> method * of the Acceptor object specified. */ - public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv, - XBridgeFactory xBrdgFctr) { + public AcceptorThread(XAcceptor acc) { this.acc = acc ; } @@ -212,7 +211,7 @@ public class various extends TestCase { // create own implementation of XInstanceProvider XInstanceProvider xInstProv = new MyInstanceProvider(xMSF); // create waiting acceptor thread - accThread = new AcceptorThread(xAcctr, xInstProv, xBrdgFctr); + accThread = new AcceptorThread(xAcctr); accThread.start(); // let the thread sleep try { diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java index 1b33a5013c08..1c70b16ae621 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java @@ -144,7 +144,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - Param.getMSF(), xModel)); + xModel)); if (xRoot != null) { AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE_CELL, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java index 014c1514ca1b..6e60de59a3c8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java @@ -103,7 +103,7 @@ public class ScAccessibleCell extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index 7e4592aabf26..fa684178317f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -86,7 +86,7 @@ public class ScAccessibleDocument extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, ""); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index e35d766591cb..ee42b5fefe55 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -155,7 +155,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index ce3f885bab82..059ff1cc7680 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -143,7 +143,7 @@ public class ScAccessiblePageHeader extends TestCase { throw new RuntimeException(e); } try { - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index 767c6e6d2ff5..86bee325185d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -137,7 +137,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java index d2494e629775..20863da2ac60 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java @@ -167,7 +167,7 @@ public class ScAccessiblePreviewCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - Param.getMSF(), xModel)); + xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE_CELL, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index fcc75f674cff..c70381d33f06 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -248,7 +248,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - Param.getMSF(), xModel)); + xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE, "A"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java index f923cd4ae4a0..d7809c99914f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java @@ -171,7 +171,7 @@ public class ScAccessiblePreviewTable extends TestCase { try { xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentContainerWindow( - Param.getMSF(), xModel)); + xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index ac371a92788f..3d6456b70c99 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -108,7 +108,7 @@ public class ScAccessibleSpreadsheet extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), xModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index 899316452179..785ec8f1c15e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -49,7 +49,7 @@ public class AccArea extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccArea extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index 97cd53f7b6ca..4dc8907a996c 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -49,7 +49,7 @@ public class AccAxis extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccAxis extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 6d67300fe2c8..733c60d958c7 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -49,7 +49,7 @@ public class AccDataPoint extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccDataPoint extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index 0d3012fec7f8..4a6fbad30243 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -49,7 +49,7 @@ public class AccDataSeries extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccDataSeries extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 711f41a090c8..03c23b1f37d3 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -49,7 +49,7 @@ public class AccDiagram extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccDiagram extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index 79f874b1899a..e678189fb123 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -50,7 +50,7 @@ public class AccFloor extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -85,7 +85,7 @@ public class AccFloor extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index 74d93d649590..6007c92c1681 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -49,7 +49,7 @@ public class AccGrid extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccGrid extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index 5ca79a582cda..539f27b08ecc 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -49,7 +49,7 @@ public class AccLegend extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccLegend extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 1fd5649bcc07..ae2f8b55ec15 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -49,7 +49,7 @@ public class AccLegendEntry extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccLegendEntry extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index a3fb6af8db2f..bca4797461ed 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -50,7 +50,7 @@ public class AccStatisticsObject extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); log.println("Display MeanValue"); XPropertySet diagProps = UnoRuntime.queryInterface(XPropertySet.class, xChartDoc.getDiagram()); diagProps.setPropertyValue("MeanValue",new Boolean(true)); @@ -66,7 +66,7 @@ public class AccStatisticsObject extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 36e434ff8638..526f0188cf5e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -49,7 +49,7 @@ public class AccTitle extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -62,7 +62,7 @@ public class AccTitle extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 366b4086f6f4..890d69d92c4f 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -50,7 +50,7 @@ public class AccWall extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -85,7 +85,7 @@ public class AccWall extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index 66e1ea2cd016..0c40cbe520af 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -50,7 +50,7 @@ public class AccessibleDocumentView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); @@ -108,7 +108,7 @@ public class AccessibleDocumentView extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index 9badd24576eb..4e5efac69a74 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -63,7 +63,7 @@ public class ChXChartAxis extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index 938dd81ae982..f3341bd9b709 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -51,7 +51,7 @@ public class ChXChartData extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index a8d7359cefc0..f79ca800f572 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -54,7 +54,7 @@ public class ChXChartDataArray extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index dc517a1542e8..4730be8e9e02 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -113,9 +113,9 @@ public class ChXChartDocument extends TestCase { try { log.println("creating a chartdocument"); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); log.println("Waiting before opening second document"); - doc2 = SOF.createChartDoc(null); + doc2 = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index 2eaf909325c3..9a04e9a1a82c 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -62,7 +62,7 @@ public class ChXChartView extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index 2cd6045e2548..aa9a78e5ddb1 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -58,7 +58,7 @@ public class ChartGrid extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java index 048e4b3d8086..5f20dac3681e 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLine.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java @@ -57,7 +57,7 @@ public class ChartLine extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index 200a82ac0b10..1556800e6f02 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -69,7 +69,7 @@ public class ChartTitle extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index 650db26bf639..14dc7631a6af 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -100,7 +100,7 @@ public class AccessibleDrawDocumentView extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - Param.getMSF(),aModel); + aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); //com.sun.star.accessibility.AccessibleRole diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index 0529cd2e20c7..ae830123c16a 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -66,7 +66,7 @@ public class AccessibleOutlineView extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - Param.getMSF(),aModel); + aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index 4f00e4f4a861..da7c9ff8c2dc 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -73,7 +73,7 @@ public class AccessibleSlideView extends TestCase { shortWait(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - Param.getMSF(),aModel); + aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index 02d68a7a2b49..f58c9b30f10b 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -109,7 +109,7 @@ public class SmEditAccessible extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 73a335c93cba..0ad4873e237f 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -111,7 +111,7 @@ public class SmGraphicAccessible extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index a0f585e51937..b32b949967bd 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -80,7 +80,7 @@ public class AccessibleControlShape extends TestCase { new AccessibilityTools(); utils.shortWait(5000); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 8dd456f282ba..6650bb477424 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -64,7 +64,7 @@ public class AccessibleEditableTextPara extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index 5c55daa5317e..ca795805ed12 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -86,7 +86,7 @@ public class AccessibleGraphicShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 3ed89c4dceb9..7868b126bd8f 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -107,7 +107,7 @@ public class AccessibleOLEShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 33f15a334e71..7cb5db9ee976 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -81,7 +81,7 @@ public class AccessiblePageShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 5bf17e1098bc..e14278352131 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -106,7 +106,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); // oObj = at.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index 86ae386ac39d..e38d0be52eb1 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -114,7 +114,7 @@ public class AccessiblePresentationOLEShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index ff062703ae85..21af46fff40c 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -101,7 +101,7 @@ public class AccessiblePresentationShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index b6be757523ab..1c4a9e848f48 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -85,7 +85,7 @@ public class AccessibleShape extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index 4a45f3f2b1e8..5e0ef45823fd 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -117,7 +117,7 @@ public class SwAccessibleDocumentPageView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index d4f3a54372aa..6a44cb9c86a4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -98,7 +98,7 @@ public class SwAccessibleDocumentView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 5ab4ba0640f6..3b0eb2bf3d58 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -115,7 +115,7 @@ public class SwAccessibleEndnoteView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index b1626264686a..ae1928810164 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -128,7 +128,7 @@ public class SwAccessibleFooterView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index c84d3e34b6c1..6009a8e8eaef 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -116,7 +116,7 @@ public class SwAccessibleFootnoteView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 1789a086229f..6c2edb6a70fa 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -118,7 +118,7 @@ public class SwAccessibleHeaderView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index d473fd9f848e..88587d79873c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -172,7 +172,7 @@ public class SwAccessiblePageView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index 69bbddac572f..1761527d2681 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -70,7 +70,7 @@ public class SwAccessibleParagraphView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index ffd2d9239ed8..80c908a8371d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -84,7 +84,7 @@ public class SwAccessibleTableCellView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index c6a8d23739f0..34152dbb400d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -85,7 +85,7 @@ public class SwAccessibleTableView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index 51bd95517687..611d2edfa9be 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -69,7 +69,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 0a131e411ecf..cfb3f000c213 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -102,7 +102,7 @@ public class SwAccessibleTextFrameView extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index b3af45ec1ed4..8802056e7d80 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -91,7 +91,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index c06cf952d2d3..dd0efb327a79 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -76,7 +76,6 @@ public class AccessibleDropDownComboBox extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - Param.getMSF(), xTextDoc); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index a1ca56fa4dd3..4f3e88021f0b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -77,7 +77,6 @@ public class AccessibleDropDownListBox extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - Param.getMSF(), xTextDoc); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index 32c784b3a71d..cf2b424c76d7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -142,7 +142,6 @@ public class AccessiblePopupMenu extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index 45b0d67e3762..a493590b19a4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -142,7 +142,6 @@ public class AccessibleScrollBar extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index 5f980638b387..80d8ae461340 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -144,7 +144,6 @@ public class AccessibleStatusBarItem extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index acb3bab3bc27..22e32670870c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -151,7 +151,6 @@ public class AccessibleToolBoxItem extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index 64d7e34a0fa3..d755471254ca 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -157,7 +157,6 @@ public class AccessibleWindow extends TestCase { new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index c04e7dc39fbd..643374cae18e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -73,7 +73,7 @@ public class XMLContentExporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 4365ed9525df..9830a6699a76 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -71,7 +71,7 @@ public class XMLContentImporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index c24c9a5edb3f..b93689caee55 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -73,7 +73,7 @@ public class XMLExporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index f18cd3bad74a..1e370a0b0c9f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -71,7 +71,7 @@ public class XMLImporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index 4a61f37d3415..76718a42b959 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -72,7 +72,7 @@ public class XMLStylesExporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index 99e6907e3296..c4c22c9184c3 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -69,7 +69,7 @@ public class XMLStylesImporter extends TestCase { try { log.println( "creating a chartdocument" ); - xChartDoc = SOF.createChartDoc(null); + xChartDoc = SOF.createChartDoc(); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 3dccfb4249bf..f58cf30c5e4b 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -1089,7 +1089,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget try { final StylesWriter inlineStylesWriter = new StylesWriter(rootXmlWriter); - inlineStylesWriter.writeContentStyles(predefinedStylesCollection, contentStylesCollection); + inlineStylesWriter.writeContentStyles(contentStylesCollection); final BufferState state = finishBuffering(); this.rootXmlWriter.writeStream(state.getXmlAsReader()); @@ -1099,7 +1099,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget final OutputStreamWriter osw = new OutputStreamWriter(stylesOutStream, "UTF-8"); final StylesWriter stylesWriter = new StylesWriter(osw); - stylesWriter.writeGlobalStyles(predefinedStylesCollection, globalStylesCollection); + stylesWriter.writeGlobalStyles(globalStylesCollection); stylesWriter.close(); this.rootXmlWriter.writeCloseTag(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java index 8aee4f024a9c..890958e219ae 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java @@ -79,7 +79,7 @@ public class StylesWriter this.writeOpeningTag = false; } - public void writeContentStyles(final OfficeStylesCollection predefined, + public void writeContentStyles( final OfficeStylesCollection globals) throws IOException { @@ -93,7 +93,7 @@ public class StylesWriter }); } - public void writeGlobalStyles(final OfficeStylesCollection predefined, + public void writeGlobalStyles( final OfficeStylesCollection globals) throws IOException { diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index b516c9fbcac0..157f84afa204 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -249,7 +249,7 @@ public class ViewForwarder { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessible parent = null; @@ -659,7 +659,7 @@ public class ViewForwarder { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessible parent = null; @@ -865,7 +865,7 @@ public class ViewForwarder { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, xModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); System.out.println("Press any key when the header cell is on top."); @@ -997,7 +997,7 @@ public class ViewForwarder { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); try { 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 830c58a53faa..bb00331e6e78 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 @@ -398,13 +398,13 @@ XInitialization { Object objectButton = xControlCont.getControl( _runButtonName ); XButton xButton = UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener( new ActionListenerImpl( xControlCont, _runButtonName ) ); + xButton.addActionListener( new ActionListenerImpl( _runButtonName ) ); // add to no button objectButton = xControlCont.getControl( _doNotRunButtonName ); xButton = UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener( new ActionListenerImpl( xControlCont, _doNotRunButtonName ) ); + xButton.addActionListener( new ActionListenerImpl( _doNotRunButtonName ) ); if ( checkBoxDialog ) { @@ -489,7 +489,7 @@ XInitialization { public class ActionListenerImpl implements com.sun.star.awt.XActionListener { private String _buttonName; - public ActionListenerImpl( XControlContainer xControlCont, String buttonName ) { + public ActionListenerImpl( String buttonName ) { _buttonName = buttonName; } 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 9d0283234b24..16ba11e8fe93 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -230,7 +230,7 @@ public class ParcelBrowseNode extends PropertySet String languageName = newName + "." + provider.getScriptEditor().getExtension(); String language = container.getLanguage(); - ScriptEntry entry = new ScriptEntry( language, languageName, languageName, "", new HashMap<String,String>() ); + ScriptEntry entry = new ScriptEntry( language, languageName, "", new HashMap<String,String>() ); Parcel parcel = (Parcel)container.getByName( getName() ); ScriptMetaData data = new ScriptMetaData( parcel, entry, source ); 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 6760133595a6..5b6ef9d1d55e 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -260,7 +260,7 @@ public class ScriptBrowseNode extends PropertySet String language = provider.getName(); ScriptEntry entry = new ScriptEntry( - language, languageName, languageName, "", new HashMap<String,String>() ); + language, languageName, "", new HashMap<String,String>() ); ScriptMetaData data = new ScriptMetaData( parent, entry, oldSource ); diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java index 87ed54b0242e..be1e2c808be2 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -279,7 +279,7 @@ public class ParcelDescriptor { } } } - ScriptEntry entry = new ScriptEntry(language, languagename, logicalname, "",langProps, description); + ScriptEntry entry = new ScriptEntry(language, languagename, "", langProps,description); scripts.add(entry); } return scripts.toArray(new ScriptEntry[scripts.size()]); diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java index a5eadbe74898..b02e3624577f 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java @@ -30,7 +30,7 @@ public class ScriptEntry implements Cloneable { private Map<String,String> languagedepprops; public ScriptEntry(String language, String languagename, - String logicalname, String location) { + String location) { this.language = language; this.languagename = languagename; // logical name/ function name concept @@ -53,21 +53,21 @@ public class ScriptEntry implements Cloneable { } public ScriptEntry(String language, String languagename, - String logicalname, String location, Map<String,String> languagedepprops) { - this( language, languagename, logicalname, location ); + String location, Map<String,String> languagedepprops) { + this( language, languagename, location ); this.languagedepprops = languagedepprops; } public ScriptEntry(String language, String languagename, - String logicalname, String location, - Map<String,String> languagedepprops, String description) { - this( language, languagename, logicalname, location ); + String location, Map<String,String> languagedepprops, + String description) { + this( language, languagename, location ); this.languagedepprops = languagedepprops; this.description = description; } public ScriptEntry(String languagename, String location) { - this("Java", languagename, languagename, location); + this("Java", languagename, location); } public Object clone() throws CloneNotSupportedException { diff --git a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java index 55ceeb13c247..bf39f2e519d1 100644 --- a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java +++ b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java @@ -67,7 +67,7 @@ public class ExtensionFinder implements MethodFinder { for (int j = 0; j < extensions.length; j++) { if (f.getName().endsWith(extensions[j])) { ScriptEntry entry = new ScriptEntry(language, - f.getName(), f.getName(), parcelName); + f.getName(), parcelName); list.add(entry); break; } diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java index 9804e5920c7f..ffa1b61041ae 100644 --- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java +++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java @@ -60,7 +60,6 @@ public class ScriptPanel extends JPanel { catch (CloneNotSupportedException cnse) { entry = new ScriptEntry(entries[i].getLanguage(), entries[i].getLanguageName(), - entries[i].getLogicalName(), entries[i].getLocation()); } @@ -91,7 +90,7 @@ public class ScriptPanel extends JPanel { table.addFocusListener(new FocusAdapter() { public void focusLost(FocusEvent evt) { - tableFocusLost(evt); + tableFocusLost(); } }); @@ -106,7 +105,7 @@ public class ScriptPanel extends JPanel { add(pane, BorderLayout.CENTER); } - private void tableFocusLost(FocusEvent evt) { + private void tableFocusLost() { TableCellEditor editor = table.getCellEditor(); if (editor != null) { Object value = editor.getCellEditorValue(); diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java index e81fa1233b7d..9fcf6b96cf3e 100644 --- a/scripting/workben/installer/Final.java +++ b/scripting/workben/installer/Final.java @@ -96,7 +96,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?"); if (answer == JOptionPane.YES_OPTION) { - wizard.exitForm(null); + wizard.exitForm(); } else { diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index 8d0ecc1786a9..e1969bc54f1d 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -91,7 +91,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?"); if (answer == JOptionPane.YES_OPTION) { - wizard.exitForm(null); + wizard.exitForm(); } else { diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java index e3100d8565d6..1de610656121 100644 --- a/scripting/workben/installer/IdeUpdater.java +++ b/scripting/workben/installer/IdeUpdater.java @@ -115,7 +115,7 @@ public class IdeUpdater extends Thread { internalThread = Thread.currentThread(); progressBar.setString("Unzipping Required Files"); - ZipData zd = new ZipData("SFrameworkInstall.jar"); + ZipData zd = new ZipData(); // Adding IDE support if( isNetbeansPath ) { diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java index 1134fc4ad237..3d4e92064722 100644 --- a/scripting/workben/installer/InstallWizard.java +++ b/scripting/workben/installer/InstallWizard.java @@ -84,7 +84,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener catch( FileNotFoundException fnfe ) { System.err.println("Office Scripting Framework Installer - Error: "); System.err.println("Unable to create log file for installation."); - exitForm(null); + exitForm(); } //setBackground(Color.WHITE); @@ -112,7 +112,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosing(java.awt.event.WindowEvent evt) { - exitForm(evt); + exitForm(); } }); @@ -180,7 +180,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener }// initComponents /** Exit the Application */ - public void exitForm(java.awt.event.WindowEvent evt) { + public void exitForm() { System.exit(0); } @@ -194,7 +194,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener if (e.getSource() == navCancel) { - exitForm(null); + exitForm(); } if (e.getSource() == navBack) diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java index cee9fc53ead8..ea35660dc1c5 100644 --- a/scripting/workben/installer/NavPanel.java +++ b/scripting/workben/installer/NavPanel.java @@ -85,7 +85,7 @@ public class NavPanel extends JPanel implements ActionListener { wizard.show(InstallWizard.IDEWELCOME); } else { - wizard.exitForm(null); + wizard.exitForm(); } enableIDE(false); } diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 1f2a84644662..8ff366dc00bc 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -57,7 +57,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table { System.err.println("Cannot find sversion.ini/.sversionrc"); JOptionPane.showMessageDialog(this, eFnF.getMessage(), "File not Found", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); + wizard.exitForm(); } try { @@ -67,14 +67,14 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table //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); + wizard.exitForm(); } - tableModel = new MyTableModel(props, versions); + tableModel = new MyTableModel(props); if (tableModel.getRowCount() == 0) { JOptionPane.showMessageDialog(this, "No compatible versions of Office were found.", "Invalid versions", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); + wizard.exitForm(); } tableModel.addTableModelListener(this); @@ -241,7 +241,7 @@ class MyTableModel extends AbstractTableModel { String colNames[] = {"", "Name", "Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; - MyTableModel (Properties properties, String [] validVersions) { + MyTableModel (Properties properties) { data = new ArrayList<ArrayList<Object>>(); boolean isWindows = (System.getProperty("os.name").indexOf("Windows") != -1); diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java index 30ef794fbe0e..5b0d14d3fc2f 100644 --- a/scripting/workben/installer/XmlUpdater.java +++ b/scripting/workben/installer/XmlUpdater.java @@ -163,7 +163,7 @@ public class XmlUpdater extends Thread { regSchemaOfficePath= regSchemaOfficePath.concat(File.separator+"share"+File.separator+"registry"+File.separator+"schema"+File.separator+"org"+File.separator+"openoffice"+File.separator+"Office"+File.separator); progressBar.setString("Unzipping Required Files"); - ZipData zd = new ZipData("SFrameworkInstall.jar"); + ZipData zd = new ZipData(); if( (!netInstall) || bindingsInstall) { diff --git a/scripting/workben/installer/ZipData.java b/scripting/workben/installer/ZipData.java index 0cd144a7abfd..abdf8a6641c2 100644 --- a/scripting/workben/installer/ZipData.java +++ b/scripting/workben/installer/ZipData.java @@ -22,8 +22,6 @@ import java.io.*; import javax.swing.*; public class ZipData { - public ZipData(String file) { - } public boolean extractEntry(String entry, String destination, JLabel statusLabel) { diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.java b/smoketest/com/sun/star/comp/smoketest/TestExtension.java index d9041515544e..e2253b4b5322 100644 --- a/smoketest/com/sun/star/comp/smoketest/TestExtension.java +++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java @@ -45,7 +45,7 @@ public class TestExtension { * @param xmultiservicefactoryInitialization A special service factory * could be introduced while initializing. */ - public _TestExtension(XComponentContext xCompContext) { + public _TestExtension() { } /** This method returns an array of all supported service names. diff --git a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java index 1602c114bfae..4198739311f5 100644 --- a/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java +++ b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java @@ -34,7 +34,7 @@ public class SmoketestCommandEnvironment extends WeakBase static private final String __serviceName = "com.sun.star.deployment.test.SmoketestCommandEnvironment"; - public SmoketestCommandEnvironment(XComponentContext xCompContext) { + public SmoketestCommandEnvironment() { } public static String[] getServiceNames() { diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java index 2e367bb407ca..1ed6f83c26d2 100644 --- a/sw/qa/complex/accessibility/AccessibleRelationSet.java +++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java @@ -171,7 +171,7 @@ public class AccessibleRelationSet { new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow(factory, aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT_TEXT); diff --git a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java index 07d9c187aa6a..f9a45a7babd7 100644 --- a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java +++ b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java @@ -70,7 +70,7 @@ public class CheckIndeterminateState { XInterface oObj = null; new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(getFactory(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java index f18ff8f7ed48..432a959a854f 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java @@ -110,7 +110,7 @@ public class Settings return m_aWikiDocs; } - public Object[] getWikiDocList( int serverid, int num ) + public Object[] getWikiDocList( int serverid ) { String wikiserverurl = getWikiConUrlByNumber( serverid ); List<String> theDocs = new ArrayList<String>(); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index c2af4e95204f..1570c3d635e2 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -188,7 +188,7 @@ public class WikiEditSettingDialog extends WikiDialog } } - public void DoLogin( XDialog xDialog ) + public void DoLogin() { String sRedirectURL = ""; String sURL = ""; @@ -372,7 +372,7 @@ public class WikiEditSettingDialog extends WikiDialog Thread.yield(); } catch( java.lang.Exception e ){} - DoLogin( xDialogForThread ); + DoLogin(); aThis.EnableControls( true ); aThis.SetThrobberActive( false ); aThis.SetThrobberVisible( false ); @@ -390,7 +390,7 @@ public class WikiEditSettingDialog extends WikiDialog { try { - DoLogin( xDialog ); + DoLogin(); } catch( java.lang.Exception e ) {} finally diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index ad0513bbb08c..c5accfabd944 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -191,7 +191,7 @@ public final class WikiEditorImpl extends WeakBase String urlstring = url.Complete; m_statusListeners.put( urlstring, listener ); // synchroneous callback required!!! - callStatusListener( urlstring, listener ); + callStatusListener( urlstring ); } public void callStatusListeners() @@ -200,18 +200,18 @@ public final class WikiEditorImpl extends WeakBase { String uristring = iter.next(); XStatusListener listener = m_statusListeners.get(uristring); - callStatusListener( uristring, listener ); + callStatusListener( uristring ); } } - public void callStatusListener( String uristring, XStatusListener listener ) + public void callStatusListener( String uristring ) { try { URI uri = new URI( uristring ); // check whether any blogs are live... - setListenerState( listener, "command", false ); + setListenerState( "command"); } catch ( URISyntaxException ex ) { ex.printStackTrace(); @@ -219,12 +219,10 @@ public final class WikiEditorImpl extends WeakBase } - private void setListenerState( XStatusListener listener, String urlstring, boolean state ) + private void setListenerState( String urlstring) { com.sun.star.util.URL url = new com.sun.star.util.URL(); url.Complete = urlstring; - //listener.statusChanged( new FeatureStateEvent( this, url, "", state, false, null )); - } public void sendArticle() diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index 2f4d7e887f3c..e6718572732d 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -54,11 +54,11 @@ public class WikiPropDialog extends WikiDialog{ } InitStrings( xContext ); - InitShowBrowser( xContext ); - InitControls( xContext ); + InitShowBrowser(); + InitControls(); } - private void InitControls( XComponentContext xContext ) + private void InitControls() { try { @@ -90,7 +90,7 @@ public class WikiPropDialog extends WikiDialog{ } } - private void InitShowBrowser( XComponentContext xContext ) + private void InitShowBrowser() { try { @@ -149,7 +149,7 @@ public class WikiPropDialog extends WikiDialog{ try { short [] sel = (short[]) GetPropSet("WikiList").getPropertyValue("SelectedItems"); - xPS.setPropertyValue("StringItemList", m_aSettings.getWikiDocList(sel[0], 5)); + xPS.setPropertyValue("StringItemList", m_aSettings.getWikiDocList(sel[0])); } catch (Exception ex) { diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 8b2c39a80a83..02d2e6814d16 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -98,7 +98,7 @@ public class Desktop return UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent); } - public static XDispatch getDispatcher(XMultiServiceFactory xMSF, XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) + public static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) { try { @@ -136,7 +136,7 @@ public class Desktop public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) { com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL); - XDispatch xDispatch = getDispatcher(xMSF, xFrame, _stargetframe, oURL); + XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL); dispatchURL(xDispatch, oURL); } diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 57804e6e8056..28bce7bb4cd3 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -201,7 +201,7 @@ public class FileAccess return ResultPath; } - public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath, String sType, String sSearchDir) + public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath) { //This method currently only works with sPath="Template" diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java index 96208c89e6a3..6f532f188d41 100644 --- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java +++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java @@ -31,28 +31,28 @@ public class BlindtextCreator String BlindTextString = PropertyNames.EMPTY_STRING; if (bIsGroupTable) { - return getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + return getBlindTextString(FieldTitle, FieldWidth); } int MaxFieldCount = getMaxFieldCount(bIsCurLandscape); if (_RecordFieldNames.length <= 2 * MaxFieldCount) { if (_RecordFieldNames.length <= MaxFieldCount) { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + BlindTextString = getBlindTextString(FieldTitle, FieldWidth); } else { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) (0.5 * FieldWidth)); + BlindTextString = getBlindTextString(FieldTitle, (int) (0.5 * FieldWidth)); } } else { - BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) 1.1 * FieldTitle.length()); + BlindTextString = getBlindTextString(FieldTitle, (int) 1.1 * FieldTitle.length()); } return BlindTextString; } - public static String getBlindTextString(String FieldTitle, int FieldWidth, int MaxWidth) + public static String getBlindTextString(String FieldTitle, int MaxWidth) { String[] BlindTextArray = JavaTools.ArrayoutofString(BlindText, PropertyNames.SPACE); String PartBlindText = BlindTextArray[0]; diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index 409af6e15002..b153908df7f0 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -416,11 +416,11 @@ public class FieldColumn break; case DataType.VARCHAR: // == 12; - DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth); break; case DataType.LONGVARCHAR: // == -1; - DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth, FieldWidth); + DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth); break; case DataType.NUMERIC: // == 2; diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index eb2a997ef6bf..bd89cbc1d3ba 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -68,12 +68,12 @@ public class FormDocument extends TextDocument { oFormHandler = new FormHandler(xMSF, xTextDocument); oFormHandler.setDrawObjectsCaptureMode(false); - oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument); - oViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + oTextStyleHandler = new TextStyleHandler(xTextDocument); + oViewHandler = new ViewHandler(xTextDocument); oMainFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale); oSubFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale); - ViewHandler oViewHandler = new ViewHandler(xMSF, xTextDocument); - TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xMSFDoc, xTextDocument); + ViewHandler oViewHandler = new ViewHandler(xTextDocument); + TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xTextDocument); Helper.setUnoPropertyValue(xTextDocument, "ApplyFormDesignMode", Boolean.FALSE); oViewHandler.setViewSetting("ShowTableBoundaries", Boolean.FALSE); oViewHandler.setViewSetting("ShowOnlineLayout", Boolean.TRUE); diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 24e3e62f750f..40f551592561 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -69,7 +69,7 @@ public class StyleApplier this.curFormDocument = _curFormDocument; xMSF = curFormDocument.xMSF; - TextStyleHandler oTextStyleHandler = new TextStyleHandler(xMSF, curFormDocument.xTextDocument); + TextStyleHandler oTextStyleHandler = new TextStyleHandler(curFormDocument.xTextDocument); xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard"); this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100); @@ -280,10 +280,6 @@ public class StyleApplier curFormDocument.unlockallControllers(); } - public void disposing(EventObject eventObject) - { - } - private int getStyleColor(String[] _sDataList, String _sHeader, String _sPropertyDescription) { int index = JavaTools.FieldInList(_sDataList, _sHeader); diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 3be19016063b..4c5884cf3f00 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -137,7 +137,7 @@ public class DBColumn return false; } - public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName, DBColumn OldDBColumn) { + public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName, DBColumn OldDBColumn) { this.oTextTableHandler = _oTextTableHandler; this.CurDBMetaData = _CurDBMetaData; CurDBField = CurDBMetaData.getFieldColumnByDisplayName(_FieldName); @@ -153,7 +153,7 @@ public class DBColumn initializeNumberFormat(); } - public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName) throws Exception + public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName) throws Exception { this.oTextTableHandler = _oTextTableHandler; this.CurDBMetaData = _CurDBMetaData; diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index acf3cc63c73f..593b63529a61 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -64,7 +64,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi CurReportDocument.StopProcess(); } - public void showProgressDisplay(XMultiServiceFactory xMSF, boolean bgetConnection) + public void showProgressDisplay(boolean bgetConnection) { try { @@ -166,7 +166,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi PropertyValue[] properties) { CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource ); - showProgressDisplay(xMSF, true); + showProgressDisplay(true); importReportData(xMSF, this, CurReportDocument, properties); } } diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index ed6a9bcfe319..c0871b942754 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -94,8 +94,8 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen oTextTableHandler = new TextTableHandler(xMSFDoc, xTextDocument); oTextSectionHandler = new TextSectionHandler(xMSFDoc, xTextDocument); oFormHandler = new FormHandler(xMSFDoc, xTextDocument); - oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument); - oViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + oTextStyleHandler = new TextStyleHandler(xTextDocument); + oViewHandler = new ViewHandler(xTextDocument); oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument); DBColumnsVector = new java.util.ArrayList<DBColumn>(); oNumberFormatter = oTextTableHandler.getNumberFormatter(); @@ -283,7 +283,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } for (i = 0; i < GroupCount; i++) { - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, TBLGROUPSECTION + (i + 1)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], TBLGROUPSECTION + (i + 1)); CurDBColumn.formatValueCell(); DBColumnsVector.set(i, CurDBColumn); replaceFieldValueInGroupTable(CurDBColumn, i); @@ -336,7 +336,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void replaceFieldValueInRecordSection(int RecordCount) + public void replaceFieldValueInRecordSection() { int GroupCount = CurDBMetaData.GroupFieldNames.length; int FieldCount = CurDBMetaData.getFieldNames().length; @@ -357,7 +357,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { TableName = TBLGROUPSECTION + Integer.toString(i + 1); OldDBColumn = DBColumnsVector.get(i); - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], i, TableName, OldDBColumn); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], TableName, OldDBColumn); CurDBColumn.formatValueCell(); DBColumnsVector.set(i, CurDBColumn); CurDBColumn.insertColumnData(oTextFieldHandler, this.bIsCurLandscape); @@ -432,7 +432,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public boolean addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) + public boolean addGroupNametoDocument(String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) { DBColumn CurDBColumn = null; int GroupCount = GroupFieldVector.size(); @@ -446,7 +446,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { String sPath = FileAccess.getPathFromList(xMSF, ReportPath, "cnt-default.ott"); oTextSectionHandler.insertTextSection(GROUPSECTION + GroupCount, sPath, GroupCount == 1); - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), GroupCount - 1, TBLGROUPSECTION + (GroupCount)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), TBLGROUPSECTION + (GroupCount)); CurDBColumn.formatValueCell(); DBColumnsVector.add(CurDBColumn); replaceFieldValueInGroupTable(CurDBColumn, GroupCount - 1); @@ -507,7 +507,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { if (i < CurDBMetaData.GroupFieldNames.length) { - CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, COPYOFTBLGROUPSECTION + (i + 1)); + CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], COPYOFTBLGROUPSECTION + (i + 1)); } else { diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index b0f3eb078347..09d319210672 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -477,7 +477,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount) { - return getDoc().addGroupNametoDocument(GroupNames, CurGroupTitle, GroupFieldVector, ReportPath, iSelCount); + return getDoc().addGroupNametoDocument(CurGroupTitle, GroupFieldVector, ReportPath, iSelCount); } public void refreshGroupFields(String[] _sNewNames) @@ -600,7 +600,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme // Check general availability of office paths try { - m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 191df4436cab..f6f26d1eeff6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -504,7 +504,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper if (m_aReportPath == null) { // Check general availability of office paths - m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } return m_aReportPath; @@ -632,7 +632,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper try { // TODO: check different languages in header layouts - ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); + ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template"); FileAccess.combinePaths(getMSF(), aReportPath, "/wizard/report"); LayoutFiles = FileAccess.getFolderTitles(getMSF(), null, aReportPath, ".otr"); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 5ef82e080b1e..b551f36ca32b 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -113,7 +113,7 @@ public class TextDocument } // creates an instance of TextDocument from the desktop's current frame - public TextDocument(XMultiServiceFactory xMSF, boolean bShowStatusIndicator, XTerminateListener listener) + public TextDocument(XMultiServiceFactory xMSF, boolean bShowStatusIndicator) { this.xMSF = xMSF; @@ -267,7 +267,7 @@ public class TextDocument DocSize = getPageSize(); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - ViewHandler myViewHandler = new ViewHandler(xMSFDoc, xTextDocument); + ViewHandler myViewHandler = new ViewHandler(xTextDocument); try { myViewHandler.setViewSetting("ZoomType", new Short(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); diff --git a/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/wizards/com/sun/star/wizards/text/TextStyleHandler.java index 58e8584eb782..c36bdc670ef2 100644 --- a/wizards/com/sun/star/wizards/text/TextStyleHandler.java +++ b/wizards/com/sun/star/wizards/text/TextStyleHandler.java @@ -34,7 +34,7 @@ public class TextStyleHandler public XStyleFamiliesSupplier xStyleFamiliesSupplier; /** Creates a new instance of TextStyleHandler */ - public TextStyleHandler(com.sun.star.lang.XMultiServiceFactory xMSF, XTextDocument xTextDocument) + public TextStyleHandler(XTextDocument xTextDocument) { xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument); } diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index c0a92184b63f..3a014aa22cce 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -44,7 +44,7 @@ public class ViewHandler private XViewSettingsSupplier xViewSettingsSupplier; /** Creates a new instance of View */ - public ViewHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument) + public ViewHandler(XTextDocument xTextDocument) { xTextViewCursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class, xTextDocument.getCurrentController()); xViewSettingsSupplier = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xTextDocument.getCurrentController()); diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index f80d601e6384..cdec9cba165e 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -357,10 +357,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener return pageStart + i; } - public void contentsChanged(ListDataEvent event) - { - } - public void intervalAdded(ListDataEvent event) { if (event.getIndex0() <= m_nCurrentSelection) @@ -376,10 +372,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - public void intervalRemoved(ListDataEvent event) - { - } - /** Registers ItemListener to receive events. * @param listener The listener to register. */ diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index db28aaa78331..f3217bc363b8 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -493,7 +493,7 @@ public class FieldSelection } } - public void mergeList(String[] AllFieldNames, String[] SecondList) + public void mergeList(String[] AllFieldNames) { xFieldsListBox.addItems(AllFieldNames, (short) 0); toggleListboxButtons((short) - 1, (short) - 1); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index fbf72b7a0df7..b67c6afab3c6 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -343,11 +343,6 @@ public class UnoDialog2 extends UnoDialog return UnoRuntime.queryInterface(type, insertControlModel2(serviceName, componentName, sPropNames, oPropValues)); } - public String translateURL(String relativeURL) - { - return PropertyNames.EMPTY_STRING; - } - public static Object getControlModel(Object unoControl) { return UnoRuntime.queryInterface(XControl.class, unoControl).getModel(); diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index 5d3675bc8d09..bf0be61d806b 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -199,7 +199,7 @@ public class UnoDataAware extends DataAware }; } - public static UnoDataAware attachLabel(Object data, String prop, Object label, final Listener listener, boolean field) + public static UnoDataAware attachLabel(Object data, String prop, Object label, boolean field) { return new UnoDataAware(data, field ? DataAwareFields.getFieldValueFor(data, prop, PropertyNames.EMPTY_STRING) |