CWS-TOOLING: integrate CWS slidecopy

2 files changed, 7 insertions, 7 deletions

diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 94ada78461ec..bf4fbc6e6ebe 100644..100755
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <comphelper/processfactory.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -113,11 +114,9 @@ void ConfigurationAccess::Initialize (
             sAccessService,
             aCreationArguments);
     }
-    catch (Exception& rException)
+    catch (Exception&)
     {
-        OSL_TRACE ("caught exception while opening configuration: %s",
-            ::rtl::OUStringToOString(rException.Message,
-                RTL_TEXTENCODING_UTF8).getStr());
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index b791454bd10a..c416e689efcf 100644..100755
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -42,6 +42,7 @@
 #include <editeng/editstat.hxx>
 #include <tools/link.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 
 namespace sd {
@@ -131,7 +132,7 @@ Image PreviewRenderer::RenderPage (
         }
         catch (const com::sun::star::uno::Exception&)
         {
-            OSL_TRACE("PreviewRenderer::RenderPage: caught exception");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -193,7 +194,7 @@ Image PreviewRenderer::RenderSubstitution (
     }
     catch (const com::sun::star::uno::Exception&)
     {
-        OSL_TRACE("PreviewRenderer::RenderPage: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return aPreview;
@@ -302,7 +303,7 @@ void PreviewRenderer::PaintPage (const SdPage* pPage)
     }
     catch (const ::com::sun::star::uno::Exception&)
     {
-        OSL_TRACE("PreviewRenderer::PaintPage: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     // Restore the previous online spelling and redlining states.