summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-20 19:07:31 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-26 23:14:33 +0100
commit31170413ae3786bf44564e813d7291354e939a77 (patch)
treeca37fdc23fa2d31217433ba9d7bc12fe66be94e9 /qadevOOo
parent1d095efaf989730c298b2ad99720eacf68f71229 (diff)
API CHANGE: com.sun.star.lang.IllegalArgumentException
... derives from com.sun.star.uno.RuntimeException instead of com.sun.star.uno.Exception. Only test that breaks with this change is jurt_uno/AnyConverter_Test, which for mysterious reasons effectively tests that IllegalArgumentException is a subclass of Exception and not RuntimeException. Presumably this is just a generic exception test that happens to use IllegalArgumentException. Some further testing indicates there are no problems expected at runtime: Running "make subsequentcheck" with all Java test code compiled against a ridl.jar that does not contain the change, running against a soffice that uses ridl.jar and rdbs with the change + ridl.jar with the change on the test side yields exactly the same AnyConverter_Test failure, with no other failures. Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/util/BasicMacroTools.java2
-rw-r--r--qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/uno/various.java2
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/various.java2
-rw-r--r--qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXCellRange.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXTextTable.java2
8 files changed, 6 insertions, 10 deletions
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index ffb4538254d6..97fb2c53fab2 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -169,7 +169,7 @@ public class BasicMacroTools {
e.printStackTrace();
throw new Exception("ERROR: Library " + LibraryName +
"already exist." + e.toString());
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace();
throw new Exception("Could not link Basic library:" +
LibraryName + e.toString());
diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
index 92c2ef81e579..c9846f6f4cae 100644
--- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
+++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
@@ -130,7 +130,7 @@ public class ObjectInspectorModel extends TestCase {
tEnv.addObjRelation("maxHelpTextLines", new Integer(maxHelpTextLines));
return tEnv;
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
throw new StatusException("Unexpected exception", e);
}
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index a38997618329..f2d722213daa 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -152,8 +152,6 @@ public class various extends TestCase {
acceptedCall = acc.accept(connectString) ;
xBrdgFctr.createBridge("MyBridge", "urp",
acceptedCall, xInstProv);
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
ex = e ;
} catch (com.sun.star.connection.AlreadyAcceptingException e) {
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index c2c11c076320..6801e642d9fb 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -147,8 +147,6 @@ public class various extends TestCase {
public void run() {
try {
acceptedCall = acc.accept(connectString) ;
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
ex = e ;
} catch (com.sun.star.connection.AlreadyAcceptingException e) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index e43a0ecb2b3b..fec8bd66031b 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -169,7 +169,7 @@ public class AccessibleBrowseBox extends TestCase {
public void fireEvent() {
try {
xSelect.select(fParams);
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace();
}
}
diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
index f65046d4d718..1e8d11795fb5 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
@@ -104,7 +104,7 @@ public class SwXCellRange extends TestCase {
if( SOF.getTableCollection( xTextDoc ).getCount() == 0 ) {
try {
SOF.insertTextContent(xTextDoc, the_table );
- } catch( com.sun.star.uno.Exception e ) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't create TextTable : "
+ e.getMessage(), e);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
index 046dc9e29992..335571066319 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
@@ -112,7 +112,7 @@ public class SwXDocumentIndex extends TestCase {
log.println("inserting the Index into text document");
try {
oText.insertTextContent(oCursor, xTC, false);
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't insert the Index", e);
}
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
index f97032b4daa7..83a8f30b1bc0 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
@@ -104,7 +104,7 @@ public class SwXTextTable extends TestCase {
if (SOF.getTableCollection(xTextDoc).getCount() == 0) {
try {
SOF.insertTextContent(xTextDoc, oObj);
- } catch (com.sun.star.uno.Exception uE) {
+ } catch (com.sun.star.lang.IllegalArgumentException uE) {
uE.printStackTrace(log);
throw new StatusException("Couldn't create TextTable : " +
uE.getMessage(), uE);