[Libreoffice-commits] core.git: framework/source sfx2/source

[Caolán McNamara]

 framework/source/services/frame.cxx |    2 +-
 sfx2/source/appl/sfxhelp.cxx        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9ca23ee5e776b80d1e8fcac4c3897cc0d0569bc3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 9 10:24:32 2013 +0100

    make help work again
    
    This is a regression from b248624126c271c88381d3dad6e04fc954f65779 I suspect
    there might be more.
    
    Change-Id: I9ffbcfb8d32b0b0b4193a86eee90d0a5f481de11

diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 44d30d0..e651994 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1772,7 +1772,7 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter
 
     /* SAFE { */
         WriteGuard aWriteLock( m_aLock );
-            m_xLayoutManager.set(p1, css::uno::UNO_QUERY_THROW);
+            m_xLayoutManager.set(p1, css::uno::UNO_QUERY);
         aWriteLock.unlock();
     /* } SAFE */
 }
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d37f618..fad7046 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -534,7 +534,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
     // otherwise - create new help task
     Reference< XFrame2 > xHelpTask(
         xDesktop->findFrame(  "OFFICE_HELP_TASK", FrameSearchFlag::TASKS | FrameSearchFlag::CREATE),
-        UNO_QUERY_THROW);
+        UNO_QUERY);
     if (!xHelpTask.is())
         return 0;
 
@@ -755,7 +755,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
     // search must be done here; search one desktop level could return an arbitraty frame
     Reference< XFrame2 > xHelp(
         xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::CHILDREN),
-        UNO_QUERY_THROW);
+        UNO_QUERY);
     Reference< XFrame > xHelpContent = xDesktop->findFrame(
         OUString("OFFICE_HELP"),
         FrameSearchFlag::CHILDREN);