summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx7
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.hxx6
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx35
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx15
-rw-r--r--xmlhelp/source/treeview/tvread.cxx37
5 files changed, 9 insertions, 91 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 3f0087b5eb..ef31192b45 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -154,9 +154,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 ),
@@ -188,9 +185,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 b213930719..18cb9df6fd 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 );
@@ -294,9 +291,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 7e6931e22d..c49f5daea0 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -48,7 +48,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -311,9 +310,6 @@ void ContentProvider::init()
* now determing
* productname,
* productversion,
- * vendorname,
- * vendorversion,
- * vendorshort
*/
xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
@@ -354,20 +350,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" );
@@ -395,9 +377,6 @@ void ContentProvider::init()
aImagesZipPaths,
productname,
productversion,
- vendorname,
- vendorversion,
- vendorshort,
stylesheet,
xContext );
}
@@ -408,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 =
@@ -426,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& )
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index e2b0c8a127..bdc1814b68 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -995,20 +995,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 f8a85c2ee9..4a95b30516 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -42,7 +42,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>
@@ -677,22 +676,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 */
/**********************************************************************/
@@ -701,8 +684,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
{
@@ -816,9 +799,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;
@@ -846,23 +827,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& )
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 17:02:33 +0000