[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/DeckLayouter.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 8782c6d577a195b97f00c13133ba367b830ac491
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 2 14:12:20 2021 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Apr 6 12:14:01 2021 +0200

    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 at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113525
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index c4c9cd4b9a81..c9d59136c379 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());