diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-08 14:53:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-11 12:33:02 +0200 |
commit | 41709cc2688738f091a4b17839fe853caa5a0bfd (patch) | |
tree | 2e12ca2d594ce6767146c25862869ab7e9d2bc14 /qadevOOo/runner/util | |
parent | 2b9ad46b23fdb39cd456cdc543cce346c6f325c3 (diff) |
java: remove unused parameters
Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5
Diffstat (limited to 'qadevOOo/runner/util')
-rw-r--r-- | qadevOOo/runner/util/AccessibilityTools.java | 12 | ||||
-rw-r--r-- | qadevOOo/runner/util/BasicMacroTools.java | 7 | ||||
-rw-r--r-- | qadevOOo/runner/util/SOfficeFactory.java | 5 | ||||
-rw-r--r-- | qadevOOo/runner/util/UITools.java | 8 |
4 files changed, 13 insertions, 19 deletions
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); } |