summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-09 00:04:56 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-09 00:04:56 +0300
commit44d19e119e00e52edd47c01d8d1c3812e8eb4afd (patch)
treec2dfeb0c415fa9fbb5bf22c92a32b5eb83f94eb4 /framework
parent5bb0c9d790966fccd8d54336119714e678c87b0e (diff)
Bin the fairly pointless LOG_REGISTRATION_GETFACTORY
Change-Id: Ia73eed753d1c4adc847a190449a18498710c8b40
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/macros/debug.hxx6
-rw-r--r--framework/inc/macros/debug/registration.hxx63
-rw-r--r--framework/inc/macros/registration.hxx5
3 files changed, 0 insertions, 74 deletions
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index 2c2dd8555e7c..f4567187adcc 100644
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/debug.hxx
@@ -39,17 +39,11 @@
// => "product" (OSL_DEBUG_LEVEL == 0)
#else
- #undef ENABLE_REGISTRATIONDEBUG
#undef ENABLE_FILTERDBG
#endif
//*****************************************************************************************************************
-// special macros to debug service registration
-//*****************************************************************************************************************
-#include <macros/debug/registration.hxx>
-
-//*****************************************************************************************************************
// special macros to debug our filter cache!
//*****************************************************************************************************************
#include <macros/debug/filterdbg.hxx>
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
deleted file mode 100644
index 84b71c0260e1..000000000000
--- a/framework/inc/macros/debug/registration.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_
-#define __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_
-
-//*****************************************************************************************************************
-// special macros for assertion handling
-//*****************************************************************************************************************
-
-#ifdef ENABLE_REGISTRATIONDEBUG
-
- #include <rtl/strbuf.hxx>
-
- /*_____________________________________________________________________________________________________________
- LOGFILE_ASSERTIONS
-
- For follow macros we need a special log file. If user forget to specify anyone, we must do it for him!
- _____________________________________________________________________________________________________________*/
-
- #ifndef LOGFILE_REGISTRATION
- #define LOGFILE_REGISTRATION \
- "registration.log"
- #endif
-
- #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \
- { \
- OStringBuffer sOut( 1024 ); \
- sOut.append( "fw?_component_getFactory():" ); \
- sOut.append( SINFOTEXT ); \
- WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \
- }
-
-#else // #ifdef ENABLE_REGISTRATIONDEBUG
-
- /*_____________________________________________________________________________________________________________
- If right testmode is'nt set - implements these macro empty!
- _____________________________________________________________________________________________________________*/
-
- #undef LOGFILE_REGISTRATION
- #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT )
-
-#endif // #ifdef ENABLE_REGISTRATIONDEBUG
-
-#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index f5c102a50770..78b1f24c9364 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -46,7 +46,6 @@ ________________________________________________________________________________
/* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
- LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \
/* ... then create right factory for this service. */ \
/* xFactory and xServiceManager are local variables of method which use this macro. */ \
xFactory = CLASS::impl_createFactory( xServiceManager ); \
@@ -61,7 +60,6 @@ ________________________________________________________________________________
void* pServiceManager , \
void* /*pRegistryKey*/ ) \
{ \
- LOG_REGISTRATION_GETFACTORY( "\t[start]\n" ) \
/* Set default return value for this operation - if it failed. */ \
void* pReturn = NULL ; \
if ( \
@@ -69,7 +67,6 @@ ________________________________________________________________________________
( pServiceManager != NULL ) \
) \
{ \
- LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" ) \
/* Define variables which are used in following macros. */ \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory ; \
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \
@@ -84,12 +81,10 @@ ________________________________________________________________________________
/* Factory is valid, if service was found. */ \
if ( xFactory.is() == sal_True ) \
{ \
- LOG_REGISTRATION_GETFACTORY( "\t\t\txFactory valid - service was found ...\n" ) \
xFactory->acquire(); \
pReturn = xFactory.get(); \
} \
} \
- LOG_REGISTRATION_GETFACTORY( "\t[end]\n" ) \
/* Return with result of this operation. */ \
return pReturn ; \
}