summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-02 14:12:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-03-09 20:35:38 +0100
commitec6fe7d32d1433589124a45afa4accd7caaf030c (patch)
treed30fcb6a85cb2d7fe9194499e3fd9c8a17e6c118
parent6d43ba110084605462901bcee786c7ae4c1f3bdf (diff)
make Analog Clock sidebar extension demo work
from... https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension http://people.apache.org/~af/clock/AnalogClock.oxt presumably compatibility was broken at: commit e66be44b69ee2a1b99bda32af93ea453c669b319 Date: Sun Jun 2 04:46:58 2013 +0200 sidebar: Restrict the minimal width of the sidebar. Change-Id: Id1531d4531a3e9bceb3d37a9e74a7a06497098e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111868 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/sidebar/DeckLayouter.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index f90ec176b2d0..bebc75e726ad 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -433,7 +433,16 @@ void GetRequestedSizes (
<< " Maximum: " << rItem.maLayoutSize.Maximum);
}
- sal_Int32 nWidth = xPanel->getMinimalWidth();
+ sal_Int32 nWidth = rMinimalWidth;
+ try
+ {
+ // The demo sidebar extension "Analog Clock" fails with
+ // java.lang.AbstractMethodError here
+ nWidth = xPanel->getMinimalWidth();
+ }
+ catch (...)
+ {
+ }
uno::Reference<frame::XDesktop2> xDesktop
= frame::Desktop::create(comphelper::getProcessComponentContext());