User: hr Date: 2007-08-02 14:26:30+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.78.4); FILE MERGED 2007/07/12 13:46:15 lla 1.78.4.2: #i79080# fix problem which opens the Help Agent on the wrong frame 2007/07/11 12:04:37 lla 1.78.4.1: #i79080# help agent File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.79&r2=1.80 Delta lines: +35 -2 -------------------- --- genericcontroller.cxx 2007-07-24 12:07:21+0000 1.79 +++ genericcontroller.cxx 2007-08-02 14:26:28+0000 1.80 @@ -1243,14 +1243,47 @@ } //------------------------------------------------------------------------------ -void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId) +// prototype out of UITools.cxx +namespace dbaui { - try + void AppendConfigToken_Impl( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ); +} +// ----------------------------------------------------------------------------- + +void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL ) +{ + rtl::OUString suURL(_suHelpStringURL); + rtl::OUString sLanguage = rtl::OUString::createFromAscii("Language="); + if (suURL.indexOf(sLanguage) == -1) + { + dbaui::AppendConfigToken_Impl(suURL, sal_False /* sal_False := add '&' */ ); + } + URL aURL; + aURL.Complete = suURL; + + if (m_xUrlTransformer.is()) + m_xUrlTransformer->parseStrict(aURL); + + openHelpAgent(aURL); +} + +void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId) { URL aURL = createHelpAgentURL(lcl_getModuleHelpModuleName( getFrame() ),_nHelpId); if (m_xUrlTransformer.is()) m_xUrlTransformer->parseStrict(aURL); + openHelpAgent(aURL); +} + +void OGenericUnoController::openHelpAgent(URL aURL) +{ + try + { + // URL aURL = createHelpAgentURL(lcl_getModuleHelpModuleName( getFrame() ),_nHelpId); + // if (m_xUrlTransformer.is()) + // m_xUrlTransformer->parseStrict(aURL); + Reference< XDispatchProvider > xDispProv(m_xCurrentFrame, UNO_QUERY); Reference< XDispatch > xHelpDispatch; if (xDispProv.is()) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
