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 831a3cf2bf Cleanup merge conflict
831a3cf2bf is described below
commit 831a3cf2bfe69e32910b4418826cb004e450f0da
Author: mseidel <[email protected]>
AuthorDate: Sat Aug 30 19:08:19 2025 +0200
Cleanup merge conflict
---
.../CheckTransientDocumentsContentProvider.java | 36 +++++++++-------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git
a/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
b/main/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index f2d0fa84ff..324f19c4b3 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,19 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
package complex.tdoc;
import com.sun.star.lang.XMultiServiceFactory;
@@ -57,11 +56,11 @@ public class CheckTransientDocumentsContentProvider {
private final int countDocs = testDocuments.length;
private XMultiServiceFactory xMSF = null;
private XTextDocument[] xTextDoc = null;
-
+
public String[] getTestMethodNames() {
return new String[]{"checkTransientDocumentsContentProvider"};
}
-
+
@Before public void before() {
xMSF = getMSF();
xTextDoc = new XTextDocument[countDocs];
@@ -87,18 +86,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
@@ -107,14 +106,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();
@@ -134,13 +133,8 @@ public class CheckTransientDocumentsContentProvider {
String identifier =
xContentAccess.queryContentIdentifierString();
System.out.println("Identifier of row " + xResultSet.getRow()
+ ": " + identifier);
}
-<<<<<<< HEAD
- // some feeble test: if the amount >2, we're ok.
- // 2do: check better
-=======
// some feeble test: if the amount >2, we're ok.
// TODO: check better
->>>>>>> 5cd1c82638 (Replace 2do -> TODO, minor cleanup)
assertTrue("Did only find " + countContentIdentifiers + " open
documents." +
" Should have been at least 3.",
countContentIdentifiers>2);
}
@@ -148,7 +142,7 @@ public class CheckTransientDocumentsContentProvider {
e.printStackTrace();
fail("Could not create test objects.");
}
-
+
}
private XMultiServiceFactory getMSF()
