diff options
author | sb <sb@openoffice.org> | 2009-05-18 15:01:59 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2009-05-18 15:01:59 +0200 |
commit | 9f69e2a3176d4df6313f1cf58554238c77ad91b0 (patch) | |
tree | 1e249d52b878e897d66b255051eab9fdde87aaa2 /xmlhelp | |
parent | #i101955# improved error reporting (improving previous -c acee60ce43e6) (diff) | |
download | core-9f69e2a3176d4df6313f1cf58554238c77ad91b0.tar.gz core-9f69e2a3176d4df6313f1cf58554238c77ad91b0.zip |
#i101955# removed dead Webtop code (this can be further improved by completely dropping the vendor variables if they are truly unused; for now, they continue to expand to empty strings, and just the computation of those empty strings got simplified in the code)
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 7 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 20 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 15 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 24 |
5 files changed, 7 insertions, 65 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index c96378e15ed7..2bef90c0cda6 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -139,9 +139,6 @@ Databases::Databases( sal_Bool showBasic, const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths, const rtl::OUString& productName, const rtl::OUString& productVersion, - const rtl::OUString& vendorName, - const rtl::OUString& vendorVersion, - const rtl::OUString& vendorShort, const rtl::OUString& styleSheet, Reference< uno::XComponentContext > xContext ) : m_xContext( xContext ), @@ -173,9 +170,7 @@ Databases::Databases( sal_Bool showBasic, m_vReplacement[0] = productName; m_vReplacement[1] = productVersion; - m_vReplacement[2] = vendorName; - m_vReplacement[3] = vendorVersion; - m_vReplacement[4] = vendorShort; + // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings m_vReplacement[5] = productName; m_vReplacement[6] = productVersion; diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 7839b080c1c6..cdd7812afd17 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -192,9 +192,6 @@ namespace chelp { const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths, const rtl::OUString& productName, const rtl::OUString& productVersion, - const rtl::OUString& vendorName, - const rtl::OUString& vendorVersion, - const rtl::OUString& vendorShort, const rtl::OUString& styleSheet, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext ); @@ -300,9 +297,6 @@ namespace chelp { rtl::OUString getProductName() const { return m_vReplacement[0]; } rtl::OUString getProductVersion() const { return m_vReplacement[1]; } - rtl::OUString getVendorName() const { return m_vReplacement[2]; } - rtl::OUString getVendorVersion() const { return m_vReplacement[3]; } - rtl::OUString getVendorShort() const { return m_vReplacement[4]; } rtl::OUString expandURL( const rtl::OUString& aURL ); diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index d3c9613c74ee..d2f270452bcc 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -311,9 +311,6 @@ void ContentProvider::init() * now determing * productname, * productversion, - * vendorname, - * vendorversion, - * vendorshort */ xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" ); @@ -333,20 +330,6 @@ void ContentProvider::init() rtl::OUString::createFromAscii( " " ) + setupextension ); - xHierAccess = getHierAccess( sProvider, "org.openoffice.Webtop.Common" ); - rtl::OUString vendorname( - getKey( xHierAccess,"Product/ooName" ) ); - - setupversion = rtl::OUString( - getKey( xHierAccess,"Product/ooSetupVersion" ) ); - setupextension = rtl::OUString( - getKey( xHierAccess,"Product/ooSetupExtension") ); - rtl::OUString vendorversion( - setupversion + - rtl::OUString::createFromAscii( " " ) + - setupextension ); - rtl::OUString vendorshort = vendorname; - uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); @@ -374,9 +357,6 @@ void ContentProvider::init() aImagesZipPaths, productname, productversion, - vendorname, - vendorversion, - vendorshort, stylesheet, xContext ); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 6c17cd6dd847..227e33994a1e 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -976,20 +976,11 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, parString[last++] = "'css'"; parString[last++] = "vendorname"; - parString[last++] = rtl::OString('\'') + - rtl::OString( pDatabases->getVendorName().getStr(), - pDatabases->getVendorName().getLength(), - RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); + parString[last++] = rtl::OString("''"); parString[last++] = "vendorversion"; - parString[last++] = rtl::OString('\'') + - rtl::OString( pDatabases->getVendorVersion().getStr(), - pDatabases->getVendorVersion().getLength(), - RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); + parString[last++] = rtl::OString("''"); parString[last++] = "vendorshort"; - parString[last++] = rtl::OString('\'') + - rtl::OString( pDatabases->getVendorShort().getStr(), - pDatabases->getVendorShort().getLength(), - RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); + parString[last++] = rtl::OString("''"); } // Do we need to add extension path? diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 63f6d4649aa7..b46d09c1e337 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -681,22 +681,6 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) // replace anything like $(instpath); subst( xSMgr,instPath ); - - /**********************************************************************/ - /* reading Webtop.Common */ - /**********************************************************************/ - - xHierAccess = getHierAccess( sProvider, - "org.openoffice.Webtop.Common" ); - rtl::OUString vendorName( getKey( xHierAccess,"Product/ooName" ) ); - - rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); - rtl::OUString setupextension( getKey( xHierAccess,"Product/ooSetupExtension") ); - rtl::OUString vendorVersion( setupversion + - rtl::OUString::createFromAscii( " " ) + - setupextension ); - rtl::OUString vendorShort = vendorName; - /**********************************************************************/ /* reading setup */ /**********************************************************************/ @@ -705,8 +689,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) "org.openoffice.Setup" ); rtl::OUString productName( getKey( xHierAccess,"Product/ooName" ) ); - setupversion = getKey( xHierAccess,"Product/ooSetupVersion" ); - setupextension = rtl::OUString(); + rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); + rtl::OUString setupextension; utl::ConfigManager * mgr = utl::ConfigManager::GetConfigManager(); if (mgr != NULL) { mgr->GetDirectConfigProperty(utl::ConfigManager::PRODUCTEXTENSION) >>= @@ -799,9 +783,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) configData.m_vAdd[4] = 12; configData.m_vReplacement[0] = productName; configData.m_vReplacement[1] = productVersion; - configData.m_vReplacement[2] = vendorName; - configData.m_vReplacement[3] = vendorVersion; - configData.m_vReplacement[4] = vendorShort; + // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings configData.system = system; configData.locale = locale; |