[Libreoffice-commits] .: 2 commits - desktop/source smoketest/lodownloadtest.py unusedcode.easy
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Feb 18 02:36:04 PST 2012
desktop/source/deployment/dp_services.cxx | 3 -
desktop/source/deployment/manager/dp_extensionmanager.cxx | 22 ----------
desktop/source/deployment/manager/dp_informationprovider.cxx | 24 -----------
desktop/source/deployment/manager/dp_managerfac.cxx | 22 ----------
smoketest/lodownloadtest.py | 1
unusedcode.easy | 2
6 files changed, 74 deletions(-)
New commits:
commit 8ecea48c050b77c86159ebdcb41096160ec6a090
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 18 11:32:23 2012 +0100
unusedcode.easy: desktop: singleton_entries is completely unused
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 53cdd63..c0a44d8 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -66,10 +66,8 @@ extern sdecl::ServiceDecl const serviceDecl;
namespace dp_manager {
namespace factory {
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Reference<registry::XRegistryKey> const& );
}
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Reference<registry::XRegistryKey> const& );
}
namespace dp_log {
@@ -78,7 +76,6 @@ extern sdecl::ServiceDecl const serviceDecl;
namespace dp_info {
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Reference<registry::XRegistryKey> const& );
}
extern "C" {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 4f0331a..d7654b6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1506,28 +1506,6 @@ extern sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.ExtensionManager",
"com.sun.star.comp.deployment.ExtensionManager");
-//------------------------------------------------------------------------------
-bool singleton_entries(
- uno::Reference< registry::XRegistryKey > const & xRegistryKey )
-{
- try {
- uno::Reference< registry::XRegistryKey > xKey(
- xRegistryKey->createKey(
- serviceDecl.getImplementationName() +
- // xxx todo: use future generated function to get singleton name
- OUSTR("/UNO/SINGLETONS/"
- "com.sun.star.deployment.ExtensionManager") ) );
- xKey->setStringValue( serviceDecl.getSupportedServiceNames()[0] );
- return true;
- }
- catch (const registry::InvalidRegistryException & exc) {
- (void) exc; // avoid warnings
- OSL_FAIL( ::rtl::OUStringToOString(
- exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- return false;
- }
-}
-
// XModifyBroadcaster
//______________________________________________________________________________
void ExtensionManager::addModifyListener(
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index dc879d1..14f5bfa 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -26,9 +26,7 @@
*
************************************************************************/
-
#include <cppuhelper/implbase3.hxx>
-
#include "comphelper/servicedecl.hxx"
#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
@@ -338,28 +336,6 @@ extern sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.PackageInformationProvider",
"com.sun.star.comp.deployment.PackageInformationProvider" );
-//------------------------------------------------------------------------------
-bool singleton_entries(
- uno::Reference< registry::XRegistryKey > const & xRegistryKey )
-{
- try {
- uno::Reference< registry::XRegistryKey > xKey(
- xRegistryKey->createKey(
- serviceDecl.getImplementationName() +
- // xxx todo: use future generated function to get singleton name
- UNISTRING("/UNO/SINGLETONS/"
- "com.sun.star.deployment.PackageInformationProvider") ) );
- xKey->setStringValue( serviceDecl.getSupportedServiceNames()[0] );
- return true;
- }
- catch (registry::InvalidRegistryException & exc) {
- (void) exc; // avoid warnings
- OSL_FAIL( ::rtl::OUStringToOString(
- exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- return false;
- }
-}
-
} // namespace dp_info
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 701d1a6..9061f04 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -82,28 +82,6 @@ extern sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.PackageManagerFactory",
"com.sun.star.comp.deployment.PackageManagerFactory" );
-//==============================================================================
-bool singleton_entries(
- Reference<registry::XRegistryKey> const & xRegistryKey )
-{
- try {
- Reference<registry::XRegistryKey> xKey(
- xRegistryKey->createKey(
- serviceDecl.getImplementationName() +
- // xxx todo: use future generated function to get singleton name
- OUSTR("/UNO/SINGLETONS/"
- "com.sun.star.deployment.thePackageManagerFactory") ) );
- xKey->setStringValue( serviceDecl.getSupportedServiceNames()[0] );
- return true;
- }
- catch (const registry::InvalidRegistryException & exc) {
- (void) exc; // avoid warnings
- OSL_FAIL( ::rtl::OUStringToOString(
- exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- return false;
- }
-}
-
//______________________________________________________________________________
PackageManagerFactoryImpl::PackageManagerFactoryImpl(
Reference<XComponentContext> const & xComponentContext )
diff --git a/unusedcode.easy b/unusedcode.easy
index 0d0bb79..4f8892c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1123,8 +1123,6 @@ dbtools::StatementComposer::getDisposeComposer() const
dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
-dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
-dp_manager::factory::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
commit 530cfd92da49b81d4131e548fe8d72c589c5a36b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 18 11:30:10 2012 +0100
smoketest: remove doubled copyright line
diff --git a/smoketest/lodownloadtest.py b/smoketest/lodownloadtest.py
index 2aee615..91d32fc 100755
--- a/smoketest/lodownloadtest.py
+++ b/smoketest/lodownloadtest.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
More information about the Libreoffice-commits
mailing list