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 8180f3ff08 Cleanup merge conflicts
8180f3ff08 is described below
commit 8180f3ff08518471624cbca67b58255383daea1e
Author: mseidel <[email protected]>
AuthorDate: Tue Jul 22 00:07:57 2025 +0200
Cleanup merge conflicts
---
main/bean/qa/complex/bean/OOoBeanTest.java | 53 +++++++-------
.../qa/complex/connectivity/HsqlDriverTest.java | 47 +++----------
main/desktop/source/app/configinit.hxx | 23 +++----
.../detection/typeDetection/TypeDetection.java | 80 ++++------------------
main/testtools/qa/cli/CLITest.java | 16 ++---
main/testtools/qa/cliversioning/makefile.mk | 25 ++-----
6 files changed, 63 insertions(+), 181 deletions(-)
diff --git a/main/bean/qa/complex/bean/OOoBeanTest.java
b/main/bean/qa/complex/bean/OOoBeanTest.java
index 28d175a4f5..bf45bd42dc 100644
--- a/main/bean/qa/complex/bean/OOoBeanTest.java
+++ b/main/bean/qa/complex/bean/OOoBeanTest.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.
- *
+ *
*************************************************************/
@@ -50,7 +50,6 @@ class PrivateLocalOfficeConnection extends
com.sun.star.comp.beans.LocalOfficeCo
public class OOoBeanTest
{
-<<<<<<< HEAD
// public String[] getTestMethodNames()
// {
@@ -68,8 +67,6 @@ public class OOoBeanTest
// "test8"
// };
// }
-=======
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
/** For X-Windows we need to prolong the time between painting windows.
Because
it takes longer than on Windows.
@@ -91,7 +88,7 @@ public class OOoBeanTest
{
boolean ret = false;
String os = System.getProperty("os.name");
- if (os != null)
+ if (os != null)
{
os = os.trim();
if (os.toLowerCase().indexOf("win") == 0)
@@ -214,14 +211,14 @@ public class OOoBeanTest
{
fail("Sizing error: Frame moved.");
}
-
+
capturer.grabTwo(f.getClientArea());
if (capturer.compare() == false)
{
fail("Painting error: Move frame to a different position.");
capturer.writeImages();
}
-
+
//move Window down
Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
int maxY = dim.height - f.getBounds().height;
@@ -244,7 +241,7 @@ public class OOoBeanTest
}
//obscure the window and make it visible again
-
+
oldPosition = f.getBounds();
Rectangle pos = new Rectangle(oldPosition.x - 50, oldPosition.y -
50,
@@ -302,7 +299,7 @@ public class OOoBeanTest
{
fail("Sizing error.");
}
-
+
}
finally
{
@@ -368,7 +365,7 @@ public class OOoBeanTest
f.removeOOoBean();
f.addOOoBean();
}
-
+
f.goToStart();
f.pageDown();
Thread.sleep(getSleepTime(200));
@@ -380,7 +377,7 @@ public class OOoBeanTest
"repeatedly to java.lang.Frame.");
capturer.writeImages();
}
-
+
if (f.checkUnoFramePosition() == false)
{
fail("Sizing error.");
@@ -423,7 +420,7 @@ public class OOoBeanTest
bean.loadFromURL("private:factory/swriter", null);
// #1
Thread.sleep(1000);
-
+
StringBuffer buf = new StringBuffer(1000);
for (int i = 0; i < 1; i++)
{
@@ -436,7 +433,7 @@ public class OOoBeanTest
bean.aquireSystemWindow();
// frame.validate();
}
-
+
if (isWindows() == false)
{
Thread.sleep(5000);
@@ -446,7 +443,7 @@ public class OOoBeanTest
roby.keyPress(KeyEvent.VK_H);
roby.keyRelease(KeyEvent.VK_H);
buf.append("h");
-
+
String s = getText(bean);
if ( ! s.equals(buf.toString()))
{
@@ -461,12 +458,12 @@ public class OOoBeanTest
{
Thread.sleep(2000);
}
-
+
} finally {
bean.stopOOoConnection();
frame.dispose();
}
- }
+ }
}
/** Tests focus problem just like test6, but the implementation is a little
@@ -494,7 +491,7 @@ public class OOoBeanTest
Thread.sleep(1000);
StringBuffer buf = new StringBuffer(1000);
int i = 0;
-
+
for (; i < 1; i++)
{
EventQueue q =
Toolkit.getDefaultToolkit().getSystemEventQueue();
@@ -502,14 +499,14 @@ public class OOoBeanTest
public void run() {
try {
- bean.releaseSystemWindow();
+ bean.releaseSystemWindow();
frame.remove(bean);
frame.validate();
} catch (Exception e) {
e.printStackTrace();
}
-
+
}
});
// #2
@@ -526,11 +523,11 @@ public class OOoBeanTest
}
}
});
-
+
// #3
Thread.sleep(1000);
}
-
+
if (isWindows() == false)
{
Thread.sleep(5000);
@@ -549,7 +546,7 @@ public class OOoBeanTest
roby.waitForIdle();
buf.append("h");
- Thread.sleep(1000);
+ Thread.sleep(1000);
String s = getText(bean);
System.out.println(" getText: " + s);
if ( ! s.equals(buf.toString()))
@@ -564,7 +561,7 @@ public class OOoBeanTest
roby.waitForIdle();
String sH = "h";
- Thread.sleep(1000);
+ Thread.sleep(1000);
String s2 = getText(bean);
if ( ! sH.equals(s2))
@@ -582,7 +579,7 @@ public class OOoBeanTest
{
// Thread.sleep(2000);
}
-
+
} finally {
bean.stopOOoConnection();
frame.dispose();
@@ -652,7 +649,7 @@ public class OOoBeanTest
c.gridx = 0;
c.gridy = 0;
f.add(bp1, c);
-
+
c.gridx = 1;
c.insets = new Insets(0, 0, 0, 0);
f.add(bp2, c);
diff --git a/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
b/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index be654fd21a..6a39b59b60 100644
--- a/main/connectivity/qa/complex/connectivity/HsqlDriverTest.java
+++ b/main/connectivity/qa/complex/connectivity/HsqlDriverTest.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.
- *
+ *
*************************************************************/
@@ -30,7 +30,7 @@ import com.sun.star.lang.*;
import com.sun.star.document.XDocumentSubStorageSupplier;
import complexlib.ComplexTestCase;
-
+
import org.hsqldb.lib.StopWatch;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.beans.PropertyState;
@@ -42,7 +42,6 @@ import connectivity.tools.HsqlDatabase;
public class HsqlDriverTest extends ComplexTestCase {
-<<<<<<< HEAD
public String[] getTestMethodNames() {
return new String[] { "test" };
@@ -57,22 +56,6 @@ public class HsqlDriverTest extends ComplexTestCase {
super.assure(sMessage,check);
}
-=======
-public class HsqlDriverTest {
- private static final OfficeConnection connection = new OfficeConnection();
-
- @BeforeClass
- public static void beforeClass() throws Exception {
- connection.setUp();
- }
-
- @AfterClass
- public static void afterClass() throws Exception {
- connection.tearDown();
- }
-
- @Test
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
public void test(){
XDataSource ds = null;
System.gc();
@@ -82,7 +65,7 @@ public class HsqlDriverTest {
} catch(Exception ex) {
throw new RuntimeException("factory: unable to construct data
source" );
}
-
+
try{
XDocumentSubStorageSupplier doc =
(XDocumentSubStorageSupplier)UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
XStorage stor = doc.getDocumentSubStorage("database",4);
@@ -118,19 +101,13 @@ public class HsqlDriverTest {
info = new com.sun.star.beans.PropertyValue[]{
new
com.sun.star.beans.PropertyValue("Storage",0,stor,PropertyState.DIRECT_VALUE)
,new
com.sun.star.beans.PropertyValue("URL",0,mod.getURL(),PropertyState.DIRECT_VALUE)
-<<<<<<< HEAD
};
drv =
(XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
-=======
- };
- drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,
xMSF.createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver"));
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
TestCacheSize test = new
TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv);
- StopWatch sw = new StopWatch();
+ StopWatch sw = new StopWatch();
try{
test.setUp();
@@ -148,26 +125,20 @@ public class HsqlDriverTest {
}
public void test2(){
System.gc();
-
+
com.sun.star.beans.PropertyValue[] info = null;
XDriver drv = null;
try{
info = new com.sun.star.beans.PropertyValue[]{
new
com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE)
,new
com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0,
false,PropertyState.DIRECT_VALUE)
-<<<<<<< HEAD
};
drv =
(XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
TestCacheSize test = new
TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv);
-=======
- };
- drv =
(XDriver)UnoRuntime.queryInterface(XDriver.class,xMSF.createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
- TestCacheSize test = new TestCacheSize(xMSF,info,drv);
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
test.setURL("jdbc:hsqldb:g:\\hsql\\db");
- StopWatch sw = new StopWatch();
+ StopWatch sw = new StopWatch();
try{
test.setUp();
diff --git a/main/desktop/source/app/configinit.hxx
b/main/desktop/source/app/configinit.hxx
index 1e56b85ee0..a37c938ecf 100644
--- a/main/desktop/source/app/configinit.hxx
+++ b/main/desktop/source/app/configinit.hxx
@@ -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.
- *
+ *
*************************************************************/
#ifndef _DESKTOP_CONFIGINIT_HXX_
@@ -29,7 +29,7 @@
Important: exceptions thrown from that method will contain a readily
displayable message.
- @return
+ @return
The default configuration provider for the application or<br/>
<NULL/>, if startup was canceled
@@ -37,17 +37,12 @@ displayable message.
if the configuration provider can't be created
@throw com::sun::star::lang::ServiceNotRegisteredException
-<<<<<<< HEAD
if the ConfigurationProvider service is unknwon
-=======
- if the ConfigurationProvider service is unknown
-
->>>>>>> 914d351e5f (pre-commit auto clean trailing whitespace in dxp and hxx
files (#381))
@throw com::sun::star::lang::WrappedTargetException
if the configuration backend could be created,
but incurred a failure later
-
+
*/
extern
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
@@ -64,7 +59,7 @@ com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >
{
public:
typedef com::sun::star::uno::Reference<
com::sun::star::task::XInteractionHandler > InteractionHandler;
-
+
/// Constructor: Uses the default interaction handler
ConfigurationErrorHandler()
: m_pContext(0), m_xHandler()
@@ -83,11 +78,11 @@ com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >
void activate();
/// deinstalls the handler from the current context, restoring the
previous context
void deactivate();
- private:
+ private:
class Context;
Context * m_pContext;
InteractionHandler m_xHandler;
- private:
+ private:
// not implemented - suppress copy
ConfigurationErrorHandler(const ConfigurationErrorHandler&);
void operator=(const ConfigurationErrorHandler&);
diff --git
a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index 5a384de2b8..697cd861a4 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/main/filter/qa/complex/filter/detection/typeDetection/TypeDetection.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.
- *
+ *
*************************************************************/
@@ -180,7 +180,7 @@ import util.utils;
*/
public class TypeDetection extends ComplexTestCase {
- /**
+ /**
* @member m_xDetection the object to test
* @member helper instacne of helper class
*/
@@ -210,30 +210,19 @@ public class TypeDetection extends ComplexTestCase {
public void before() throws Exception {
// create TypeDetection
-<<<<<<< HEAD
XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
assure("Could not get XMultiServiceFactory", xMSF != null);
-=======
- XMultiServiceFactory xMSF =
UnoRuntime.queryInterface(XMultiServiceFactory.class,
connection.getComponentContext().getServiceManager());
- assertTrue("Could not get XMultiServiceFactory", xMSF != null);
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
Object oInterface = xMSF.createInstance(
"com.sun.star.document.TypeDetection");
-
+
if (oInterface == null) {
failed("Service wasn't created") ;
}
XInterface oObj = (XInterface) oInterface ;
-<<<<<<< HEAD
log.println("ImplName: "+utils.getImplName(oObj));
-=======
- System.out.println("ImplName: "+utils.getImplName(oObj));
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
m_xDetection = (XTypeDetection)
UnoRuntime.queryInterface(XTypeDetection.class, oInterface);
Enumeration k = param.keys();
@@ -253,8 +242,8 @@ public class TypeDetection extends ComplexTestCase {
}
/**
- * The <code>MediaDescriptor</code> was filled with the URL of a file. The
- * <code>type</code> of the file is kown and must be returned by
+ * The <code>MediaDescriptor</code> was filled with the URL of a file. The
+ * <code>type</code> of the file is kown and must be returned by
* <code>MediaDescriptor</code>
*
* Syntax of files.csv:
@@ -271,7 +260,6 @@ public class TypeDetection extends ComplexTestCase {
while (allToDos.hasMoreElements()){
Vector toDo = (Vector) allToDos.nextElement();
-<<<<<<< HEAD
String fileAlias = (String) toDo.get(0);
String fileURL = (String) toDo.get(1);
String URLfileType = (String) toDo.get(2);
@@ -289,22 +277,6 @@ public class TypeDetection extends ComplexTestCase {
} catch (ClassCastException e){
failed(e.toString(), true);
-=======
- for (ArrayList<String> toDo : CSVData){
- String fileAlias = toDo.get(0);
- String fileURL = toDo.get(1);
- String URLfileType = toDo.get(2);
- String StreamfileType = toDo.get(3);
-
- fileURL = utils.getFullURL(Helper.ensureEndingFileSep(
- Argument.get("tdoc")) + fileURL);
-
- System.out.println("actual '"+ fileAlias +
- "' ['" + URLfileType + "']: '" + fileURL);
-
- checkMediaDescriptorURL(fileAlias, fileURL, URLfileType);
- checkMediaDescriptorXInputStream(fileAlias, fileURL,
StreamfileType);
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
}
}
@@ -318,13 +290,8 @@ public class TypeDetection extends ComplexTestCase {
*/
private void checkMediaDescriptorURL(
String fileAlias, String fileURL, String fileType){
-<<<<<<< HEAD
PropertyValue[] MediaDescriptor = helper.createMediaDescriptor(
-=======
-
- PropertyValue[] MediaDescriptor = Helper.createMediaDescriptor(
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
new String[] {"URL"},
new Object[] {fileURL});
log.println("check only by URL...");
@@ -350,16 +317,15 @@ public class TypeDetection extends ComplexTestCase {
*/
private void checkMediaDescriptorXInputStream(
String fileAlias, String fileURL, String
fileType){
-
+
XInputStream xStream = null;
-
+
try{
xStream = helper.getFileStream( fileURL );
} catch (NotConnectedException e) {
failed("Could not get XInputStream from file :'" + fileURL +
"'",true);
return;
}
-<<<<<<< HEAD
PropertyValue[] MediaDescriptor = helper.createMediaDescriptor(
new String[] {"InputStream"},
@@ -374,28 +340,11 @@ public class TypeDetection extends ComplexTestCase {
assure("\nXInputStream-test: " + fileAlias + ":\n\treturned type:
'" + type +
"'\n\texpected type: '" + fileType + "'", fileTypeOK, true);
-=======
-
- PropertyValue[] MediaDescriptor = Helper.createMediaDescriptor(
- new String[] {"InputStream"},
- new Object[] {xStream}
- );
- System.out.println("check only by XInputStream...");
-
- String type = m_xDetection.queryTypeByDescriptor(
- Helper.createInOutPropertyValue(MediaDescriptor),
true);
-
- boolean fileTypeOK = Helper.checkFileType(type, fileType);
-
- assertTrue("\nXInputStream-test: " + fileAlias + ":\n\treturned type:
'" + type +
- "'\n\texpected type: '" + fileType + "'", fileTypeOK);
-
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
}
/**
- * The <code>MediaDescriptor</code> was filled with the URL of a file. The
- * <code>type</code> of the file is kown and must be returned by
+ * The <code>MediaDescriptor</code> was filled with the URL of a file. The
+ * <code>type</code> of the file is kown and must be returned by
* <code>MediaDescriptor</code>
*
* Syntax of files.csv:
@@ -477,13 +426,8 @@ public class TypeDetection extends ComplexTestCase {
new Object[] {fileURL, filterName,
filterOptions, filterData});
-<<<<<<< HEAD
log.println("check '" + fileAlias + "' with filter: '" +
filterName + "'");
-=======
- System.out.println("check '" + fileAlias + "' with filter: '" +
- filterName + "'");
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
String type = m_xDetection.queryTypeByDescriptor(
helper.createInOutPropertyValue(MediaDescriptor), true);
diff --git a/main/testtools/qa/cli/CLITest.java
b/main/testtools/qa/cli/CLITest.java
index 79e9e7ba91..efa35d7bfd 100644
--- a/main/testtools/qa/cli/CLITest.java
+++ b/main/testtools/qa/cli/CLITest.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.
- *
+ *
*************************************************************/
@@ -37,7 +37,6 @@ public class CLITest extends ComplexTestCase
};
}
-<<<<<<< HEAD
public void runCLITests()
{
try
@@ -45,13 +44,6 @@ public class CLITest extends ComplexTestCase
String testProgram = System.getProperty("cli_test", "");
if (testProgram.length() == 0)
failed("Check the make file. Java must be called with
-Dcli_test=pathtoexe");
-=======
- String arg1 = System.getProperty("cli_test_arg", "");
- if (arg1.length() == 0)
- fail("Check the make file. Java must be called with " +
- "-Dcli_test_arg=path_to_bootstrap_ini");
- String[] cmdarray = new String[] {testProgram, arg1};
->>>>>>> 3309286857 (pre-commit auto remove trailing whitespace from java files
(#382))
String arg1 = System.getProperty("cli_test_arg", "");
if (arg1.length() == 0)
diff --git a/main/testtools/qa/cliversioning/makefile.mk
b/main/testtools/qa/cliversioning/makefile.mk
index cb4c4818a3..f13f270a06 100644
--- a/main/testtools/qa/cliversioning/makefile.mk
+++ b/main/testtools/qa/cliversioning/makefile.mk
@@ -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.
-#
+#
#**************************************************************
@@ -51,7 +51,6 @@ JARCOMPRESS = TRUE
ALLTAR : \
echo
-<<<<<<< HEAD
echo :
@echo .
@echo ########################### N O T E
######################################
@@ -87,20 +86,4 @@ RUN: $(MISC)$/copyassemblies.done
java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot)
-Dcli_test_program=$(BIN)$/runtests.exe
-Dpath="$(office)"\OpenOffice.org\URE\bin $(CT_APP) $(CT_NOOFFICE)
$(CT_TESTBASE) $(CT_TEST)
run: RUN
-=======
-.ELSE
-ALLTAR :
- @echo .
- @echo ########################### N O T E
######################################
- @echo .
- @echo To run the test you have to provide the path to the office
location. It must
- @echo "contain the ure (d:\myOffice\OpenOffice.org\URE)."
- @echo Also an office must be installed with full system integration.
- @echo Example:
- @echo "dmake office="d:\myOffice""
- @echo .
- @echo ########################### N O T E
######################################
- exit 1
-.ENDIF
->>>>>>> 31bbceb0f9 (pre-commit auto remove trailing whitespace from `.mk`
files (#377))
