framework/inc/macros/debug.hxx | 6 --
framework/inc/macros/debug/registration.hxx | 63 ----------------------
framework/inc/macros/registration.hxx | 5 -
framework/source/helper/ocomponentenumeration.cxx | 6 --
framework/source/services/frame.cxx | 24 +-------
5 files changed, 5 insertions(+), 99 deletions(-)
New commits:
commit 895885652eef980338ce7c9231be3f86f8c770d5
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 9 00:06:30 2013 +0300
Fix non-debug build
Change-Id: I5446c7fec62c1a934b1ffb21fefa1279b932ca09
diff --git a/framework/source/helper/ocomponentenumeration.cxx
b/framework/source/helper/ocomponentenumeration.cxx
index c1b3ea8..1c65873 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -64,11 +64,7 @@ OComponentEnumeration::~OComponentEnumeration()
//*****************************************************************************************************************
// XEventListener
//*****************************************************************************************************************
-void SAL_CALL OComponentEnumeration::disposing( const EventObject&
-#if OSL_DEBUG_LEVEL > 0
-aEvent
-#endif
-) throw( RuntimeException )
+void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent )
throw( RuntimeException )
{
// Ready for multithreading
ResetableGuard aGuard( m_aLock );
diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 9af43fc..15a809b 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2170,11 +2170,7 @@ css::uno::Sequence< css::frame::DispatchInformation >
SAL_CALL Frame::getConfigu
@onerror -
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::windowResized( const css::awt::WindowEvent&
-#if OSL_DEBUG_LEVEL > 0
-aEvent
-#endif
-) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent )
throw( css::uno::RuntimeException )
{
/* UNSAFE AREA
---------------------------------------------------------------------------------------------
*/
// Check incoming parameter.
@@ -2190,11 +2186,7 @@ aEvent
}
//*****************************************************************************************************************
-void SAL_CALL Frame::focusGained( const css::awt::FocusEvent&
-#if OSL_DEBUG_LEVEL > 0
-aEvent
-#endif
-) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw(
css::uno::RuntimeException )
{
/* UNSAFE AREA
---------------------------------------------------------------------------------------------
*/
// Check incoming parameter.
@@ -2230,11 +2222,7 @@ aEvent
@onerror -
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::windowActivated( const css::lang::EventObject&
-#if OSL_DEBUG_LEVEL > 0
-aEvent
-#endif
-) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent )
throw( css::uno::RuntimeException )
{
/* UNSAFE AREA
---------------------------------------------------------------------------------------------
*/
// Check incoming parameter.
@@ -2257,11 +2245,7 @@ aEvent
}
//*****************************************************************************************************************
-void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject&
-#if OSL_DEBUG_LEVEL > 0
-aEvent
-#endif
-) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent )
throw( css::uno::RuntimeException )
{
/* UNSAFE AREA
---------------------------------------------------------------------------------------------
*/
// Check incoming parameter.
commit 44d19e119e00e52edd47c01d8d1c3812e8eb4afd
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 9 00:04:56 2013 +0300
Bin the fairly pointless LOG_REGISTRATION_GETFACTORY
Change-Id: Ia73eed753d1c4adc847a190449a18498710c8b40
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index 2c2dd85..f456718 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 84b71c0..0000000
--- 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 f5c102a..78b1f24 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 ;
\
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
