From 908e4f71480a904ae6e1f337a85885acecb190a1 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@oracle.com>
Date: Sun, 13 Feb 2011 20:29:47 +0100
Subject: [PATCH 1/3] debuglevels: use vsnprintf instead of _vsnprintf,
 otherwise it won't build on unxlngi6.pro+debug

---
 slideshow/source/engine/debug.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx
index 4c8ba5415f04..f3fd185a58b0 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -307,7 +307,7 @@ DebugTraceScope::DebugTraceScope (const sal_Char* sFormat, ...)
     va_start(args, sFormat);
 
     msMessage[mnBufferSize-1] = 0;
-    _vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
+    vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
     TRACE_BEGIN("[ %s", msMessage);
     va_end(args);
 }

From 212572f2d3369cc992098248606d46ca9b7c8e9c Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@oracle.com>
Date: Fri, 3 Dec 2010 14:27:32 +0100
Subject: [PATCH 2/3] dba34c: #i115901#: dispose the local pane's window (after
 clearing the cache, which will dispose the windows currently anchored to the
 pane) (transplanted from 6010283465918075d489ba4b589fdc9b11343759)

---
 .../ui/framework/factories/BasicViewFactory.cxx   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 2dd7689f2b39..b7e5d72b9e6c 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,6 +50,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <boost/bind.hpp>
 
@@ -152,6 +153,20 @@ BasicViewFactory::BasicViewFactory (
 
 BasicViewFactory::~BasicViewFactory (void)
 {
+    mpViewCache.reset();
+
+    Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
+    try
+    {
+        const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
+        xLocalPaneComponent->dispose();
+        const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
+        xWindowComponent->dispose();
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 

From 293ae23e7e69ed8fdff9a793cfbc111317b433a1 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@oracle.com>
Date: Mon, 14 Mar 2011 15:46:16 +0100
Subject: [PATCH 3/3] debuglevels: removed conflicting fix for a leaking
 WorkWindow - both changes together cause a crash

---
 .../ui/framework/factories/BasicViewFactory.cxx   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 8c2130c3005f..95c2833a2d12 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,7 +50,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
 
 #include <boost/bind.hpp>
 
@@ -154,20 +153,6 @@ BasicViewFactory::BasicViewFactory (
 
 BasicViewFactory::~BasicViewFactory (void)
 {
-    mpViewCache.reset();
-
-    Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
-    try
-    {
-        const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
-        xLocalPaneComponent->dispose();
-        const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
-        xWindowComponent->dispose();
-    }
-    catch( const Exception& )
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }
 }