diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 17:51:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-30 07:11:02 +0000 |
| commit | f8f87780f5f7be5ff185b0b8b3206d760d9dfed6 (patch) | |
| tree | 9bb53425da9bf25c92fcb062b072ccc708b5190a /desktop/source | |
| parent | 2428e1164b5f38da9fc2f24c5bb478e548f54a6f (diff) | |
Remove undocumented perftune.ini FastPipeCommunication
...originally added to OOo in 2005 with 9277dc7501f70d80ea1302c128c2786c01b69706
and e3eecbfeb639529f3a15c0acfe4697a619d454fb "INTEGRATION: CWS cov2src: #126234#
Join MWS COV680 m4 into SRC680".
Change-Id: I149686eca8bda5ea7a363cd995447576e217ec13
Reviewed-on: https://gerrit.libreoffice.org/23600
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 30b86df09df5..efb23a53a0c7 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -37,7 +37,6 @@ #include <rtl/instance.hxx> #include <osl/conditn.hxx> #include <unotools/moduleoptions.hxx> -#include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> @@ -483,41 +482,7 @@ RequestHandler::Status RequestHandler::Enable(bool ipc) // First we try to create our pipe if this fails we try to connect. We have to do this // in a loop because the other office can crash or shutdown between createPipe // and connectPipe!! - - OUString aIniName; - - osl_getExecutableFile( &aIniName.pData ); - - sal_uInt32 lastIndex = aIniName.lastIndexOf('/'); - if ( lastIndex > 0 ) - { - aIniName = aIniName.copy( 0, lastIndex+1 ); - aIniName += "perftune"; -#if defined(_WIN32) - aIniName += ".ini"; -#else - aIniName += "rc"; -#endif - } - - ::rtl::Bootstrap aPerfTuneIniFile( aIniName ); - - OUString aDefault( "0" ); - OUString aPreloadData; - - aPerfTuneIniFile.getFrom( "FastPipeCommunication", aPreloadData, aDefault ); - - OUString aUserInstallPathHashCode; - - if ( aPreloadData == "1" ) - { - sal_Char szBuffer[32]; - sprintf( szBuffer, "%d", LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 ); - aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() ); - } - else - aUserInstallPathHashCode = CreateMD5FromString( aDummy ); - + auto aUserInstallPathHashCode = CreateMD5FromString( aDummy ); // Check result to create a hash code from the user install path if ( aUserInstallPathHashCode.isEmpty() ) |