From 59bf1b583f235dbf0ffee971840f2c6524effa06 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 13 Dec 2011 23:26:11 +0000 Subject: regpathhelper: unused, so we've got to have two of them --- comphelper/Library_comphelp.mk | 1 - comphelper/Package_inc.mk | 1 - comphelper/inc/comphelper/regpathhelper.hxx | 73 --------- comphelper/source/misc/regpathhelper.cxx | 235 ---------------------------- 4 files changed, 310 deletions(-) delete mode 100644 comphelper/inc/comphelper/regpathhelper.hxx delete mode 100644 comphelper/source/misc/regpathhelper.cxx (limited to 'comphelper') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index be3699413c02..7534de6b71e5 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -101,7 +101,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/officeresourcebundle \ comphelper/source/misc/officerestartmanager \ comphelper/source/misc/proxyaggregation \ - comphelper/source/misc/regpathhelper \ comphelper/source/misc/scopeguard \ comphelper/source/misc/SelectionMultiplex \ comphelper/source/misc/sequenceashashmap \ diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk index bb5490b4d795..ba1344a7d5b2 100644 --- a/comphelper/Package_inc.mk +++ b/comphelper/Package_inc.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertystatecon $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertysetinfo.hxx,comphelper/propertysetinfo.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accimplaccess.hxx,comphelper/accimplaccess.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/docpasswordrequest.hxx,comphelper/docpasswordrequest.hxx)) -$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/regpathhelper.hxx,comphelper/regpathhelper.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/extract.hxx,comphelper/extract.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/interaction.hxx,comphelper/interaction.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/uno3.hxx,comphelper/uno3.hxx)) diff --git a/comphelper/inc/comphelper/regpathhelper.hxx b/comphelper/inc/comphelper/regpathhelper.hxx deleted file mode 100644 index 27bbcb84287a..000000000000 --- a/comphelper/inc/comphelper/regpathhelper.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _COMPHELPER_REGPATHHELPER_HXX_ -#define _COMPHELPER_REGPATHHELPER_HXX_ - -#include - -namespace comphelper -{ - -/** - * This function returns a path to the user registry file. - * Search for the user registry using the following rules: - *
- *
1. (for further use) search in sversion.ini (.sversionrc) for an entry - * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section - * [Registry]. If found, then take this value instead of the name "user.rdb". - *
2. Search in the config directory of the user for a file "user.rdb". If - * found return the full path and name of the file. If not found, retry this - * step with a dot before ".user.rdb". - *
3. If not found a new user registry with name "user.rdb" will be created in the user - * config directory. - *
- *
- * @author Juergen Schmidt - */ -::rtl::OUString getPathToUserRegistry(); - -/** - * This function returns a path to the system registry file. - * The system registry will always be searched in the same directory of the - * executable. The name of the system registry is "applicat.rdb". If the system - * registry was not found, then the environment variable STAR_REGISTRY will be checked. - * If this variable was set, it must contain a full path to a valid system registry. - * Search for the user registry using the following rules: - * - *
- * @author Juergen Schmidt - */ - -::rtl::OUString getPathToSystemRegistry(); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx deleted file mode 100644 index 647019e162a8..000000000000 --- a/comphelper/source/misc/regpathhelper.cxx +++ /dev/null @@ -1,235 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace osl; - -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; - -#define PATH_DELEMITTER '/' - -#define USER_REGISTRY_NAME_ENV "STAR_USER_REGISTRY" -#define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY" -#define REGISTRY_SYSTEM_NAME "services.rdb" - -#define REGISTRY_LOCAL_NAME "user60.rdb" - -#ifdef SAL_UNX -#define CONFIG_PATH_PREFIX "." -#else -#define CONFIG_PATH_PREFIX "" -#endif - -namespace comphelper -{ - -/** - @return sal_True, if the office is started in a portal - environment. - sal_False, if the common office is started - */ -static sal_Bool retrievePortalUserDir( OUString *pDirectory ) -{ - sal_uInt32 nArgs = osl_getCommandArgCount(); - sal_Bool bIsPortalUser = sal_False; - OUString sArg; - while( nArgs > 0 ) - { - if ( !osl_getCommandArg(--nArgs, &sArg.pData) ) - { - if ( sArg.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "-userid" ))) == 0 ) - { - - bIsPortalUser = sal_True; - sal_Int32 nStart = sArg.lastIndexOf( '[' ); - sal_Int32 nEnd = sArg.lastIndexOf( ']' ); - if( -1 == nStart || -1 == nEnd || nEnd < nStart) - { - *pDirectory = OUString(); - } - else - { - OUString aEncHome = sArg.copy( nStart + 1 , nEnd - nStart -1 ); - *pDirectory = rtl::Uri::decode(aEncHome, - rtl_UriDecodeWithCharset, - RTL_TEXTENCODING_UTF8); - } - break; - } - } - } - return bIsPortalUser; -} - - -static OUString getDefaultLocalRegistry() -{ - OUString uBuffer, userRegistryName; - OUString portalUserDir; - - sal_Bool bIsPortalUser = retrievePortalUserDir( &portalUserDir ); - - if ( bIsPortalUser ) - { - if( !portalUserDir.isEmpty() ) - { - FileBase::getFileURLFromSystemPath( portalUserDir , portalUserDir ); - userRegistryName = portalUserDir; - userRegistryName += OUString( RTL_CONSTASCII_USTRINGPARAM( - "/user/" REGISTRY_LOCAL_NAME ) ); - - // Directory creation is probably necessary for bootstrapping a new - // user in the portal environment (the ucb uses this function). - // This should be solved differently, as - // no one expects this function to create anything ... - OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/")); - OUString sPath(RTL_CONSTASCII_USTRINGPARAM("file://")); - FileBase::RC retRC = FileBase::E_None; - - sal_Int32 nIndex = 3; - sPath += userRegistryName.getToken(2, '/', nIndex); - while( nIndex != -1 ) - { - sPath += sSeparator; - sPath += userRegistryName.getToken(0, '/', nIndex); - if( nIndex == -1 ) - break; - Directory aDir( sPath ); - if( aDir.open() == FileBase::E_NOENT ) - { - retRC = Directory::create(sPath); - if ( retRC != FileBase::E_None && retRC != FileBase::E_EXIST) - { - return OUString(); - } - } - } - } - } - else /* bIsPortalUser */ - { - ::osl::Security aUserSecurity; - aUserSecurity.getConfigDir( userRegistryName ); - userRegistryName += OUString( RTL_CONSTASCII_USTRINGPARAM( - "/" CONFIG_PATH_PREFIX REGISTRY_LOCAL_NAME ) ); - } - - return userRegistryName; -} - - -OUString getPathToUserRegistry() -{ - OUString userRegistryName; - FILE *f=NULL; - - // search the environment STAR_USER_REGISTRY - OString sBuffer( getenv(USER_REGISTRY_NAME_ENV) ); - if ( !sBuffer.isEmpty() ) - { - f = fopen( sBuffer.getStr(), "r" ); - - if (f != NULL) - { - fclose(f); - userRegistryName = OStringToOUString( sBuffer, osl_getThreadTextEncoding() ); - } - } - - if ( userRegistryName.isEmpty() ) - { - userRegistryName = getDefaultLocalRegistry(); - } - - return userRegistryName; -} - -OUString getPathToSystemRegistry() -{ - OUString uBuffer; - OUString registryBaseName( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_SYSTEM_NAME) ); - OUString systemRegistryName; - FILE *f=NULL; - - // search in the directory of the executable - if(osl_Process_E_None == osl_getExecutableFile(&uBuffer.pData)) - { - sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); - if (lastIndex > 0) - { - uBuffer = uBuffer.copy(0, lastIndex + 1); - } - - uBuffer += registryBaseName; - - if (!FileBase::getSystemPathFromFileURL(uBuffer, systemRegistryName)) - { - OString tmpStr( OUStringToOString(systemRegistryName, osl_getThreadTextEncoding()) ); - f = fopen( tmpStr.getStr(), "r" ); - } - } - - if (f == NULL) - { - // search the environment STAR_REGISTRY - OString tmpStr( getenv(SYSTEM_REGISTRY_NAME_ENV) ); - if ( !tmpStr.isEmpty() ) - { - f = fopen(tmpStr.getStr(), "r"); - - if (f != NULL) - { - fclose(f); - systemRegistryName = OStringToOUString( tmpStr, osl_getThreadTextEncoding() ); - } else - { - systemRegistryName = OUString(); - } - } - } else - { - fclose(f); - } - - return systemRegistryName; -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit