From 6d44382618d716c73324dfd6256a66f9a827200c Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 15 May 2009 17:43:29 +0200 Subject: #i101955# removed obsolete code --- xmlhelp/source/cxxhelp/provider/provider.cxx | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'xmlhelp/source/cxxhelp/provider') diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index da5c4db374c1..d3c9613c74ee 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -48,7 +48,6 @@ #include #endif #include -#include #include #include #include @@ -388,17 +387,6 @@ ContentProvider::getConfiguration() const uno::Reference< lang::XMultiServiceFactory > sProvider; if( m_xSMgr.is() ) { - uno::Any aAny; - aAny <<= rtl::OUString::createFromAscii( "plugin" ); - beans::PropertyValue aProp( - rtl::OUString::createFromAscii( "servertype" ), - -1, - aAny, - beans::PropertyState_DIRECT_VALUE ); - - uno::Sequence< uno::Any > seq(1); - seq[0] <<= aProp; - try { rtl::OUString sProviderService = @@ -406,8 +394,7 @@ ContentProvider::getConfiguration() const "com.sun.star.configuration.ConfigurationProvider" ); sProvider = uno::Reference< lang::XMultiServiceFactory >( - m_xSMgr->createInstanceWithArguments( - sProviderService,seq ), + m_xSMgr->createInstance( sProviderService ), uno::UNO_QUERY ); } catch( const uno::Exception& ) -- cgit From 9f69e2a3176d4df6313f1cf58554238c77ad91b0 Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 18 May 2009 15:01:59 +0200 Subject: #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) --- xmlhelp/source/cxxhelp/provider/databases.cxx | 7 +------ xmlhelp/source/cxxhelp/provider/databases.hxx | 6 ------ xmlhelp/source/cxxhelp/provider/provider.cxx | 20 -------------------- xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 15 +++------------ 4 files changed, 4 insertions(+), 44 deletions(-) (limited to 'xmlhelp/source/cxxhelp/provider') 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? -- cgit