CWS-TOOLING: integrate CWS slidecopy

4 files changed, 28 insertions, 28 deletions

diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index e708909ee928..ff167f07520a 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -123,8 +124,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners (
         }
         catch(RuntimeException&)
         {
-            DBG_ASSERT(false,
-                "ConfigurationController: caught exception while notifying listeners");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
@@ -212,8 +212,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void)
                 }
                 catch (RuntimeException&)
                 {
-                    DBG_ASSERT(false,
-                        "ConfigurationController: caught exception while notifying dispose");
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
             else
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index bb5aab8a05d3..93ff7ee54e00 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -32,6 +32,7 @@
 #include "ResourceFactoryManager.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <tools/diagnose_ex.h>
 #include <algorithm>
 #include <boost/bind.hpp>
 
@@ -168,7 +169,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
         }
         catch(Exception&)
         {
-            OSL_ENSURE(false, "caught exception while activating resource");
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         if (xResource.is())
@@ -197,7 +198,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
     }
     catch (RuntimeException&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -257,7 +258,7 @@ void ConfigurationControllerResourceManager::DeactivateResource (
     }
     catch (RuntimeException&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 #if defined VERBOSE && VERBOSE>=1
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 63e45f8bb110..498f0670542e 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -41,16 +41,16 @@ void ConfigurationTracer::TraceConfiguration (
     const char* pMessage)
 {
 #ifdef DEBUG
-    OSL_TRACE("%s at %p {\n", pMessage, rxConfiguration.get());
+    OSL_TRACE("%s at %p {", pMessage, rxConfiguration.get());
     if (rxConfiguration.is())
     {
         TraceBoundResources(rxConfiguration, NULL, 0);
     }
     else
     {
-        OSL_TRACE("    empty\n");
+        OSL_TRACE("    empty");
     }
-    OSL_TRACE("}\n");
+    OSL_TRACE("}");
 #else
     (void)rxConfiguration;
     (void)pMessage;
@@ -74,7 +74,7 @@ void ConfigurationTracer::TraceBoundResources (
         ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
         for (int i=0; i<nIndentation; ++i)
             sLine = sIndentation + sLine;
-        OSL_TRACE("%s\n", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
+        OSL_TRACE("%s", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
         TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
     }
 #else
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 77579e32f1a9..aa8aca5a5ffd 100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -35,6 +35,7 @@
 #include "framework/FrameworkHelper.hxx"
 
 #include <comphelper/scopeguard.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <boost/bind.hpp>
 
@@ -128,7 +129,7 @@ void ConfigurationUpdater::RequestUpdate (
     if (IsUpdatePossible())
     {
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("UpdateConfiguration start\n");
+        OSL_TRACE("UpdateConfiguration start");
 #endif
 
         // Call UpdateConfiguration while that is possible and while someone
@@ -146,7 +147,7 @@ void ConfigurationUpdater::RequestUpdate (
     {
         mbUpdatePending = true;
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("scheduling update for later\n");
+        OSL_TRACE("scheduling update for later");
 #endif
     }
 }
@@ -185,7 +186,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void)
 void ConfigurationUpdater::UpdateConfiguration (void)
 {
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("UpdateConfiguration update\n");
+        OSL_TRACE("UpdateConfiguration update");
 #endif
     SetUpdateBeingProcessed(true);
     comphelper::ScopeGuard aScopeGuard (
@@ -200,7 +201,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
         if (aClassifier.Partition())
         {
 #if defined VERBOSE && VERBOSE>=2
-            OSL_TRACE("ConfigurationUpdater::UpdateConfiguration(\n");
+            OSL_TRACE("ConfigurationUpdater::UpdateConfiguration(");
             ConfigurationTracer::TraceConfiguration(
                 mxRequestedConfiguration, "requested configuration");
             ConfigurationTracer::TraceConfiguration(
@@ -232,7 +233,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
         else
         {
 #if defined VERBOSE && VERBOSE>0
-            OSL_TRACE("nothing to do\n");
+            OSL_TRACE("nothing to do");
 #if defined VERBOSE && VERBOSE>=2
             ConfigurationTracer::TraceConfiguration(
                 mxRequestedConfiguration, "requested configuration");
@@ -244,8 +245,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
     }
     catch (RuntimeException e)
     {
-        OSL_TRACE("caught exception while updating the current configuration");
-        DBG_ASSERT(false, "caught exception while updating the current configuration");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 #if defined VERBOSE && VERBOSE>0
@@ -310,11 +310,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
     {
 #if defined VERBOSE && VERBOSE>=2
         rClassifier.TraceResourceIdVector(
-            "requested but not current resources:\n", rClassifier.GetC1minusC2());
+            "requested but not current resources:", rClassifier.GetC1minusC2());
         rClassifier.TraceResourceIdVector(
-            "current but not requested resources:\n", rClassifier.GetC2minusC1());
+            "current but not requested resources:", rClassifier.GetC2minusC1());
         rClassifier.TraceResourceIdVector(
-            "requested and current resources:\n", rClassifier.GetC1andC2());
+            "requested and current resources:", rClassifier.GetC1andC2());
 #endif
 
         // Updating of the sub controllers is done in two steps.  In the
@@ -325,11 +325,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
         mpResourceManager->ActivateResources(rClassifier.GetC1minusC2(), mxCurrentConfiguration);
 
 #if defined VERBOSE && VERBOSE>=2
-        OSL_TRACE("ConfigurationController::UpdateConfiguration)\n");
+        OSL_TRACE("ConfigurationController::UpdateConfiguration)");
         ConfigurationTracer::TraceConfiguration(
-            mxRequestedConfiguration, "requested configuration\n");
+            mxRequestedConfiguration, "requested configuration");
         ConfigurationTracer::TraceConfiguration(
-            mxCurrentConfiguration, "current configuration\n");
+            mxCurrentConfiguration, "current configuration");
 #endif
 
         // Deactivate pure anchors that have no child.
@@ -340,7 +340,7 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
     }
     catch(RuntimeException)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -401,7 +401,7 @@ void ConfigurationUpdater::CheckPureAnchors (
         if (bDeactiveCurrentResource)
         {
 #if defined VERBOSE && VERBOSE>=2
-            OSL_TRACE("deactiving pure anchor %s because it has no children\n",
+            OSL_TRACE("deactiving pure anchor %s because it has no children",
                 OUStringToOString(
                     FrameworkHelper::ResourceIdToString(xResourceId),
                     RTL_TEXTENCODING_UTF8).getStr());
@@ -458,14 +458,14 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
 
 IMPL_LINK(ConfigurationUpdater, TimeoutHandler, Timer*, EMPTYARG)
 {
-    OSL_TRACE("configuration update timer\n");
+    OSL_TRACE("configuration update timer");
     if ( ! mbUpdateBeingProcessed
         && mxCurrentConfiguration.is()
         && mxRequestedConfiguration.is())
     {
         if ( ! AreConfigurationsEquivalent(mxCurrentConfiguration, mxRequestedConfiguration))
         {
-            OSL_TRACE("configurations differ, requesting update\n");
+            OSL_TRACE("configurations differ, requesting update");
             RequestUpdate(mxRequestedConfiguration);
         }
     }