Kaydet (Commit) 5c304bb5 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Make configmgr buildable with debug=true.

üst d4ee7505
...@@ -229,7 +229,9 @@ void RootAccess::clearListeners() throw() { ...@@ -229,7 +229,9 @@ void RootAccess::clearListeners() throw() {
css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType) css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_ANY)); OSL_ASSERT(thisIs(IS_ANY));
#endif
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
css::uno::Any res(Access::queryInterface(aType)); css::uno::Any res(Access::queryInterface(aType));
...@@ -252,7 +254,9 @@ void RootAccess::addChangesListener( ...@@ -252,7 +254,9 @@ void RootAccess::addChangesListener(
css::uno::Reference< css::util::XChangesListener > const & aListener) css::uno::Reference< css::util::XChangesListener > const & aListener)
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_ANY)); OSL_ASSERT(thisIs(IS_ANY));
#endif
{ {
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
...@@ -276,7 +280,9 @@ void RootAccess::removeChangesListener( ...@@ -276,7 +280,9 @@ void RootAccess::removeChangesListener(
css::uno::Reference< css::util::XChangesListener > const & aListener) css::uno::Reference< css::util::XChangesListener > const & aListener)
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_ANY)); OSL_ASSERT(thisIs(IS_ANY));
#endif
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
ChangesListeners::iterator i(changesListeners_.find(aListener)); ChangesListeners::iterator i(changesListeners_.find(aListener));
...@@ -290,7 +296,9 @@ extern int tempHACK; ...@@ -290,7 +296,9 @@ extern int tempHACK;
void RootAccess::commitChanges() void RootAccess::commitChanges()
throw (css::lang::WrappedTargetException, css::uno::RuntimeException) throw (css::lang::WrappedTargetException, css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_UPDATE)); OSL_ASSERT(thisIs(IS_UPDATE));
#endif
Broadcaster bc; Broadcaster bc;
{ {
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
...@@ -317,7 +325,9 @@ void RootAccess::commitChanges() ...@@ -317,7 +325,9 @@ void RootAccess::commitChanges()
} }
sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) { sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_UPDATE)); OSL_ASSERT(thisIs(IS_UPDATE));
#endif
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
//TODO: Optimize: //TODO: Optimize:
...@@ -329,7 +339,9 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) { ...@@ -329,7 +339,9 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
css::util::ChangesSet RootAccess::getPendingChanges() css::util::ChangesSet RootAccess::getPendingChanges()
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_UPDATE)); OSL_ASSERT(thisIs(IS_UPDATE));
#endif
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
comphelper::SequenceAsVector< css::util::ElementChange > changes; comphelper::SequenceAsVector< css::util::ElementChange > changes;
...@@ -339,7 +351,9 @@ css::util::ChangesSet RootAccess::getPendingChanges() ...@@ -339,7 +351,9 @@ css::util::ChangesSet RootAccess::getPendingChanges()
rtl::OUString RootAccess::getImplementationName() throw (css::uno::RuntimeException) rtl::OUString RootAccess::getImplementationName() throw (css::uno::RuntimeException)
{ {
#if OSL_DEBUG_LEVEL > 0
OSL_ASSERT(thisIs(IS_ANY)); OSL_ASSERT(thisIs(IS_ANY));
#endif
osl::MutexGuard g(*lock_); osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess(); checkLocalizedPropertyAccess();
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.RootAccess" ) ); return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.RootAccess" ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment