mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make help work again

Browse Source 
This is a regression from b248624126 I suspect
there might be more.

Change-Id: I9ffbcfb8d32b0b0b4193a86eee90d0a5f481de11
This commit is contained in:
Caolán McNamara
2013-04-09 10:24:32 +01:00
parent 542cf6d9ea
commit 9ca23ee5e7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/source/services/frame.cxx
View File

@@ -1772,7 +1772,7 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter
/* SAFE { */ /* SAFE { */
WriteGuard aWriteLock( m_aLock ); WriteGuard aWriteLock( m_aLock );
m_xLayoutManager.set(p1, css::uno::UNO_QUERY_THROW); m_xLayoutManager.set(p1, css::uno::UNO_QUERY);
aWriteLock.unlock(); aWriteLock.unlock();
/* } SAFE */ /* } SAFE */
} }

4
sfx2/source/appl/sfxhelp.cxx
View File

@@ -534,7 +534,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask ,
// otherwise - create new help task // otherwise - create new help task
Reference< XFrame2 > xHelpTask( Reference< XFrame2 > xHelpTask(
xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::TASKS | FrameSearchFlag::CREATE), xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::TASKS | FrameSearchFlag::CREATE),
UNO_QUERY_THROW); UNO_QUERY);
if (!xHelpTask.is()) if (!xHelpTask.is())
return 0; 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 // search must be done here; search one desktop level could return an arbitraty frame
Reference< XFrame2 > xHelp( Reference< XFrame2 > xHelp(
xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::CHILDREN), xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::CHILDREN),
UNO_QUERY_THROW); UNO_QUERY);
Reference< XFrame > xHelpContent = xDesktop->findFrame( Reference< XFrame > xHelpContent = xDesktop->findFrame(
OUString("OFFICE_HELP"), OUString("OFFICE_HELP"),
FrameSearchFlag::CHILDREN); FrameSearchFlag::CHILDREN);