diff options
author | Noel Grandin <noel@peralex.com> | 2015-06-09 08:52:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-06-09 11:34:31 +0200 |
commit | 2a0dda3dfb37f0cb69842f7d569c253d82f53713 (patch) | |
tree | 7a762c2fa22651cefb68021250a3fad8811e0f06 /qadevOOo/tests/java/mod/_sw/SwXTextView.java | |
parent | Resolves: more crash on export of ooo47778-3.sxw to docx (diff) | |
download | core-2a0dda3dfb37f0cb69842f7d569c253d82f53713.tar.gz core-2a0dda3dfb37f0cb69842f7d569c253d82f53713.zip |
remove some unnecessary exception wrapping in the Java tests
Modify createTestEnvironment so that it throws Exception. This
is appropriate for unit testing.
The wrapping adds no value and the calling method already has
a catch(Exception) to handle anything.
Change-Id: I430a414f63d2cbfc3b65ecfde0285509265e5192
Diffstat (limited to 'qadevOOo/tests/java/mod/_sw/SwXTextView.java')
-rw-r--r-- | qadevOOo/tests/java/mod/_sw/SwXTextView.java | 65 |
1 files changed, 24 insertions, 41 deletions
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java index 67b7b1a55f20..ef07976ba612 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java @@ -141,30 +141,25 @@ public class SwXTextView extends TestCase { Object oFrame1 = null; Object oFrame2 = null; - try { - XText oText = xTextDoc.getText(); - XTextCursor oCursor = oText.createTextCursor(); - oFrame1 = SOF.createInstance - (xTextDoc, "com.sun.star.text.TextFrame" ); - first = UnoRuntime.queryInterface - ( XTextFrame.class, oFrame1); - oText.insertTextContent(oCursor,first, false); - first.getText().setString("Frame 1"); - oFrame2 = SOF.createInstance(xTextDoc, "com.sun.star.text.TextFrame" ); - second = UnoRuntime.queryInterface - ( XTextFrame.class, oFrame2); - oText.insertTextContent(oCursor,second, false); - second.getText().setString("Frame 2"); - oText.insertString( oCursor, - "SwXTextRanges...SwXTextRanges...SwXTextRanges", false); - oText.insertControlCharacter( oCursor, - ControlCharacter.PARAGRAPH_BREAK, false); - oText.insertString( oCursor, - "bla...bla...", false); - } catch (Exception Ex ) { - Ex.printStackTrace(log); - throw new StatusException("Couldn't insert text table ", Ex); - } + XText oText = xTextDoc.getText(); + XTextCursor oCursor = oText.createTextCursor(); + oFrame1 = SOF.createInstance + (xTextDoc, "com.sun.star.text.TextFrame" ); + first = UnoRuntime.queryInterface + ( XTextFrame.class, oFrame1); + oText.insertTextContent(oCursor,first, false); + first.getText().setString("Frame 1"); + oFrame2 = SOF.createInstance(xTextDoc, "com.sun.star.text.TextFrame" ); + second = UnoRuntime.queryInterface + ( XTextFrame.class, oFrame2); + oText.insertTextContent(oCursor,second, false); + second.getText().setString("Frame 2"); + oText.insertString( oCursor, + "SwXTextRanges...SwXTextRanges...SwXTextRanges", false); + oText.insertControlCharacter( oCursor, + ControlCharacter.PARAGRAPH_BREAK, false); + oText.insertString( oCursor, + "bla...bla...", false); XSearchable oSearch = UnoRuntime.queryInterface (XSearchable.class, xTextDoc); @@ -209,28 +204,16 @@ public class SwXTextView extends TestCase { }); XSelectionSupplier xsel = UnoRuntime.queryInterface(XSelectionSupplier.class,xContr); - try { - xsel.select(second); - } catch (Exception e) { - log.println("Couldn't select"); - throw new StatusException( "Couldn't select", e ); - } + xsel.select(second); tEnv.addObjRelation("DOCUMENT",xTextDoc); XForm myForm = null; String kindOfControl="CommandButton"; XShape aShape = null; - try{ - log.println("adding contol shape '" + kindOfControl + "'"); - aShape = FormTools.createControlShape(xTextDoc, 3000, - 4500, 15000, 10000, - kindOfControl); - } catch (Exception e){ - e.printStackTrace(log); - throw new StatusException("Couldn't create following control shape : '" + - kindOfControl + "': ", e); - - } + log.println("adding contol shape '" + kindOfControl + "'"); + aShape = FormTools.createControlShape(xTextDoc, 3000, + 4500, 15000, 10000, + kindOfControl); log.println("adding relation for com.sun.star.view.XFormLayerAccess: XForm"); |