INTEGRATION: CWS as6 (1.12.34); FILE MERGED

2007/08/14 09:27:04 as 1.12.34.1: #i78850# make AutoExtension control obsolete; #i63263# improve multi selection mode

2 files changed, 38 insertions, 7 deletions

diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index e72c4285cefc..52a6cb864938 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: FilePicker.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: vg $ $Date: 2007-03-26 13:18:49 $
+ *  last change: $Author: ihi $ $Date: 2007-11-19 16:26:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,8 +41,8 @@
 //_______________________________________________________________________________________________________________________
 
 
-#ifndef _CPPUHELPER_COMPBASE9_HXX_
-#include <cppuhelper/compbase9.hxx>
+#ifndef _CPPUHELPER_COMPBASE10_HXX_
+#include <cppuhelper/compbase10.hxx>
 #endif
 
 #ifndef _OSL_MUTEX_HXX_
@@ -57,6 +57,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
 
+#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER2_HPP_
+#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#endif
+
 #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERNOTIFIER_HPP_
 #include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
 #endif
@@ -114,12 +118,13 @@ protected:
 
 class CFilePicker :
     public CFilePickerDummy,
-    public cppu::WeakComponentImplHelper9<
+    public cppu::WeakComponentImplHelper10<
         ::com::sun::star::ui::dialogs::XFilterManager,
         ::com::sun::star::ui::dialogs::XFilterGroupManager,
         ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
         ::com::sun::star::ui::dialogs::XFilePickerNotifier,
         ::com::sun::star::ui::dialogs::XFilePreview,
+        ::com::sun::star::ui::dialogs::XFilePicker2,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::util::XCancellable,
         ::com::sun::star::lang::XEventListener,
@@ -169,6 +174,12 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     //------------------------------------------------------------------------------------
+    // XFilePicker2 functions
+    //------------------------------------------------------------------------------------
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    //------------------------------------------------------------------------------------
     // XFilterManager functions
     //------------------------------------------------------------------------------------
 
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 6f1e9640ed1e..1c089452647e 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: filepickerstate.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: vg $ $Date: 2007-03-26 13:19:21 $
+ *  last change: $Author: ihi $ $Date: 2007-11-19 16:26:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -417,6 +417,10 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
     if ( com::sun::star::ui::dialogs::ControlActions::SET_HELP_URL == aControlAction )
         return;
 
+    // #i78850# ignore requests for "AutoExtension" control
+    if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId )
+        return;
+
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
 
     // the filter listbox can be manipulated via this
@@ -459,6 +463,10 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
     if ( com::sun::star::ui::dialogs::ControlActions::GET_HELP_URL == aControlAction )
         return Any( );
 
+    // #i78850# ignore requests for "AutoExtension" control
+    if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId )
+        return Any( );
+
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
 
     // the filter listbox can be manipulated via this
@@ -494,6 +502,10 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
 
 void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable )
 {
+    // #i78850# ignore requests for "AutoExtension" control
+    if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId )
+        return;
+
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
 
     OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id");
@@ -507,6 +519,10 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_
 
 void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel )
 {
+    // #i78850# ignore requests for "AutoExtension" control
+    if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId )
+        return;
+
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
 
     OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id");
@@ -527,6 +543,10 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS
 
 OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId )
 {
+    // #i78850# ignore requests for "AutoExtension" control
+    if ( com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION == aControlId )
+        return ::rtl::OUString( );
+
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
 
     OSL_ENSURE( IsWindow( hwndCtrl ), "invalid element id");