summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/qa/storages/Test04.java22
-rw-r--r--package/qa/storages/Test05.java36
2 files changed, 29 insertions, 29 deletions
diff --git a/package/qa/storages/Test04.java b/package/qa/storages/Test04.java
index fa7015193f60..ca253a9c470a 100644
--- a/package/qa/storages/Test04.java
+++ b/package/qa/storages/Test04.java
@@ -56,7 +56,7 @@ public class Test04 implements StorageTest {
// first substorage of the root storage
XStorage xTempSubStorage1 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage1 == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -72,7 +72,7 @@ public class Test04 implements StorageTest {
// second substorage of the root storage
XStorage xTempSubStorage2 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage2",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage2 == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -89,27 +89,27 @@ public class Test04 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
"MediaType3",
true,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage1,
"MediaType4",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
"MediaType5",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -170,7 +170,7 @@ public class Test04 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oResStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResStorage );
if ( xResStorage == null )
@@ -182,28 +182,28 @@ public class Test04 implements StorageTest {
// open and check SubStorage1
XStorage xResSubStorage1 = m_aTestHelper.openSubStorage( xResStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage1 == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.READ ) )
return false;
// open and check SubStorage2
XStorage xResSubStorage2 = m_aTestHelper.openSubStorage( xResStorage,
"SubStorage2",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage2 == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.READ ) )
return false;
diff --git a/package/qa/storages/Test05.java b/package/qa/storages/Test05.java
index 1240da2b806d..34c71d1a3588 100644
--- a/package/qa/storages/Test05.java
+++ b/package/qa/storages/Test05.java
@@ -42,7 +42,7 @@ public class Test05 implements StorageTest {
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -55,7 +55,7 @@ public class Test05 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempFileStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -65,7 +65,7 @@ public class Test05 implements StorageTest {
// open a new substorage
XStorage xSubSubStorage = m_aTestHelper.openSubStorage( xTempSubStorage,
"SubSubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xSubSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -89,21 +89,21 @@ public class Test05 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
"MediaType3",
true,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType4",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xSubSubStorage,
"MediaType5",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
@@ -125,28 +125,28 @@ public class Test05 implements StorageTest {
// reopen created streams
XStream xSubStream1 = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream1",
- ElementModes.ELEMENT_WRITE | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.WRITE | ElementModes.NOCREATE );
XStream xSubStream2 = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream2",
- ElementModes.ELEMENT_READ | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.READ | ElementModes.NOCREATE );
if ( xSubStream1 == null || xSubStream2 == null )
return false;
// it should be possible to have more then one copy of stream for reading
XStream xSubStream2clone = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream2",
- ElementModes.ELEMENT_READ | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.READ | ElementModes.NOCREATE );
if ( xSubStream2 == null )
return false;
// so now the first stream can not be open neither for reading nor for writing
- if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.ELEMENT_WRITE )
- || !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.WRITE )
+ || !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.READ ) )
return false;
// the second stream can not be open for writing
- if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream2", ElementModes.ELEMENT_WRITE ) )
+ if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream2", ElementModes.WRITE ) )
return false;
@@ -207,7 +207,7 @@ public class Test05 implements StorageTest {
// now check all the written and copied information
// ================================================
- pArgs[1] = new Integer( ElementModes.ELEMENT_READ );
+ pArgs[1] = new Integer( ElementModes.READ );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
@@ -216,33 +216,33 @@ public class Test05 implements StorageTest {
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage, "MediaType4", false, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResSubSubStorage = m_aTestHelper.openSubStorage( xResSubStorage,
"SubSubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage, "MediaType5", false, ElementModes.READ ) )
return false;
// check substreams