diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-04-06 00:45:08 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-04-07 08:42:41 +0000 |
commit | bc4176fa43dc8047774a11dfb5b913e6adce2252 (patch) | |
tree | 90bd78a4ba1507ab2f7b3db32a92be0d598d5204 /dbaccess | |
parent | 49b237c46efa1ba3513dfbe6c782c713296352d8 (diff) |
tdf#95386 More Help Agent cleanup
These methods were creating and passing URLs for the
long dead Help Agent
Change-Id: I5e3eafc2ca3bf5c1ca0032b9cb19ed30c8f06e66
Reviewed-on: https://gerrit.libreoffice.org/36172
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/inc/dbaccess_helpid.hrc | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 154 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/UITools.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 54 |
5 files changed, 0 insertions, 218 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 899e2d9497fd..db5b68a5776f 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -80,7 +80,6 @@ #define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO" #define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL" #define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME" -#define HID_DSBROWSER_DISCONNECTING "DBACCESS_HID_DSBROWSER_DISCONNECTING" #define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME" #define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME" diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index a942fba97ffc..a5ec0802a2c1 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1100,160 +1100,6 @@ void OGenericUnoController::executeChecked(const util::URL& _rCommand, const Seq } } -namespace -{ - OUString lcl_getModuleHelpModuleName( const Reference< XFrame >& _rxFrame ) - { - const sal_Char* pReturn = nullptr; - - try - { - // get the model of the document in the given frame - Reference< XController > xController; - if ( _rxFrame.is() ) - xController = _rxFrame->getController(); - Reference< XModel > xModel; - if ( xController.is() ) - xModel = xController->getModel(); - Reference< XServiceInfo > xSI( xModel, UNO_QUERY ); - - if ( !xSI.is() ) - { // try to go up the frame hierarchy - - Reference< XFrame > xParentFrame; - if ( _rxFrame.is() ) - xParentFrame.set(_rxFrame->getCreator(), css::uno::UNO_QUERY); - // did we find a parent frame? Which is no top-level frame? - if ( xParentFrame.is() && !_rxFrame->isTop() ) - // TODO: to prevent framework assertions, re-insert this "isTop" once 98303 is fixed - return lcl_getModuleHelpModuleName( xParentFrame ); - } - else - { -#if OSL_DEBUG_LEVEL > 0 - Sequence< OUString > sServiceNames = xSI->getSupportedServiceNames(); - const OUString* pLoop = sServiceNames.getConstArray(); - for ( sal_Int32 i=0; i<sServiceNames.getLength(); ++i, ++pLoop ) - { - sal_Int32 nDummy = 0; - (void)nDummy; - } -#endif - - // check which service we know .... - static const sal_Char* pTransTable[] = { - "com.sun.star.sdb.OfficeDatabaseDocument","sdatabase", - "com.sun.star.report.ReportDefinition","sdatabase", - "com.sun.star.text.TextDocument", "swriter", - "com.sun.star.sheet.SpreadsheetDocument", "scalc", - "com.sun.star.presentation.PresentationDocument", "simpress", - "com.sun.star.drawing.DrawingDocument", "sdraw", - "com.sun.star.formula.FormulaProperties", "smath", - "com.sun.star.chart.ChartDocument", "schart" - }; - OSL_ENSURE( SAL_N_ELEMENTS( pTransTable ) % 2 == 0, - "lcl_getModuleHelpModuleName: odd size of translation table!" ); - - // loop through the table - sal_Int32 nTableEntries = SAL_N_ELEMENTS( pTransTable ) / 2; - const sal_Char** pDocumentService = pTransTable; - const sal_Char** pHelpModuleName = pTransTable + 1; - for ( sal_Int32 j=0; j<nTableEntries; ++j ) - { - if ( xSI->supportsService( OUString::createFromAscii( *pDocumentService ) ) ) - { // found a table entry which matches the model's services - pReturn = *pHelpModuleName; - break; - } - - ++pDocumentService; ++pDocumentService; - ++pHelpModuleName; ++pHelpModuleName; - } - } - - if ( !pReturn ) - { - // could not determine the document type we're living in - // ->fallback - SvtModuleOptions aModOpt; - if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) - pReturn = "swriter"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) - pReturn = "sdatabase"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) - pReturn = "scalc"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) - pReturn = "simpress"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) - pReturn = "sdraw"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) - pReturn = "smath"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CHART ) ) - pReturn = "schart"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::BASIC ) ) - pReturn = "sbasic"; - else - { - SAL_WARN("dbaccess.ui", "lcl_getModuleHelpModuleName: no installed module found" ); - } - } - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - - if ( !pReturn ) - pReturn = "swriter"; - - return OUString::createFromAscii( pReturn ); - } -} - -void OGenericUnoController::openHelpAgent(OUString const& _suHelpStringURL ) -{ - OUString suURL(_suHelpStringURL); - OUString sLanguage( "Language=" ); - if (suURL.indexOf(sLanguage) == -1) - { - AppendConfigToken(suURL, false /* sal_False := add '&' */ ); - } - URL aURL; - aURL.Complete = suURL; - - openHelpAgent( aURL ); -} - -void OGenericUnoController::openHelpAgent(const OString& _sHelpId) -{ - openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) ); -} - -void OGenericUnoController::openHelpAgent( const URL& _rURL ) -{ - try - { - URL aURL( _rURL ); - - if ( m_xUrlTransformer.is() ) - m_xUrlTransformer->parseStrict(aURL); - - Reference< XDispatchProvider > xDispProv( m_aCurrentFrame.getFrame(), UNO_QUERY ); - Reference< XDispatch > xHelpDispatch; - if ( xDispProv.is() ) - xHelpDispatch = xDispProv->queryDispatch(aURL, "_helpagent", FrameSearchFlag::PARENT | FrameSearchFlag::SELF); - OSL_ENSURE(xHelpDispatch.is(), "SbaTableQueryBrowser::openHelpAgent: could not get a dispatcher!"); - if (xHelpDispatch.is()) - { - xHelpDispatch->dispatch(aURL, Sequence< PropertyValue >()); - } - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } -} - Reference< awt::XWindow> OGenericUnoController::getTopMostContainerWindow() const { Reference< css::awt::XWindow> xWindow; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 2375a1a9123c..ec132f2eb4df 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1844,7 +1844,6 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue break; case ID_TREE_CLOSE_CONN: - openHelpAgent( OString( HID_DSBROWSER_DISCONNECTING )); closeConnection( m_pTreeView->getListBox().GetRootLevelParent( m_pTreeView->getListBox().GetCurEntry() ) ); break; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index e16e8de0c0c0..c7dfd15ca7f1 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -278,14 +278,6 @@ namespace dbaui ,bool& _rAutoIncrementValueEnabled ,OUString& _rsAutoIncrementValue); - /** creates the URL or the help agent - @param _sModuleName - @param _nHelpId - @return - The URL for the help agent to dispatch. - */ - css::util::URL createHelpAgentURL(const OUString& _sModuleName,const OString& _rHelpId); - /** set the evaluation flag at the number formatter @param _rxFormatter */ diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 51e8f1a756b6..cbdf38c950e0 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1100,60 +1100,6 @@ void AppendConfigToken( OUString& _rURL, bool _bQuestionMark ) _rURL += SvtHelpOptions().GetSystem(); } -namespace -{ - - bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) - { - bool bRet = false; - OUString sAnchor; - - try - { - ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::DecodeMechanism::NONE ), - Reference< css::ucb::XCommandEnvironment >(), - comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue("AnchorName") >>= sAnchor ) ) - { - - if ( !sAnchor.isEmpty() ) - { - _rAnchor = sAnchor; - bRet = true; - } - } - else - { - SAL_WARN( "dbaccess.ui", "Property 'AnchorName' is missing" ); - } - } - catch( Exception& ) - { - } - - return bRet; - } -} // anonymous - -css::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId) -{ - css::util::URL aURL; - aURL.Complete = "vnd.sun.star.help://" + - _sModuleName + "/" + OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); - - OUString sAnchor; - OUString sTempURL = aURL.Complete; - AppendConfigToken( sTempURL, true ); - bool bHasAnchor = GetHelpAnchor_Impl( sTempURL, sAnchor ); - AppendConfigToken(aURL.Complete,true); - if ( bHasAnchor ) - { - aURL.Complete += "#"; - aURL.Complete += sAnchor; - } - return aURL; -} - void setEvalDateFormatForFormatter(Reference< css::util::XNumberFormatter >& _rxFormatter) { OSL_ENSURE( _rxFormatter.is(),"setEvalDateFormatForFormatter: Formatter is NULL!"); |