[Libreoffice-commits] .: configmgr/source

Kohei Yoshida kohei at kemper.freedesktop.org
Tue Aug 30 20:29:02 PDT 2011


 configmgr/source/rootaccess.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 5c304bb5785aa1cb5806fdbd4a4f3e443c56365e
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Tue Aug 30 23:27:39 2011 -0400

    Make configmgr buildable with debug=true.

diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index f320b99..4ae38c4 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -229,7 +229,9 @@ void RootAccess::clearListeners() throw() {
 css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
     throw (css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_ANY));
+#endif
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     css::uno::Any res(Access::queryInterface(aType));
@@ -252,7 +254,9 @@ void RootAccess::addChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
     throw (css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_ANY));
+#endif
     {
         osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
@@ -276,7 +280,9 @@ void RootAccess::removeChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
     throw (css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_ANY));
+#endif
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     ChangesListeners::iterator i(changesListeners_.find(aListener));
@@ -290,7 +296,9 @@ extern int tempHACK;
 void RootAccess::commitChanges()
     throw (css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_UPDATE));
+#endif
     Broadcaster bc;
     {
         osl::MutexGuard g(*lock_);
@@ -317,7 +325,9 @@ void RootAccess::commitChanges()
 }
 
 sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_UPDATE));
+#endif
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     //TODO: Optimize:
@@ -329,7 +339,9 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
 css::util::ChangesSet RootAccess::getPendingChanges()
     throw (css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_UPDATE));
+#endif
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     comphelper::SequenceAsVector< css::util::ElementChange > changes;
@@ -339,7 +351,9 @@ css::util::ChangesSet RootAccess::getPendingChanges()
 
 rtl::OUString RootAccess::getImplementationName() throw (css::uno::RuntimeException)
 {
+#if OSL_DEBUG_LEVEL > 0
     OSL_ASSERT(thisIs(IS_ANY));
+#endif
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.RootAccess" ) );


More information about the Libreoffice-commits mailing list