connectivity/qa/connectivity/tools/AbstractDatabase.java | 1 -
qadevOOo/runner/helper/CfgParser.java | 3 ---
qadevOOo/runner/helper/ProcessHandler.java | 2 --
qadevOOo/runner/util/WriterTools.java | 2 --
qadevOOo/tests/java/ifc/style/_ParagraphProperties.java | 1 -
qadevOOo/tests/java/ifc/text/_XSimpleText.java | 1 -
qadevOOo/tests/java/ifc/text/_XText.java | 1 -
qadevOOo/tests/java/mod/_forms/OTimeModel.java | 1 -
qadevOOo/tests/java/mod/_remotebridge/various.java | 2 --
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 1 -
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java | 1 -
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java | 1 -
qadevOOo/tests/java/mod/_sw/SwXTextView.java | 1 -
vcl/source/outdev/bitmap.cxx | 8
++++++--
14 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit 4eb816de71f1310a3a5d9803f7355849e6273439
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Sep 25 17:55:10 2020 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Sep 25 20:16:23 2020 +0200
do not assert for slow alpha blending if mirroring is used (tdf#136223)
The blend calls obviously will be skipped if mirroring is involved.
Given how long it took for somebody to notice, this is probably a rare
case, so just alter the assert, until this functionality is actually
needed to be fast.
Change-Id: If1f558cd4a7aac2bb52b677b5901585d878c6543
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103414
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index fc6095812b6c..a9f264fa2854 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -686,10 +686,14 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap&
rBmp, const AlphaMask& r
}
// we need to make sure OpenGL never reaches this slow code path
+ // tdf#136223: The slow code path will be obviously also reached if
mirroring
+ // is used, which makes the block above be skipped, as the blend bitmap
calls
+ // do not handle that case. Given that this seems to be rather rare, just
+ // disable the assert, until faster mirroring is actually needed.
- assert(!SkiaHelper::isVCLSkiaEnabled());
+ assert(!SkiaHelper::isVCLSkiaEnabled() || !bTryDirectPaint);
#if HAVE_FEATURE_OPENGL
- assert(!OpenGLHelper::isVCLOpenGLEnabled());
+ assert(!OpenGLHelper::isVCLOpenGLEnabled() || !bTryDirectPaint);
#endif
tools::Rectangle aBmpRect(Point(), rBmp.GetSizePixel());
if (!aBmpRect.Intersection(tools::Rectangle(rSrcPtPixel,
rSrcSizePixel)).IsEmpty())
commit 2a6fa9d1093e983b07b1e41b7797e9d605777154
Author: Noel Grandin <n...@peralex.com>
AuthorDate: Fri Sep 25 12:03:31 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Sep 25 20:16:14 2020 +0200
remove unused imports
Change-Id: Ib4a334ad929a410d6a19d1f832b202d61cd29336
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103384
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java
b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 601b36e23038..d34b39066e5b 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -30,7 +30,6 @@ import com.sun.star.sdbc.XStatement;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.util.CloseVetoException;
import connectivity.tools.sdb.Connection;
-import java.io.File;
import static org.junit.Assert.*;
public abstract class AbstractDatabase implements DatabaseAccess
diff --git a/qadevOOo/runner/helper/CfgParser.java
b/qadevOOo/runner/helper/CfgParser.java
index ea9e7b5c08c5..b65697e9b6c8 100644
--- a/qadevOOo/runner/helper/CfgParser.java
+++ b/qadevOOo/runner/helper/CfgParser.java
@@ -20,9 +20,6 @@ package helper;
import java.io.FileInputStream;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
import lib.TestParameters;
diff --git a/qadevOOo/runner/helper/ProcessHandler.java
b/qadevOOo/runner/helper/ProcessHandler.java
index 84dbd77967d7..26c1f787519f 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -25,8 +25,6 @@ import java.io.PrintWriter;
import java.io.PrintStream;
import java.io.LineNumberReader;
import java.io.InputStreamReader;
-import lib.TestParameters;
-import util.PropertyName;
import util.utils;
/*
diff --git a/qadevOOo/runner/util/WriterTools.java
b/qadevOOo/runner/util/WriterTools.java
index ad769ca8623a..cdff65557a72 100644
--- a/qadevOOo/runner/util/WriterTools.java
+++ b/qadevOOo/runner/util/WriterTools.java
@@ -27,7 +27,6 @@ import com.sun.star.drawing.XDrawPageSupplier;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.text.XText;
import com.sun.star.text.XTextContent;
@@ -36,7 +35,6 @@ import com.sun.star.text.XTextDocument;
import com.sun.star.graphic.XGraphic;
import com.sun.star.graphic.XGraphicProvider;
-import com.sun.star.graphic.GraphicProvider;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
index 88b1cae74dce..197925994cb8 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
@@ -22,7 +22,6 @@ import ifc.text._NumberingLevel;
import java.util.HashMap;
import lib.MultiPropertyTest;
-import lib.Status;
import share.LogWriter;
import util.utils;
diff --git a/qadevOOo/tests/java/ifc/text/_XSimpleText.java
b/qadevOOo/tests/java/ifc/text/_XSimpleText.java
index f4ab856f3b5d..bd6d6e294bda 100644
--- a/qadevOOo/tests/java/ifc/text/_XSimpleText.java
+++ b/qadevOOo/tests/java/ifc/text/_XSimpleText.java
@@ -19,7 +19,6 @@
package ifc.text;
import lib.MultiMethodTest;
-import lib.Status;
import com.sun.star.text.ControlCharacter;
import com.sun.star.text.XSimpleText;
diff --git a/qadevOOo/tests/java/ifc/text/_XText.java
b/qadevOOo/tests/java/ifc/text/_XText.java
index 0e2d8a3d6ea9..02e2f574288a 100644
--- a/qadevOOo/tests/java/ifc/text/_XText.java
+++ b/qadevOOo/tests/java/ifc/text/_XText.java
@@ -19,7 +19,6 @@
package ifc.text;
import lib.MultiMethodTest;
-import lib.Status;
import util.XInstCreator;
import com.sun.star.container.XIndexAccess;
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index 8dda139e5fea..7ceb1510da2c 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -25,7 +25,6 @@ import com.sun.star.sdbc.XResultSetUpdate;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter;
-import java.util.HashSet;
import ifc.form._XUpdateBroadcaster.UpdateChecker;
import lib.TestEnvironment;
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java
b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 21f3c0892955..6e11c46bad59 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -20,13 +20,11 @@ package mod._remotebridge;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import com.sun.star.bridge.XBridgeFactory;
-import com.sun.star.bridge.XInstanceProvider;
import com.sun.star.connection.XAcceptor;
import com.sun.star.connection.XConnection;
import com.sun.star.connection.XConnector;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
index e80d6bc8a0ba..0adc36e3bf1b 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
@@ -37,7 +37,6 @@ import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XFrame;
import com.sun.star.frame.XModel;
-import com.sun.star.lang.XInitialization;
import com.sun.star.text.XTextDocument;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java
b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java
index 7d2cfcdd19d3..d078516e2b80 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java
@@ -35,7 +35,6 @@ import com.sun.star.text.XTextCursor;
import com.sun.star.text.XTextDocument;
import com.sun.star.graphic.XGraphic;
import com.sun.star.graphic.XGraphicProvider;
-import com.sun.star.graphic.GraphicProvider;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.XComponentContext;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
index 87982b31a5ab..4a0de3b0b870 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
@@ -34,7 +34,6 @@ import com.sun.star.text.XTextDocument;
import com.sun.star.text.XTextGraphicObjectsSupplier;
import com.sun.star.graphic.XGraphic;
import com.sun.star.graphic.XGraphicProvider;
-import com.sun.star.graphic.GraphicProvider;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.XComponentContext;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
index 986e295916a1..9c72b2f0d27f 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
@@ -26,7 +26,6 @@ import com.sun.star.lang.WrappedTargetException;
import java.io.PrintWriter;
import java.util.Comparator;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
