Tag: cws_src680_rpt23fix01 User: lla Date: 2007-07-12 13:46:18+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/source/ui/browser/genericcontroller.cxx dba/dbaccess/source/ui/misc/UITools.cxx
Log: #i79080# fix problem which opens the Help Agent on the wrong frame File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.3.4.1&r2=1.3.4.2 Delta lines: +3 -3 ------------------- --- genericcontroller.hxx 2007-07-11 12:03:56+0000 1.3.4.1 +++ genericcontroller.hxx 2007-07-12 13:46:14+0000 1.3.4.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.3.4.1 $ + * $Revision: 1.3.4.2 $ * - * last change: $Author: lla $ $Date: 2007/07/11 12:03:56 $ + * last change: $Author: lla $ $Date: 2007/07/12 13:46:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -322,7 +322,7 @@ @param _pHelpStringURL The help url to dispatch. */ - void openHelpAgent(sal_Char* _pHelpStringURL ); + void openHelpAgent(rtl::OUString const& _suHelpStringURL ); // void openHelpAgent(URL aURL); void openHelpAgent(com::sun::star::util::URL aURL); 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.78.4.1&r2=1.78.4.2 Delta lines: +22 -12 --------------------- --- genericcontroller.cxx 2007-07-11 12:04:37+0000 1.78.4.1 +++ genericcontroller.cxx 2007-07-12 13:46:15+0000 1.78.4.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.78.4.1 $ + * $Revision: 1.78.4.2 $ * - * last change: $Author: lla $ $Date: 2007/07/11 12:04:37 $ + * last change: $Author: lla $ $Date: 2007/07/12 13:46:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1244,18 +1244,28 @@ } //------------------------------------------------------------------------------ -void OGenericUnoController::openHelpAgent(sal_Char* _pHelpStringURL ) +// prototype out of UITools.cxx +namespace dbaui { - if (_pHelpStringURL != NULL) + 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) { - rtl::OUString sURL = ::rtl::OUString::createFromAscii( _pHelpStringURL ); + dbaui::AppendConfigToken_Impl(suURL, sal_False /* sal_False := add '&' */ ); + } URL aURL; - aURL.Complete = sURL; + aURL.Complete = suURL; + if (m_xUrlTransformer.is()) m_xUrlTransformer->parseStrict(aURL); openHelpAgent(aURL); - } } void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId) Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.72&r2=1.72.4.1 Delta lines: +5 -5 ------------------- --- UITools.cxx 2007-07-06 08:34:20+0000 1.72 +++ UITools.cxx 2007-07-12 13:46:15+0000 1.72.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: UITools.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.72.4.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:34:20 $ + * last change: $Author: lla $ $Date: 2007/07/12 13:46:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1436,8 +1436,6 @@ return sName; } // ----------------------------------------------------------------------------- -namespace -{ void AppendConfigToken_Impl( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) { // this completes a help url with the system parameters "Language" and "System" @@ -1464,6 +1462,8 @@ _rURL += SvtHelpOptions().GetSystem(); } +namespace +{ // ----------------------------------------------------------------------- sal_Bool GetHelpAnchor_Impl( const ::rtl::OUString& _rURL, ::rtl::OUString& _rAnchor ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
