android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 18 ++++------
sw/source/core/layout/paintfrm.cxx
| 9 +++++
2 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 6dc9552e22952f83d9ee16870eae9e1f2a2ca2fa
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 6 17:31:44 2012 +0300
Move Bootstrap setup and lib pre-loading (for easier debugging) to
onCreate()
Change-Id: I77c08dc1236c4c77cfb7711f3be659ebfe877dd1
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index c2ce1d4..c0f4c4d 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -135,7 +135,15 @@ public class LibreOfficeUIActivity extends
SherlockActivity implements ActionBar
currentDirectory = homeDirectory;
//Load default settings
+ Bootstrap.setup(this);
+ Bootstrap.putenv("SAL_LOG=yes");
+
+ // Load a lot of shlibs here explicitly in advance because that
+ // makes debugging work better, sigh
+ Bootstrap.dlopen("libmergedlo.so");
+ Bootstrap.dlopen("libswdlo.so");
+ Bootstrap.dlopen("libswlo.so");
}
public void createUI(){
@@ -741,16 +749,6 @@ class ListItemAdapter implements ListAdapter{
long t1 = System.currentTimeMillis();
timingOverhead = t1 - t0;
- Bootstrap.setup(LibreOfficeUIActivity.this);
-
- Bootstrap.putenv("SAL_LOG=yes");
-
- // Load a lot of shlibs here explicitly in advance because
that
- // makes debugging work better, sigh
- Bootstrap.dlopen("libmergedlo.so");
- Bootstrap.dlopen("libswdlo.so");
- Bootstrap.dlopen("libswlo.so");
-
// Log.i(TAG, "Sleeping NOW");
// Thread.sleep(20000);
commit 31c1971f8e80a2bf03efef77ba5db32ac7871b12
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Sep 6 17:28:24 2012 +0300
Avoid assertion failure when rendering thumbnails of some pages
Change-Id: I5331ae27d8e492a8094e1904ba3af143c7c1a0e5
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 0af0b44..b3efb88 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4614,6 +4614,15 @@ lcl_MakeBorderLine(SwRect const& rRect,
aEnd.setY(fStartY);
}
+ // WHen rendering to very small (virtual) devices, like when producing
+ // page thumbnails in a mobile device app, the line geometry can end up
+ // bogus (negative width or height), so just ignore such border lines.
+ // Otherwise we will run into assertions later in lcl_TryMergeBorderLine()
+ // at least.
+ if (aEnd.getX() < aStart.getX() ||
+ aEnd.getY() < aStart.getY())
+ return;
+
double const nExtentLeftStart = (isLeftOrTopBorder == isVertical)
? lcl_GetExtent(pStartNeighbour, 0)
: lcl_GetExtent(0, pStartNeighbour);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
