2 files changed, 14 insertions, 0 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index b7f0ab91feee..d74bbd0961d9 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -460,6 +460,14 @@ void SfxApplication::SetLastDir_Impl
 
 //--------------------------------------------------------------------
 
+void SfxApplication::ResetLastDir()
+{
+    String aEmpty;
+    pAppData_Impl->aLastDir = aEmpty;
+}
+
+//--------------------------------------------------------------------
+
 SfxDispatcher* SfxApplication::GetDispatcher_Impl()
 {
     return pAppData_Impl->pViewFrame? pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index b4514976e48d..995b8250e072 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -494,6 +494,12 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
         }
     }
 
+#ifdef WNT
+    // #103346 Destroy dialog to prevent problems with custom controls
+    delete pThis->m_pFileDlg;
+    pThis->m_pFileDlg = NULL;
+#endif
+
     LeaveModalMode();
     return 0;
 }