Skip to content

C
core
Kaydet (Commit) 59bf1b58 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

regpathhelper: unused, so we've got to have two of them

üst 9cdb0ca4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 397 deletions
basebmp/test/bmpdemo.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -32,7 +32,6 @@
#include <math.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
canvas/workben/canvasdemo.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -30,7 +30,6 @@
// This code strongly inspired by Miguel / Federico's Gnome Canvas demo code.
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
comphelper/Library_comphelp.mk
Dosyayı görüntüle @ 59bf1b58
......@@ -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 \
......
comphelper/Package_inc.mk
Dosyayı görüntüle @ 59bf1b58
......@@ -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))
......
comphelper/inc/comphelper/regpathhelper.hxx deleted 100644 → 0
Dosyayı görüntüle @ 9cdb0ca4
/* -*- 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _COMPHELPER_REGPATHHELPER_HXX_
#define _COMPHELPER_REGPATHHELPER_HXX_
#include <rtl/ustring.hxx>
namespace comphelper
{
/**
* This function returns a path to the user registry file.
* Search for the user registry using the following rules:
* <dl>
* <dt> 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".
* <dt> 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".
* <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user
* config directory.
* </dl>
*<BR>
* @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:
*
*<BR>
* @author Juergen Schmidt
*/
::rtl::OUString getPathToSystemRegistry();
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
comphelper/source/misc/regpathhelper.cxx deleted 100644 → 0
Dosyayı görüntüle @ 9cdb0ca4
/* -*- 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include <stdio.h>
#include <osl/file.hxx>
#include <osl/security.hxx>
#include <osl/thread.h>
#include <osl/process.h>
#include <rtl/textenc.h>
#include <rtl/uri.h>
#include <rtl/uri.hxx>
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: */
connectivity/workben/testmoz/main.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -51,7 +51,6 @@
#include "connectivity/sqlnode.hxx"
#include <ucbhelper/contentbroker.hxx>
#include <comphelper/regpathhelper.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/process.h>
......
connectivity/workben/testmoz/mozthread.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -51,7 +51,6 @@
#include "connectivity/sqlnode.hxx"
#include <ucbhelper/contentbroker.hxx>
#include <comphelper/regpathhelper.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/process.h>
......
desktop/source/app/appinit.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -54,7 +54,6 @@
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
#include <comphelper/regpathhelper.hxx>
#include <tools/debug.hxx>
#include <tools/tempfile.hxx>
#include <ucbhelper/configurationkeys.hxx>
......
svtools/source/config/test/test.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -52,7 +52,6 @@
// other includes
//_________________________________________________________________________________________________________________
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
......
svx/source/gengal/gengal.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -36,7 +36,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/uno/Reference.h>
......
svx/workben/edittest.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -54,7 +54,6 @@
#define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry"
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
unotools/Package_inc.mk
Dosyayı görüntüle @ 59bf1b58
......@@ -85,7 +85,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/querydeep.hxx,unotools/querydeep.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/regpathhelper.hxx,unotools/regpathhelper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/securityoptions.hxx,unotools/securityoptions.hxx))
......
unotools/inc/unotools/regpathhelper.hxx deleted 100644 → 0
Dosyayı görüntüle @ 9cdb0ca4
/* -*- 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _UNOTOOLS_REGPATHHELPER_HXX_
#define _UNOTOOLS_REGPATHHELPER_HXX_
#include <rtl/ustring.hxx>
namespace utl
{
/**
* This function returns a path to the user registry file.
* Search for the user registry using the following rules:
* <dl>
* <dt> 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".
* <dt> 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".
* <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user
* config directory.
* </dl>
*<BR>
* @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:
*
*<BR>
* @author Juergen Schmidt
*/
::rtl::OUString getPathToSystemRegistry();
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
unusedcode.easy
Dosyayı görüntüle @ 59bf1b58
......@@ -1747,8 +1747,6 @@ comphelper::SequenceAsHashMap::getAsConstAnyList(unsigned char) const
comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<rtl::OUString> const&)
comphelper::createEventAttacherManager(com::sun::star::uno::Reference<com::sun::star::beans::XIntrospection> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&)
comphelper::getPathToSystemRegistry()
comphelper::getPathToUserRegistry()
comphelper::string::isalnumAsciiString(rtl::OUString const&)
comphelper::string::islowerAsciiString(rtl::OUString const&)
comphelper::string::isupperAsciiString(rtl::OUString const&)
......
vcl/test/canvasbitmaptest.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -32,7 +32,6 @@
#include <rtl/bootstrap.hxx>
#include <rtl/ref.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
vcl/workben/outdevgrind.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -30,7 +30,6 @@
// bootstrap stuff
#include <rtl/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
xmlscript/test/imexp.cxx
Dosyayı görüntüle @ 59bf1b58
......@@ -41,7 +41,6 @@
#include <cppuhelper/implbase2.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/regpathhelper.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment