Merge remote-tracking branch 'upstream/main' into jabrefonline

* upstream/main:
  Update Gradle Wrapper from 7.0.2 to 7.1. (#7829)
  Oobranch b : add utilies (#7787)

Author: Siedlerchr

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

gradlew

@@ -36,6 +36,8 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
 
 import com.sun.star.awt.Point;
 import com.sun.star.beans.IllegalTypeException;

src/main/java/org/jabref/gui/openoffice/CreationException.java

@@ -52,6 +52,8 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.preferences.PreferencesService;
 
 import com.sun.star.beans.IllegalTypeException;

src/main/java/org/jabref/gui/openoffice/NoDocumentException.java

@@ -0,0 +1,15 @@
+package org.jabref.model.openoffice.uno;
+
+/**
+ * Exception used to indicate failure in either
+ *
+ *  XMultiServiceFactory.createInstance()
+ *  XMultiComponentFactory.createInstanceWithContext()
+ */
+public class CreationException extends Exception {
+
+    public CreationException(String message) {
+        super(message);
+    }
+
+}

src/main/java/org/jabref/gui/openoffice/OOBibBase.java

@@ -0,0 +1,12 @@
+package org.jabref.model.openoffice.uno;
+
+public class NoDocumentException extends Exception {
+
+    public NoDocumentException(String message) {
+        super(message);
+    }
+
+    public NoDocumentException() {
+        super("Not connected to a document");
+    }
+}

src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java

@@ -0,0 +1,92 @@
+package org.jabref.model.openoffice.uno;
+
+import java.util.Optional;
+
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XNamed;
+import com.sun.star.lang.DisposedException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XBookmarksSupplier;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
+
+public class UnoBookmark {
+
+    private UnoBookmark() { }
+
+    /**
+     * Provides access to bookmarks by name.
+     */
+    public static XNameAccess getNameAccess(XTextDocument doc)
+        throws
+        NoDocumentException {
+
+        XBookmarksSupplier supplier = UnoCast.cast(XBookmarksSupplier.class, doc).get();
+        try {
+            return supplier.getBookmarks();
+        } catch (DisposedException ex) {
+            throw new NoDocumentException("UnoBookmark.getNameAccess failed with" + ex);
+        }
+    }
+
+    /**
+     * Get the XTextRange corresponding to the named bookmark.
+     *
+     * @param name The name of the bookmark to find.
+     * @return The XTextRange for the bookmark, or Optional.empty().
+     */
+    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
+        throws
+        WrappedTargetException,
+        NoDocumentException {
+
+        XNameAccess nameAccess = getNameAccess(doc);
+        return (UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor));
+    }
+
+    /**
+     * Insert a bookmark with the given name at the cursor provided, or with another name if the one
+     * we asked for is already in use.
+     *
+     * In LibreOffice the another name is in "{name}{number}" format.
+     *
+     * @param name     For the bookmark.
+     * @param range    Cursor marking the location or range for the bookmark.
+     * @param absorb   Shall we incorporate range?
+     *
+     * @return The XNamed interface of the bookmark.
+     *
+     *         result.getName() should be checked by the caller, because its name may differ from
+     *         the one requested.
+     */
+    public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
+        throws
+        CreationException {
+        return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.Bookmark", name, range, absorb);
+    }
+
+    /**
+     * Remove the named bookmark if it exists.
+     */
+    public static void removeIfExists(XTextDocument doc, String name)
+        throws
+        NoDocumentException,
+        WrappedTargetException {
+
+        XNameAccess marks = UnoBookmark.getNameAccess(doc);
+
+        if (marks.hasByName(name)) {
+            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(marks, name);
+            if (mark.isEmpty()) {
+                return;
+            }
+            try {
+                doc.getText().removeTextContent(mark.get());
+            } catch (NoSuchElementException ex) {
+                // The caller gets what it expects.
+            }
+        }
+    }
+}