INTEGRATION: CWS hrovista2 (1.4.6); FILE MERGED

2008/07/30 16:06:48 hro 1.4.6.1: #i89095# Use system path conversion for file URLs

2 files changed, 80 insertions, 13 deletions

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 26c7ee5d47..bbdfc62ecd 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VistaFilePickerEventHandler.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,6 +49,8 @@
 //#include <tools/urlobj.hxx>
 //#include <unotools/ucbhelper.hxx>
 
+#include <osl/file.hxx>
+
 //------------------------------------------------------------------------
 // namespace directives
 //------------------------------------------------------------------------
@@ -141,14 +143,26 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* pDialog)
 ::rtl::OUString lcl_getURLFromShellItem2 (IShellItem* pItem)
 {
     LPOLESTR pStr = NULL;
+    ::rtl::OUString sURL;
 
-    SIGDN   eConversion = SIGDN_URL;
+    SIGDN   eConversion = SIGDN_FILESYSPATH;
     HRESULT hr          = pItem->GetDisplayName ( eConversion, &pStr );
 
     if ( FAILED(hr) )
-        return ::rtl::OUString();
+    {
+        eConversion = SIGDN_URL;
+        hr          = pItem->GetDisplayName ( eConversion, &pStr );
+
+        if ( FAILED(hr) )
+            return ::rtl::OUString();
+
+        sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
+    }
+    else
+    {
+        ::osl::FileBase::getFileURLFromSystemPath( reinterpret_cast<sal_Unicode*>(pStr), sURL );
+    }
 
-    ::rtl::OUString sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
     CoTaskMemFree (pStr);
     return sURL;
 }
@@ -255,6 +269,30 @@ STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*
 //-----------------------------------------------------------------------------------------
 STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)
 {
+    /*
+    IFileDialogCustomize               *iCustomize;
+    pDialog->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustomize));
+
+    BOOL bValue = FALSE;
+    HRESULT hResult = iCustomize->GetCheckButtonState( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, &bValue);
+
+    if ( bValue )
+    {
+        UINT nIndex;
+
+        pDialog->GetFileTypeIndex( &nIndex );
+
+        LPCWSTR lpFilterExt = lFilters[nIndex].pszSpec;
+
+        lpFilterExt = wcschr( lpFilterExt, '.' );
+        if ( lpFilterExt )
+            lpFilterExt++;
+        pDialog->SetDefaultExtension( lpFilterExt );
+    }
+    return S_OK;
+
+    */
+
     return E_NOTIMPL;
 }
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index d6ee27eda1..d32adadfa2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VistaFilePickerImpl.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,14 +65,26 @@ typedef ::comphelper::SequenceAsVector< ::rtl::OUString > TStringList;
 ::rtl::OUString lcl_getURLFromShellItem (IShellItem* pItem)
 {
     LPOLESTR pStr = NULL;
+    ::rtl::OUString sURL;
 
-    SIGDN   eConversion = SIGDN_URL;
+    SIGDN   eConversion = SIGDN_FILESYSPATH;
     HRESULT hr          = pItem->GetDisplayName ( eConversion, &pStr );
 
     if ( FAILED(hr) )
-        return ::rtl::OUString();
+    {
+        eConversion = SIGDN_URL;
+        hr          = pItem->GetDisplayName ( eConversion, &pStr );
+
+        if ( FAILED(hr) )
+            return ::rtl::OUString();
+
+        sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
+    }
+    else
+    {
+        ::osl::FileBase::getFileURLFromSystemPath( reinterpret_cast<sal_Unicode*>(pStr), sURL );
+    }
 
-    ::rtl::OUString sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
     CoTaskMemFree (pStr);
     return sURL;
 }
@@ -435,8 +447,8 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures)
     if ((nFeatures & FEATURE_AUTOEXTENSION) == FEATURE_AUTOEXTENSION)
         iCustom->AddCheckButton (css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, L"Auto Extension", true);
     
-    if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD)
-        iCustom->AddCheckButton (css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, L"Password", true);
+    // if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD)
+    //    iCustom->AddCheckButton (css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, L"Password", true);
     
     if ((nFeatures & FEATURE_READONLY) == FEATURE_READONLY)
         iCustom->AddCheckButton (css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_READONLY, L"Readonly", false);
@@ -530,12 +542,30 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
     ::rtl::OUString                    sCurrentFilter = m_lFilters.getCurrentFilter();
     sal_Int32                          nCurrentFilter = m_lFilters.getFilterPos(sCurrentFilter);
     TFileDialog                        iDialog        = impl_getBaseDialogInterface();
+    TFileDialogCustomize               iCustomize;
 
     aLock.clear();
     // <- SYNCHRONIZED
 
-    iDialog->SetFileTypes(lFilters.size(), &lFilters[0]);
-    iDialog->SetFileTypeIndex(nCurrentFilter);
+    iDialog.query(&iCustomize);
+
+    COMDLG_FILTERSPEC	*pFilt = &lFilters[0];
+    iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/);
+    iDialog->SetFileTypeIndex(nCurrentFilter + 1);
+
+    BOOL bValue = FALSE;
+    HRESULT hResult = iCustomize->GetCheckButtonState( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, &bValue);
+
+    if ( bValue )
+    {
+        LPCWSTR lpFilterExt = lFilters[0].pszSpec;
+
+        lpFilterExt = wcschr( lpFilterExt, '.' );
+        if ( lpFilterExt )
+            lpFilterExt++;
+        iDialog->SetDefaultExtension( lpFilterExt );
+    }
+    
 }
 
 //-------------------------------------------------------------------------------
@@ -672,7 +702,6 @@ TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface()
 #else
         m_iDialogOpen.query(&iDialog);
 #endif
-    else
     if (m_iDialogSave.is())
 #ifdef __MINGW32__
         m_iDialogSave->QueryInterface(IID_IFileDialog, (void**)(&iDialog));