This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 3a9dd688f4 Cleanup merge conflicts
3a9dd688f4 is described below
commit 3a9dd688f42f84367b2e5d7a1c5a807a2e1b7c3b
Author: mseidel <[email protected]>
AuthorDate: Tue Jul 22 01:59:19 2025 +0200
Cleanup merge conflicts
---
.../qa/integration/forms/MasterDetailForms.java | 18 ++-
.../complex/framework/recovery/RecoveryTools.java | 133 +++++++--------------
.../star/lib/uno/helper/InterfaceContainer.java | 118 +++++++++---------
.../offapi/com/sun/star/awt/XDisplayConnection.idl | 19 ++-
.../complex/cellRanges/CheckXCellRangesQuery.java | 18 ++-
.../olesimplestorage/OLESimpleStorageUnitTest.java | 15 +--
.../CheckTransientDocumentsContentProvider.java | 32 +++--
.../qa/complex/tempfile/TempFileUnitTest.java | 18 ++-
8 files changed, 148 insertions(+), 223 deletions(-)
diff --git a/main/forms/qa/integration/forms/MasterDetailForms.java
b/main/forms/qa/integration/forms/MasterDetailForms.java
index 14a273034a..fe1f9f2643 100644
--- a/main/forms/qa/integration/forms/MasterDetailForms.java
+++ b/main/forms/qa/integration/forms/MasterDetailForms.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -68,7 +68,7 @@ public class MasterDetailForms extends
complexlib.ComplexTestCase implements com
public MasterDetailForms()
{
}
-
+
/* ------------------------------------------------------------------ */
public String[] getTestMethodNames()
{
@@ -92,7 +92,7 @@ public class MasterDetailForms extends
complexlib.ComplexTestCase implements com
/* ------------------------------------------------------------------ */
/** creates the table structure needed for the test
- */
+ */
private void impl_createTableStructure( final HsqlDatabase
_databaseDocument ) throws SQLException
{
HsqlColumnDescriptor[] masterColumns = {
@@ -379,7 +379,7 @@ public class MasterDetailForms extends
complexlib.ComplexTestCase implements com
m_loaded = false;
}
}
-
+
/** assures that the (integer) values in the given columns of our master
and detail forms are identical
*/
private void verifyColumnValueIdentity( final String masterColName, final
String detailColName ) throws SQLException
@@ -390,11 +390,7 @@ public class MasterDetailForms extends
complexlib.ComplexTestCase implements com
int masterValue = m_masterResult.getInt( locateMasterCols.findColumn(
masterColName ) );
int detailValue = m_detailResult.getInt( locateDetailCols.findColumn(
detailColName ) );
-<<<<<<< HEAD
assure( "values in linked column pair " + detailColName + "->" +
masterColName + " (" +
-=======
- assertTrue( "values in linked column pair " + detailColName + "->" +
masterColName + " (" +
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
detailValue + "->" + masterValue + ") do not match (master
position: " + m_masterResult.getRow() + ")!",
masterValue == detailValue );
}
diff --git a/main/framework/qa/complex/framework/recovery/RecoveryTools.java
b/main/framework/qa/complex/framework/recovery/RecoveryTools.java
index 219cd6223e..b57907a0e7 100644
--- a/main/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/main/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -56,16 +56,10 @@ import util.utils;
* functions.
*/
public class RecoveryTools {
-<<<<<<< HEAD
private final TestParameters param;
private final LogWriter log;
-=======
-
- private final XMultiServiceFactory xMSF;
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
/**
* Creates new OfficeWatcher
* @param param the test parameter
@@ -76,17 +70,17 @@ public class RecoveryTools {
this.log = log;
}
-
+
/**
* get the active dialog from the top of the desktop
* @param xToolKit xToolKit the <CODE> XExtendedToolkit</CODE> to get the
dialog from the top of the desktop.
* @return a <CODE>XDialog</CODE> interface of the dialog
- */
+ */
public XDialog getActiveDialog( XMultiServiceFactory xMSF){
XWindow xWin = getActiveWindow(xMSF);
return (XDialog) UnoRuntime.queryInterface(XDialog.class, xWin);
}
-
+
public XWindow getActiveWindow( XMultiServiceFactory xMSF){
XInterface xToolKit = null;
try {
@@ -107,10 +101,10 @@ public class RecoveryTools {
* tries to get the dialog until the <CODE>OfficeWatcher</CODE> kills the
office.
* @param xToolKit the <CODE> XExtendedToolkit</CODE> to get the dialog
from the top of the desktop.
* @return a <CODE>XDialog</CODE> interface of the dialog
- */
+ */
public XDialog getActiveDialogAfterStartup(XMultiServiceFactory xMSF){
// while the office starts it takes some time to get the dialog.
-
+
// the dialog is accessible AFTER the office has recoverd all
documents.
// This could consumes more time then the TimeOut allow.
int counter = 0;
@@ -118,9 +112,9 @@ public class RecoveryTools {
int pause = param.getInt(PropertyName.SHORT_WAIT)*10;
int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5;
int maximum = (timeOut / pause) * multi;
-
+
XDialog oDialog = getActiveDialog(xMSF);
-
+
while (oDialog == null && (counter < maximum)){
log.println("waiting until the office has recoverd... remaining "
+ (timeOut * multi - pause * counter)/1000 + " seconds");
pause(pause);
@@ -132,18 +126,18 @@ public class RecoveryTools {
/**
* halt the thread for some time
- */
+ */
public void pause(){
pause(param.getInt(PropertyName.SHORT_WAIT));
}
-
+
/**
* halt the thread for some time
- */
+ */
public void pause(int sleepTime){
sleep(sleepTime);
}
-
+
private void sleep(long millis){
try{
Thread.sleep(millis);
@@ -154,104 +148,83 @@ public class RecoveryTools {
* remove the content of the user backup folder and removes the
Recovery.xcu. This
* was done from the Office via XSimpleFileAccess
* @throws com.sun.star.io.IOException the exception was thrown if
something goes wrong.
- */
+ */
public void cleanRecoveryData()
throws com.sun.star.io.IOException
{
try{
HashMap recFiles = getRecoveryFiles();
-
+
String recoveryFolder = (String) recFiles.get("recoveryFolder");
String recoveryXCU = (String) recFiles.get("recoveryXCU");
-<<<<<<< HEAD
log.println("try to remove content of '" + recoveryFolder + "'");
-=======
- System.out.println("try to remove content of '" + recoveryFolder +
"'");
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
File rf = new File(recoveryFolder);
-
+
boolean success = FileTools.cleanDir(rf);
-<<<<<<< HEAD
log.println("removed " + recoveryFolder + ": " + success);
log.println("try to remove '" + recoveryXCU + "'");
-=======
- System.out.println("removed " + recoveryFolder + ": " + success);
-
- System.out.println("try to remove '" + recoveryXCU + "'");
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
File xcu = new File(recoveryXCU);
if (xcu.isFile()){
success = xcu.delete();
log.println("removed " + recoveryXCU + " : " + success);
}
-
+
} catch (Exception e){
throw new com.sun.star.io.IOException("could not remove old
recovery data: " + e.toString());
}
}
-
+
public HashMap getRecoveryFiles()
throws com.sun.star.io.IOException
{
try{
log.println("try to get UnoProvider...");
UnoProvider unoProv = new UnoProvider();
-<<<<<<< HEAD
XMultiServiceFactory xMSF = (XMultiServiceFactory)
unoProv.getManager(param);
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
String userPath = utils.expandMacro(xMSF,
"${$ORIGIN/bootstraprc:UserInstallation}");
System.out.println("userPath:'" + userPath + "'");
-
+
if (userPath.equals(""))userPath = utils.expandMacro(xMSF,
"${$ORIGIN/bootstrap.ini:UserInstallation}");
System.out.println("userPath:'" + userPath + "'");
-
+
if (userPath.equals("")) throw new
com.sun.star.io.IOException("could not get user path at bootstraping");
-
+
String recoveryFolder = utils.getSystemURL(userPath +
"/user/backup");
-
+
String recoveryXCU = utils.getSystemURL(userPath +
"/user/registry/data/org/openoffice/Office/Recovery.xcu");
-
+
HashMap recFiles = new HashMap();
-
+
recFiles.put("recoveryFolder", recoveryFolder);
recFiles.put("recoveryXCU", recoveryXCU);
return recFiles;
-
+
} catch (Exception e){
throw new com.sun.star.io.IOException("could not get recovery
folder: " + e.toString());
}
-
+
}
/**
* This function close the office while calling terminate on the desktop.
If
* this failed, the <CODE>ProcessHandler</CODE> kills the process.
* @param xMSF the <CODE>XMultiServiceFactory</CODE>
* @return <CODE>TRUE</CODE> if no exception was thrown, otherwise
<CODE>FALSE</CODE>
- */
+ */
public boolean closeOffice(XMultiServiceFactory xMSF) {
try {
XDesktop desk = (XDesktop) UnoRuntime.queryInterface(
XDesktop.class, xMSF.createInstance(
"com.sun.star.frame.Desktop"));
xMSF = null;
-
+
desk.terminate();
-<<<<<<< HEAD
log.println("Waiting until ProcessHandler loose the office...");
-=======
- System.out.println("Waiting until ProcessHandler loose the
office...");
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
}
catch (java.lang.Exception e) {
e.printStackTrace();
@@ -260,11 +233,11 @@ public class RecoveryTools {
waitForClosedOffice();
return true;
}
-
+
/**
* This function waits until the office is closed. If the closing time
reach
* the value of parameter <CODE>THREAD_TIME_OUT</CODE> the office was
killed.
- */
+ */
public void waitForClosedOffice(){
// check for the office process
helper.ProcessHandler ph = (helper.ProcessHandler)
param.get("AppProvider");
@@ -281,7 +254,7 @@ public class RecoveryTools {
// be sure that office is closed
if (ph != null) ph.kill();
}
-
+
public void killOffice(){
helper.ProcessHandler ph = (helper.ProcessHandler)
param.get("AppProvider");
ph.kill();
@@ -291,14 +264,13 @@ public class RecoveryTools {
* The office must be started WITH restore and crashreporter functionality.
* Therefore the parmater '<CODE>-norestore</CODE>' and
'<CODE>-nocrashreport</CODE>'
* was removed from the <CODE>AppExecutionCommand</CODE> parameter
- */
+ */
public void removeParametersFromAppExecutionCommand(){
-
+
//remove some params to start office
String office = (String) param.get("AppExecutionCommand");
String[] params = {"-norestore", "-nocrashreport"};
-<<<<<<< HEAD
for (int i = 0; i < params.length; i++){
int index = office.indexOf(params[i]);
int length = params[i].length();
@@ -310,38 +282,19 @@ public class RecoveryTools {
param.put("AppExecutionCommand", office);
log.println("connect: " + (String) param.get("AppExecutionCommand"));
-=======
-// for (int i = 0; i < params.length; i++){
-// int index = office.indexOf(params[i]);
-// int length = params[i].length();
-// if (index != -1){
-// office = office.substring(0, index) + office.substring(index
+ length);
-// System.out.println("removed '" + params[i] + "' from
AppExecutionCommand: " + office);
-// }
-// }
-// param.put("AppExecutionCommand", office);
-// System.out.println("connect: " + (String)
param.get("AppExecutionCommand"));
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
}
-
+
/**
* This function uses accessibility to handle modal dialogs like the
* "Are you sure" dialog.
* It cklick the named button given in parameter <CODE>buttonName</CODE>
* @param buttonName the name of the button which should be chlicked
- */
+ */
public void handleModalDialog(XMultiServiceFactory xMSF, String buttonName)
throws
com.sun.star.accessibility.IllegalAccessibleComponentStateException
-<<<<<<< HEAD
{
log.println("try to get modal Dialog...");
-=======
- {
-
- System.out.println("try to get modal Dialog...");
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
pause();
@@ -361,7 +314,7 @@ public class RecoveryTools {
}
pause();
}
-
+
public void clickThreadButton(XMultiServiceFactory xMSF, XWindow xWindow,
String buttonName)
throws
com.sun.star.accessibility.IllegalAccessibleComponentStateException
{
@@ -369,12 +322,12 @@ public class RecoveryTools {
kbt.start();
pause(param.getInt(PropertyName.SHORT_WAIT) * 10);
}
-
+
public void copyRecoveryData(boolean backup)
throws com.sun.star.io.IOException, java.io.IOException
- {
+ {
HashMap recFiles = null;
-
+
try{
recFiles = getRecoveryFiles();
} catch ( com.sun.star.io.IOException e){
@@ -403,6 +356,6 @@ public class RecoveryTools {
throw new java.io.IOException("Could not copy recovery files: " +
e.toString());
}
}
-
-
+
+
}
diff --git
a/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
b/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 94043a7418..0aec664be5 100644
--- a/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -98,13 +98,13 @@ public class InterfaceContainer implements Cloneable
* The capacity of the ArrayList is the length of this array buffer.
*/
Object elementData[];
-
+
/**
* The size of the ArrayList (the number of elements it contains).
*/
private int size;
-
-
+
+
//private ArrayList data= new ArrayList();
/** Creates a new instance of InterfaceContainer */
public InterfaceContainer()
@@ -125,7 +125,7 @@ public class InterfaceContainer implements Cloneable
initialCapacity);
this.elementData = new Object[initialCapacity];
}
-
+
/**
* Trims the capacity of this <tt>ArrayList</tt> instance to be the
* list's current size. An application can use this operation to minimize
@@ -141,7 +141,7 @@ public class InterfaceContainer implements Cloneable
System.arraycopy(oldData, 0, elementData, 0, size);
}
}
-
+
/**
* Increases the capacity of this <tt>ArrayList</tt> instance, if
* necessary, to ensure that it can hold at least the number of elements
@@ -162,7 +162,7 @@ public class InterfaceContainer implements Cloneable
System.arraycopy(oldData, 0, elementData, 0, size);
}
}
-
+
/**
* Appends the specified element to the end of this list.
*
@@ -180,7 +180,7 @@ public class InterfaceContainer implements Cloneable
}
return ret;
}
-
+
/**
* Inserts the specified element at the specified position in this
* list. Shifts the element currently at that position (if any) and
@@ -198,7 +198,7 @@ public class InterfaceContainer implements Cloneable
if (index > size || index < 0)
throw new IndexOutOfBoundsException(
"Index: "+index+", Size: "+size);
-
+
ensureCapacity(size+1);
System.arraycopy(elementData, index, elementData, index + 1,
size - index);
@@ -206,8 +206,8 @@ public class InterfaceContainer implements Cloneable
size++;
}
}
-
-
+
+
/**
* Appends all of the elements in the specified Collection to the end of
* this list, in the order that they are returned by the
@@ -225,7 +225,7 @@ public class InterfaceContainer implements Cloneable
{
int numNew = c.size();
ensureCapacity(size + numNew);
-
+
Iterator e = c.iterator();
for (int i=0; i<numNew; i++)
{
@@ -270,12 +270,12 @@ public class InterfaceContainer implements Cloneable
}
int numNew = curIndex;
ensureCapacity(size + numNew); // Increments modCount!!
-
+
int numMoved = size - index;
if (numMoved > 0)
System.arraycopy(elementData, index, elementData, index +
numNew,
numMoved);
-
+
for (int i=0; i<numNew; i++)
{
elementData[index++]= arColl[i];
@@ -285,7 +285,7 @@ public class InterfaceContainer implements Cloneable
}
return ret;
}
-
+
/**
* Removes all of the elements from this list. The list will
* be empty after this call returns.
@@ -297,7 +297,7 @@ public class InterfaceContainer implements Cloneable
// Let gc do its work
for (int i = 0; i < size; i++)
elementData[i] = null;
-
+
size = 0;
}
}
@@ -310,7 +310,7 @@ public class InterfaceContainer implements Cloneable
{
return indexOf(elem) >= 0;
}
-
+
synchronized public boolean containsAll(Collection collection)
{
boolean retVal= true;
@@ -346,7 +346,7 @@ public class InterfaceContainer implements Cloneable
}
return null;
}
-
+
/**
* Searches for the first occurrence of the given argument, testing
* for equality using the <tt>equals</tt> method.
@@ -369,7 +369,7 @@ public class InterfaceContainer implements Cloneable
break;
}
}
-
+
if (index == -1)
{
for (int i = 0; i < size; i++)
@@ -394,7 +394,7 @@ public class InterfaceContainer implements Cloneable
{
return size == 0;
}
-
+
synchronized public Iterator iterator()
{
if (elementData != null)
@@ -439,13 +439,9 @@ public class InterfaceContainer implements Cloneable
}
return index;
}
-
+
/**
-<<<<<<< HEAD
* Returns a shallow copy of this <tt>ArrayList</tt> instance. The
contained
-=======
- * Returns a shallow copy of this <code>ArrayList</code> instance. The
contained
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
* references are copied but the objects not.
*
* @return a clone of this <tt>List</tt> instance.
@@ -467,7 +463,7 @@ public class InterfaceContainer implements Cloneable
{
return listIterator(0);
}
-
+
/** The iterator keeps a copy of the list. Changes to InterfaceContainer
do not
* affect the data of the iterator. Conversely, changes to the iterator
are effect
* InterfaceContainer.
@@ -500,7 +496,7 @@ public class InterfaceContainer implements Cloneable
{
RangeCheck(index);
ret= elementData[index];
-
+
int numMoved = size - index - 1;
if (numMoved > 0)
System.arraycopy(elementData, index+1, elementData, index,
@@ -509,8 +505,8 @@ public class InterfaceContainer implements Cloneable
}
return ret;
}
-
-
+
+
/** Parameter obj may */
synchronized public boolean remove(Object obj)
{
@@ -526,7 +522,7 @@ public class InterfaceContainer implements Cloneable
}
return ret;
}
-
+
synchronized public boolean removeAll(Collection collection)
{
boolean retVal= false;
@@ -543,7 +539,7 @@ public class InterfaceContainer implements Cloneable
}
return retVal;
}
-
+
synchronized public boolean retainAll(Collection collection)
{
boolean retVal= false;
@@ -595,9 +591,9 @@ public class InterfaceContainer implements Cloneable
}
return retVal;
}
-
-
- /** Not supported.
+
+
+ /** Not supported.
* @param index index of element to replace.
* @param element element to be stored at the specified position.
* @return the element previously at the specified position.
@@ -615,7 +611,7 @@ public class InterfaceContainer implements Cloneable
}
return ret;
}
-
+
/**
* Returns the number of elements in this list.
*
@@ -627,7 +623,7 @@ public class InterfaceContainer implements Cloneable
return size;
return 0;
}
-
+
/**
* Returns an array containing all of the elements in this list
@@ -675,13 +671,13 @@ public class InterfaceContainer implements Cloneable
a.getClass().getComponentType(), size);
if (elementData != null)
System.arraycopy(elementData, 0, a, 0, size);
-
+
if (a.length > size)
a[size] = null;
-
+
return a;
}
-
+
/**
* Check if the given index is in range. If not, throw an appropriate
* runtime exception.
@@ -692,7 +688,7 @@ public class InterfaceContainer implements Cloneable
throw new IndexOutOfBoundsException(
"Index: "+index+", Size: "+size);
}
-
+
public void disposeAndClear(EventObject evt)
{
Iterator aIt;
@@ -725,8 +721,8 @@ public class InterfaceContainer implements Cloneable
}
}
}
-
-
+
+
private class Itr implements Iterator
{
InterfaceContainer dataIt;
@@ -740,23 +736,23 @@ public class InterfaceContainer implements Cloneable
* to remove.
*/
int lastRet = -1;
-
+
/** The object that has been returned by most recent call to next
* or previous. Reset to null if this element is deleted by a call
* to remove.
*/
Object lastRetObj= null;
-
+
Itr(InterfaceContainer _data)
{
dataIt= _data;
}
-
+
synchronized public boolean hasNext()
{
return cursor !=dataIt.size();
}
-
+
public synchronized Object next()
{
try
@@ -771,7 +767,7 @@ public class InterfaceContainer implements Cloneable
throw new java.util.NoSuchElementException();
}
}
-
+
/** Removes the interface from the list, that has been last returned
by a
* call to next(). This is done according to the specification of the
interface
* method. The element is also removed from InterfaceContainer but
independent
@@ -785,23 +781,23 @@ public class InterfaceContainer implements Cloneable
// Remove the entry from InterfaceContainer.
InterfaceContainer.this.remove(lastRetObj);
dataIt.remove(lastRet);
-
+
if (lastRet < cursor)
cursor--;
lastRet = -1;
lastRetObj= null;
}
}
-
+
private class LstItr extends Itr implements ListIterator
{
-
+
LstItr(InterfaceContainer _data, int _index)
{
super(_data);
cursor= _index;
}
-
+
/** Inserts an element to the iterators list according to the
specification
* of this interface method. The element is also added to
InterfaceContainer
* but its location within the list cannot be guaranteed.
@@ -813,17 +809,17 @@ public class InterfaceContainer implements Cloneable
lastRet = -1;
lastRetObj= null;
}
-
+
synchronized public boolean hasPrevious()
{
return cursor != 0;
}
-
+
synchronized public int nextIndex()
{
return cursor;
}
-
+
public synchronized Object previous()
{
try
@@ -837,19 +833,19 @@ public class InterfaceContainer implements Cloneable
throw new NoSuchElementException();
}
}
-
+
synchronized public int previousIndex()
{
return cursor-1;
}
-
+
/** This is not possible since several iterators can modify
InterfaceContainer
*/
public synchronized void set(Object o)
{
throw new UnsupportedOperationException();
}
-
-
+
+
} // class LstItr
}
diff --git a/main/offapi/com/sun/star/awt/XDisplayConnection.idl
b/main/offapi/com/sun/star/awt/XDisplayConnection.idl
index 43eaef7ae9..a49c5cc6fb 100644
--- a/main/offapi/com/sun/star/awt/XDisplayConnection.idl
+++ b/main/offapi/com/sun/star/awt/XDisplayConnection.idl
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -46,7 +46,7 @@ published interface XDisplayConnection:
com::sun::star::uno::XInterface
/** registers an event handler.
@param window
- the platform specific window id. If empty, the handler should be
+ the platform specific window id. If empty, the handler should
be
registered for all windows.
@param eventHandler
@@ -62,19 +62,14 @@ published interface XDisplayConnection:
com::sun::star::uno::XInterface
/** removes a eventHandler from the handler list.
@param window
-<<<<<<< HEAD
the platform specific window id the handler should be
deregistered for.
If empty, the handler should be deregistered completly.
-=======
- the platform specific window id the handler should be
deregistered for.
- If empty, the handler should be deregistered completely.
->>>>>>> ffd3847236 (pre-commit auto remove unneeded whitespace in idl files
(#380))
@param eventHandler
the handler to remove.
*/
[oneway] void removeEventHandler( [in] any window, [in] XEventHandler
eventHandler );
-
+
//-------------------------------------------------------------------------
/** register an error handler for toolkit specific errors.
@@ -100,7 +95,7 @@ published interface XDisplayConnection:
com::sun::star::uno::XInterface
@returns a unique platform dependend identifier for a display
connection.
*/
any getIdentifier();
-
+
};
//=============================================================================
diff --git a/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
b/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
index a8b11a37a2..fb8d7b388d 100644
--- a/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
+++ b/main/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -53,7 +53,7 @@ import org.openoffice.test.OfficeConnection;
import static org.junit.Assert.*;
/**
- * Check the XCellRangesQuery interface on the SheetCell service. test was
+ * Check the XCellRangesQuery interface on the SheetCell service. test was
* created for bug i20044.
*/
public class CheckXCellRangesQuery /* extends ComplexTestCase */ {
@@ -62,7 +62,6 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase
*/ {
XSpreadsheet m_xSpreadSheet = null;
/**
-<<<<<<< HEAD
* Get all test methods.
* @return The test methods.
*/
@@ -72,9 +71,6 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase
*/ {
/**
* Creates Spreadsheet document and the test object,
-=======
- * Creates Spreadsheet document and the test object,
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
* before the actual test starts.
*/
@Before public void before() {
@@ -96,7 +92,7 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase
*/ {
try {
System.out.println("Getting spreadsheet") ;
XSpreadsheets oSheets = m_xSheetDoc.getSheets() ;
- XIndexAccess oIndexSheets =
+ XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
m_xSpreadSheet = (XSpreadsheet) AnyConverter.toObject(
new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
@@ -164,7 +160,7 @@ public class CheckXCellRangesQuery /* extends
ComplexTestCase */ {
{
closeSpreadsheetDocument();
}
-
+
/**
* Perform some tests on an empty cell:
* <ol>
diff --git a/main/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
b/main/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
index b3d349a1dc..af56d3ac8c 100644
--- a/main/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
+++ b/main/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -40,7 +40,6 @@ import static org.junit.Assert.*;
public class OLESimpleStorageUnitTest /* extends ComplexTestCase */
{
private XMultiServiceFactory m_xMSF = null;
-<<<<<<< HEAD
// public String[] getTestMethodNames() {
// return new String[] {
@@ -50,8 +49,6 @@ public class OLESimpleStorageUnitTest /* extends
ComplexTestCase */
// public String getTestObjectName() {
// return "OLESimpleStorageUnitTest";
// }
-=======
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
@Before public void before () {
System.out.println("before()");
@@ -64,12 +61,12 @@ public class OLESimpleStorageUnitTest /* extends
ComplexTestCase */
fail( "Cannot create service factory!" );
}
}
-
+
@After public void after () {
System.out.println("after()");
m_xMSF = null;
}
-
+
@Test public void ExecuteTest01() {
System.out.println("ExecuteTest01()");
OLESimpleStorageTest aTest = new Test01( m_xMSF );
diff --git
a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index 514f536783..1c7a4b977e 100644
--- a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -57,15 +57,11 @@ public class CheckTransientDocumentsContentProvider {
private final int countDocs = testDocuments.length;
private XMultiServiceFactory xMSF = null;
private XTextDocument[] xTextDoc = null;
-<<<<<<< HEAD
public String[] getTestMethodNames() {
return new String[]{"checkTransientDocumentsContentProvider"};
}
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
@Before public void before() {
xMSF = getMSF();
xTextDoc = new XTextDocument[countDocs];
@@ -91,18 +87,18 @@ public class CheckTransientDocumentsContentProvider {
try {
// create a content provider
Object o =
xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
- XContentProvider xContentProvider =
+ XContentProvider xContentProvider =
UnoRuntime.queryInterface(XContentProvider.class,
o);
-
+
// create the ucb
- XContentIdentifierFactory xContentIdentifierFactory =
+ XContentIdentifierFactory xContentIdentifierFactory =
UnoRuntime.queryInterface(XContentIdentifierFactory.class,
xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
// create a content identifier from the ucb for tdoc
- XContentIdentifier xContentIdentifier =
+ XContentIdentifier xContentIdentifier =
xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/");
// get content
XContent xContent =
xContentProvider.queryContent(xContentIdentifier);
-
+
// actual test: execute an "open" command with the content
XCommandProcessor xCommandProcessor =
UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
// build up the command
@@ -111,14 +107,14 @@ public class CheckTransientDocumentsContentProvider {
commandarg2.Mode = OpenMode.ALL;
command.Name = "open";
command.Argument = commandarg2;
-
+
// execute the command
Object result = xCommandProcessor.execute(command, 0, null);
-
+
// check the result
System.out.println("Result: "+ result.getClass().toString());
XDynamicResultSet xDynamicResultSet =
UnoRuntime.queryInterface(XDynamicResultSet.class, result);
-
+
// check bug of wrong returned service name.
XServiceInfo xServiceInfo =
UnoRuntime.queryInterface(XServiceInfo.class, xDynamicResultSet);
String[] sNames = xServiceInfo.getSupportedServiceNames();
@@ -138,7 +134,7 @@ public class CheckTransientDocumentsContentProvider {
String identifier =
xContentAccess.queryContentIdentifierString();
System.out.println("Identifier of row " + xResultSet.getRow()
+ ": " + identifier);
}
- // some feeble test: if the amount >2, we're ok.
+ // some feeble test: if the amount >2, we're ok.
// 2do: check better
assertTrue("Did only find " + countContentIdentifiers + " open
documents." +
" Should have been at least 3.",
countContentIdentifiers>2);
@@ -147,7 +143,7 @@ public class CheckTransientDocumentsContentProvider {
e.printStackTrace();
fail("Could not create test objects.");
}
-
+
}
private XMultiServiceFactory getMSF()
diff --git a/main/unotools/qa/complex/tempfile/TempFileUnitTest.java
b/main/unotools/qa/complex/tempfile/TempFileUnitTest.java
index 58d5d77b1c..c133174cc6 100644
--- a/main/unotools/qa/complex/tempfile/TempFileUnitTest.java
+++ b/main/unotools/qa/complex/tempfile/TempFileUnitTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -41,7 +41,6 @@ import static org.junit.Assert.*;
public class TempFileUnitTest /* extends ComplexTestCase */ {
private XMultiServiceFactory m_xMSF = null;
private XSimpleFileAccess m_xSFA = null;
-<<<<<<< HEAD
// public String[] getTestMethodNames() {
// return new String[] {
@@ -53,9 +52,6 @@ public class TempFileUnitTest /* extends ComplexTestCase */ {
// return "TempFileUnitTest";
// }
-=======
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
@Before public void before() {
m_xMSF = getMSF();
if ( m_xMSF == null ) {
@@ -74,17 +70,17 @@ public class TempFileUnitTest /* extends ComplexTestCase */
{
fail ( "Cannot get simple file access!" );
}
}
-
+
@After public void after() {
m_xMSF = null;
m_xSFA = null;
}
-
+
@Test public void ExecuteTest01() {
TempFileTest aTest = new Test01( m_xMSF, m_xSFA );
assertTrue( "Test01 failed!", aTest.test() );
}
-
+
@Test public void ExecuteTest02() {
TempFileTest aTest = new Test02( m_xMSF, m_xSFA );
assertTrue( "Test02 failed!", aTest.test() );
