[Libreoffice-commits] core.git: 4 commits - sd/source starmath/source sw/source

[Caolán McNamara]

 sd/source/ui/unoidl/DrawController.cxx   |    8 ++------
 starmath/source/accessibility.cxx        |    4 ++--
 sw/source/core/access/accnotextframe.cxx |    2 +-
 sw/source/uibase/docvw/edtwin.cxx        |    4 ++++
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 96777e02d82f4a44cf681ea8f23d57676cdd515e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 17:13:40 2015 +0100

    silence warning about unknown swipe command
    
    and show context menu on long-press
    
    Change-Id: I6d603ebcc049b5ec2f9b23f7e400d995883324ea

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 22293eb..510518e 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5123,6 +5123,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
     switch ( rCEvt.GetCommand() )
     {
     case CommandEventId::ContextMenu:
+    case CommandEventId::LongPress:
     {
             const sal_uInt16 nId = SwInputChild::GetChildWindowId();
             SwInputChild* pChildWin = static_cast<SwInputChild*>(GetView().GetViewFrame()->
@@ -5207,6 +5208,9 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             bCallBase = !m_rView.HandleWheelCommands( rCEvt );
             break;
 
+    case CommandEventId::Swipe: //nothing yet
+            break;
+
     case CommandEventId::StartExtTextInput:
     {
         bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
commit 34c0b8869784cb44a516c97213ef24566a4ed111
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 16:16:40 2015 +0100

    coverity#1311944 Logically dead code
    
    for the record its a SwFormatChg we get here at the crash time
    
    regression from
    
    commit 7de992bcc66c973bb6b247184cac38f01cd1104a
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Jul 13 12:38:18 2015 +0100
    
        fix a11y crash seen on close of tdf#92573
    
        its not the reported crash, which has "gone away" which might
        be a duplicate of tdf#90502
    
        the switch only handled RES_TITLE_CHANGED and RES_DESCRIPTION_CHANGED so if its
        anything else, e.g. OBJ_DYING, then don't attempt GetNoTextNode
    
    Change-Id: I290d6e633811423c3acc198aba7a60943518ec4a

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 58fb53f..5a5ec60 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
             return; // probably was deleted - avoid doing anything
     }
 
-    if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED)
+    if (nWhich != RES_TITLE_CHANGED && nWhich != RES_DESCRIPTION_CHANGED)
         return;
 
     const SwNoTextNode *pNd = GetNoTextNode();
commit 69d31d10c298693c4d7f0db6f8a6f8025bbf07c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 16:19:47 2015 +0100

    coverity#1311945 Uncaught exception
    
    Change-Id: I9c5738330a765747e749c4ec88bc6e87d8703c1c

diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index ffa8dff..78fcbe0 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -442,13 +442,9 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
 
             mpCurrentPage.reset(pNewCurrentPage);
         }
-        catch (const uno::Exception&)
+        catch (const uno::Exception& e)
         {
-            OSL_FAIL(
-                OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " +
-                    OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 )).getStr() );
+            SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught:  " << e.Message);
         }
     }
 }
commit 508a99e50d942a4911374ae2daae05be996708fd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 16:14:52 2015 +0100

    coverity#1209707 Dereference null return value
    
    and
    
    coverity#1209708 Dereference null return value
    
    Change-Id: I3ba48950f989f8c49d1b09fde30de4c46f0bad1b

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index f3c5996..fbae1df 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -980,7 +980,7 @@ OUString SmTextForwarder::GetText( const ESelection& rSel ) const
 SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
-    OSL_ENSURE( pEditEngine, "EditEngine missing" );
+    assert(pEditEngine && "EditEngine missing");
     if( rSel.nStartPara == rSel.nEndPara )
     {
         GetAttribsFlags nFlags = GetAttribsFlags::NONE;
@@ -1010,7 +1010,7 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, EditEngineAttrib
 SfxItemSet SmTextForwarder::GetParaAttribs( sal_Int32 nPara ) const
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
-    OSL_ENSURE( pEditEngine, "EditEngine missing" );
+    assert(pEditEngine && "EditEngine missing");
 
     SfxItemSet aSet( pEditEngine->GetParaAttribs( nPara ) );