diff options
Diffstat (limited to 'xmlhelp/source/treeview/tvread.cxx')
| -rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index a0e7cf32ef7d..478562fca7b7 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -39,7 +39,6 @@ #include <osl/file.hxx> #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyState.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -674,22 +673,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 */ /**********************************************************************/ @@ -698,8 +681,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; try { @@ -813,9 +796,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; @@ -843,23 +824,13 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr Reference< XMultiServiceFactory > sProvider; if( m_xSMgr.is() ) { - Any aAny; - aAny <<= rtl::OUString::createFromAscii( "plugin" ); - PropertyValue aProp( rtl::OUString::createFromAscii( "servertype" ), - -1, - aAny, - PropertyState_DIRECT_VALUE ); - - Sequence< Any > seq(1); - seq[0] <<= aProp; - try { rtl::OUString sProviderService = rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ); sProvider = Reference< XMultiServiceFactory >( - m_xSMgr->createInstanceWithArguments( sProviderService,seq ), + m_xSMgr->createInstance( sProviderService ), UNO_QUERY ); } catch( const com::sun::star::uno::Exception& ) |