From cdbd93e9a548d48109f2227bff1d94743e46949b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 13 Oct 2011 22:27:12 +0100 Subject: [PATCH] callcatcher: some unused code --- unotools/inc/unotools/bootstrap.hxx | 6 ------ unotools/source/config/bootstrap.cxx | 19 ------------------- unusedcode.easy | 2 -- 3 files changed, 27 deletions(-) diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 81135c43fab9..f596d63d0a02 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -64,9 +64,6 @@ namespace utl /// retrieve the BUILDID information item; uses the given default, if not found static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); - /// retrieve the ALLUSERS information item from setup.ini file; uses the given default, if not found - static rtl::OUString getAllUsersValue(rtl::OUString const& _sDefault); - /// reload cached data static void reloadData(); @@ -123,9 +120,6 @@ namespace utl INVALID_BOOTSTRAP_DATA /// some bootstrap data was invalid in unexpected ways }; - /// Evaluates the status of the installation and returns a diagnostic message corresponding to this status - static Status checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage); - /** Evaluates the status of the installation and returns a diagnostic message and error code corresponding to this status */ diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index aa0d1b4996a7..d5959cd53c28 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -682,17 +682,6 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault) // --------------------------------------------------------------------------------------- -OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) -{ - OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS)); - - rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) ); - OUString sResult; - aData.getFrom( csAllUsersItem, sResult, _sDefault ); - return sResult; -} -// --------------------------------------------------------------------------------------- - Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL) { Impl::PathData const& aPathData = data().aBaseInstall_; @@ -765,14 +754,6 @@ PathStatus Bootstrap::locateVersionFile(OUString& _rURL) } // --------------------------------------------------------------------------------------- -Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage) -{ - FailureCode eDummyCode(NO_FAILURE); - - return checkBootstrapStatus(_rDiagnosticMessage,eDummyCode); -} -// --------------------------------------------------------------------------------------- - Bootstrap::Status Bootstrap::checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage, FailureCode& _rErrCode) { Impl const& aData = data(); diff --git a/unusedcode.easy b/unusedcode.easy index c025a98cc784..624eeb7fdc5c 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2816,8 +2816,6 @@ unicode::isTitle(unsigned short) unicode::isUnicodeScriptType(unsigned short, short) unographic::GraphicDescriptor::isValid() const utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&) -utl::Bootstrap::checkBootstrapStatus(rtl::OUString&) -utl::Bootstrap::getAllUsersValue(rtl::OUString const&) utl::ConfigManager::ConfigManager(com::sun::star::uno::Reference) utl::MultiAtomProvider::getLastAtom(int) const utl::MultiAtomProvider::hasAtom(int, int) const