Tag: cws_dev300_dba31c
User: fs
Date: 2008-09-12 10:36:51+0000
Modified:
dba/connectivity/qa/connectivity/tools/HsqlDatabase.java
Log:
copying following changes from CWS odbmacros3 to CWS dba31c:
2008/07/23 13:35:53 fs 1.4.50.1: copying following changes from CWS dba30g
to CWS odbmacros3:
2008/07/22 07:21:07 fs 1.4.48.1: copying following changes from CWS dba30h
to CWS dba30g:
2008/07/21 09:10:35 fs 1.4.46.1: #i91857# +store
2008/07/30 20:54:47 fs 1.4.50.2: +getDatabaseDocument/getModel
File Changes:
Directory: /dba/connectivity/qa/connectivity/tools/
===================================================
File [changed]: HsqlDatabase.java
Url:
http://dba.openoffice.org/source/browse/dba/connectivity/qa/connectivity/tools/HsqlDatabase.java?r1=1.5&r2=1.5.16.1
Delta lines: +24 -5
--------------------
--- HsqlDatabase.java 2008-07-25 07:40:56+0000 1.5
+++ HsqlDatabase.java 2008-09-12 10:36:49+0000 1.5.16.1
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: HsqlDatabase.java,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -34,6 +34,7 @@
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.ElementExistException;
import com.sun.star.frame.XStorable;
+import com.sun.star.frame.XModel;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.sdbc.SQLException;
@@ -50,6 +51,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
+import java.io.File;
/**
*
@@ -78,7 +80,10 @@
private void createDBDocument() throws Exception
{
m_databaseDocumentFile = new String();
- String str = File.createTempFile("testdb",".odb").getCanonicalPath();
+ File documentFile = File.createTempFile("testdb",".odb");
+ documentFile.deleteOnExit();
+
+ String str = documentFile.getCanonicalPath();
str = str.replaceAll(" ","%20");
str = "file:///" +str;
m_databaseDocumentFile = str.replace('\\','/');
@@ -150,8 +155,8 @@
m_connection = null;
// close document
- com.sun.star.util.XCloseable closeDoc =
(com.sun.star.util.XCloseable)UnoRuntime.queryInterface( XCloseable.class,
- m_databaseDocument );
+ com.sun.star.util.XCloseable closeDoc =
(com.sun.star.util.XCloseable)UnoRuntime.queryInterface(
+ com.sun.star.util.XCloseable.class, m_databaseDocument );
if ( closeDoc != null )
{
try
@@ -185,6 +190,20 @@
}
}
+ /** returns the underlying database document
+ */
+ XOfficeDatabaseDocument getDatabaseDocument()
+ {
+ return m_databaseDocument;
+ }
+
+ /** returns the model interface of the underlying database document
+ */
+ XModel getModel()
+ {
+ return (XModel)UnoRuntime.queryInterface( XModel.class,
m_databaseDocument );
+ }
+
/** drops the table with a given name
@param _name
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
