CWS-TOOLING: integrate CWS hro38_DEV300

3 files changed, 30 insertions, 1 deletions

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index a05ceef25747..80446a745a0a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -278,9 +278,14 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const ::rtl::OUString&
 }
 
 //-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& /*sName*/)
+void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& sName )
     throw(css::uno::RuntimeException)
 {
+    RequestRef rRequest(new Request());
+    rRequest->setRequest (VistaFilePickerImpl::E_SET_FILENAME);
+    rRequest->setArgument(PROP_FILENAME, sName);
+
+    m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
 //-----------------------------------------------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index c7a468ad5943..09e62f2992cc 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -192,6 +192,10 @@ void VistaFilePickerImpl::doRequest(const RequestRef& rRequest)
                     impl_sta_SetTitle(rRequest);
                     break;
 
+            case E_SET_FILENAME:
+                impl_sta_SetFileName(rRequest);
+                break;
+
             case E_SET_DIRECTORY :
                     impl_sta_SetDirectory(rRequest);
                     break;
@@ -510,6 +514,20 @@ void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
 }
 
 //-------------------------------------------------------------------------------
+void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
+{
+    ::rtl::OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+
+    // SYNCHRONIZED->
+    ::osl::ResettableMutexGuard aLock(m_aMutex);
+    TFileDialog iDialog = impl_getBaseDialogInterface();
+    aLock.clear();
+    // <- SYNCHRONIZED
+
+    iDialog->SetFileName(reinterpret_cast<LPCTSTR>(sFileName.getStr()));
+}
+
+//-------------------------------------------------------------------------------
 void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
 {
     ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 55dfcf597974..7550e977811e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -95,6 +95,7 @@ static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT  = ::rtl::OUString::createF
 static const ::rtl::OUString PROP_SELECTED_FILES      = ::rtl::OUString::createFromAscii("selected_files"     ); // [seq< OUString >] contains all user selected files (can be empty!)
 static const ::rtl::OUString PROP_MULTISELECTION_MODE = ::rtl::OUString::createFromAscii("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
 static const ::rtl::OUString PROP_TITLE               = ::rtl::OUString::createFromAscii("title"              ); // [OUString]
+static const ::rtl::OUString PROP_FILENAME            = ::rtl::OUString::createFromAscii("filename"              ); // [OUString]
 static const ::rtl::OUString PROP_DIRECTORY           = ::rtl::OUString::createFromAscii("directory"          ); // [OUString]
 static const ::rtl::OUString PROP_FEATURES            = ::rtl::OUString::createFromAscii("features"           ); // [sal_Int32]
 static const ::rtl::OUString PROP_FILTER_TITLE        = ::rtl::OUString::createFromAscii("filter_title"       ); // [OUString]
@@ -134,6 +135,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
             E_CREATE_SAVE_DIALOG,
             E_SET_MULTISELECTION_MODE,
             E_SET_TITLE,
+            E_SET_FILENAME,
             E_SET_DIRECTORY,
             E_GET_SELECTED_FILES,
             E_SHOW_DIALOG_MODAL,
@@ -202,6 +204,10 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
         void impl_sta_SetTitle(const RequestRef& rRequest);
 
         //---------------------------------------------------------------------
+        /// implementation of request E_SET_FILENAME
+        void impl_sta_SetFileName(const RequestRef& rRequest);
+
+        //---------------------------------------------------------------------
         /// implementation of request E_SET_DIRECTORY
         void impl_sta_SetDirectory(const RequestRef& rRequest);