[Libreoffice-commits] .: 2 commits - scripting/source sw/source

[Libreoffice Gerrit user]

 scripting/source/provider/ProviderCache.cxx |    2 +-
 sw/source/ui/shells/textsh.cxx              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6b71d74fddca5e260ab2a3d6307603f5b469108
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 30 09:55:11 2012 +0000

    squeeze all Exceptions through RuntimeException for exception sig
    
    Change-Id: I50377a12c2baadf48767e1d4c265417d3c8ab765

diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index 48abd56..0b65ffa 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -189,7 +189,7 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti
         details.provider.set(
             details.factory->createInstanceWithArgumentsAndContext( m_Sctx, m_xContext ), UNO_QUERY_THROW );
     }
-    catch ( const RuntimeException& e )
+    catch ( const Exception& e )
     {
         ::rtl::OUString temp("ProviderCache::createProvider() Error creating provider from factory!!!\n");
         throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
commit ce3d66c29da891eee999a2e702c05ecd6babf5ff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 30 09:54:32 2012 +0000

    cancel on insert frame was inserting a frame
    
    Change-Id: Ie95947935b5891642f22c81a15ae1d9ed24fd3f2

diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index f282e5f..1fdaf20 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -597,7 +597,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog( DLG_FRM_STD,
                                                     GetView().GetViewFrame(), &GetView().GetViewFrame()->GetWindow(), aSet, sal_True);
             OSL_ENSURE(pDlg, "Dialogdiet fail!");
-            if(pDlg->Execute() && pDlg->GetOutputItemSet())
+            if(pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet())
             {
                 //local variable necessary at least after call of .AutoCaption() because this could be deleted at this point
                 SwWrtShell& rShell = GetShell();