[Libreoffice-commits] core.git: 2 commits - sd/source slideshow/source

[Michael Stahl]

 sd/source/ui/func/fuchar.cxx              |    2 +-
 slideshow/source/engine/slideshowimpl.cxx |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit cea58d4c27621725b068d26f3587491322769f45
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 31 15:59:42 2016 +0200

    slideshow: stop whining about PresenterCanvas' lack of XUpdatable
    
    Change-Id: I1e447f5eccb41325d96e9c4cb1598a05e702badc

diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 630b18f..b83a2ea 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2101,9 +2101,12 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
                 {
                     uno::Reference< presentation::XSlideShowView > xView( pView->getUnoView(),
                                                                           uno::UNO_QUERY_THROW );
-                    uno::Reference< util::XUpdatable >             xUpdatable( xView->getCanvas(),
-                                                                               uno::UNO_QUERY_THROW );
-                    xUpdatable->update();
+                    uno::Reference<util::XUpdatable> const xUpdatable(
+                            xView->getCanvas(), uno::UNO_QUERY);
+                    if (xUpdatable.is()) // not supported in PresenterCanvas
+                    {
+                        xUpdatable->update();
+                    }
                 }
                 catch( uno::RuntimeException& )
                 {
commit 52bac50deb628cb21c88d5dcab032d4980bb8974
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 31 14:45:17 2016 +0200

    sd: fix un-sorted SidArray in FuChar::DoExecute()
    
    Triggers an assert in SfxBindings::Invalidate().
    
    (regression from ecc7308efa973fd1f1985ff9a0a0f01414b73f2b)
    
    Change-Id: Ida5b6c006ef6b8a839962c4f09c8341eee980270

diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 0fbd9dd..cd02f20 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -143,11 +143,11 @@ void FuChar::DoExecute( SfxRequest& rReq )
                     SID_ATTR_CHAR_UNDERLINE,
                     SID_ATTR_CHAR_FONTHEIGHT,
                     SID_ATTR_CHAR_COLOR,
-                    SID_ATTR_CHAR_BACK_COLOR,
                     SID_ATTR_CHAR_KERNING,
                     SID_ATTR_CHAR_CASEMAP,
                     SID_SET_SUPER_SCRIPT,
                     SID_SET_SUB_SCRIPT,
+                    SID_ATTR_CHAR_BACK_COLOR,
                     0 };
 
     mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );