Kaydet (Commit) b7cce691 authored tarafından Frank Schoenheit [fs]'s avatar Frank Schoenheit [fs]

dba34a: properly close the connection, and survive (without error log) if there…

dba34a: properly close the connection, and survive (without error log) if there actually isn't a connection
üst fd448bae
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
package mod._forms; package mod._forms;
import com.sun.star.beans.NamedValue; import com.sun.star.beans.NamedValue;
import com.sun.star.beans.PropertyValue; import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XIndexAccess;
import java.io.PrintWriter; import java.io.PrintWriter;
import lib.StatusException; import lib.StatusException;
...@@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase { ...@@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase {
if (m_ConnectionColsed) return; if (m_ConnectionColsed) return;
try { try {
XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) );
XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),
(FormTools.getForms( forms.getByIndex(0));
WriterTools.getDrawPage(
m_xTextDoc)))
.getByName("Standard"));
if (debug){ if (debug){
if (myForm == null){ if (myForm == null){
...@@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase { ...@@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase {
} }
XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm );
XPropertySet.class, myForm); XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) );
XConnection connection = (XConnection) AnyConverter.toObject( if ( connection == null )
new Type(XConnection.class), {
xSetProp.getPropertyValue("ActiveConnection")); if ( debug )
if (debug && connection == null){ log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); }
else
{
connection.close();
} }
connection.close();
} catch (Exception e) { } catch (Exception e) {
log.println("ERROR: Can't close the connection: " + e.toString()); log.println("ERROR: Can't close the connection: " + e.toString());
e.printStackTrace( log );
} }
log.println("closing data source..."); log.println("closing data source...");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment