From 14ad4b850127c11e53ba643aca3085ffe385d933 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Thu, 4 Sep 2008 06:07:53 +0000
Subject: INTEGRATION: CWS hotmac_DEV300 (1.3.46); FILE MERGED 2008/08/29
 11:43:18 as 1.3.46.1: #i92438# handle AutoExtension toggle right

---
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 8 ++++++--
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx         | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 2eda0ec5eb5a..60e0b1fad04c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VistaFilePickerEventHandler.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,6 +37,7 @@
 
 #include "comptr.hxx"
 #include "vistatypes.h"
+#include "IVistaFilePickerInternalNotify.hxx"
 
 #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
 #include <com/sun/star/uno/Reference.hxx>
@@ -78,7 +79,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
         // ctor/dtor
         //------------------------------------------------------------------------------------
 
-                 VistaFilePickerEventHandler();
+                 VistaFilePickerEventHandler(IVistaFilePickerInternalNotify* pInternalNotify);
         virtual ~VistaFilePickerEventHandler();
 
         //------------------------------------------------------------------------------------
@@ -200,6 +201,9 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
         /// cached file dialog instance (there we listen for events)
         TFileDialog m_pDialog;
 
+        //---------------------------------------------------------------------
+        IVistaFilePickerInternalNotify* m_pInternalNotify;
+
         //---------------------------------------------------------------------
         /** used to inform file picker listener asynchronously.
          *  Those listener must be called asynchronously .. because
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 50f2439d7e70..55dfcf597974 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VistaFilePickerImpl.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -41,6 +41,7 @@
 #include "vistatypes.h"
 #include "FilterContainer.hxx"
 #include "VistaFilePickerEventHandler.hxx"
+#include "IVistaFilePickerInternalNotify.hxx"
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -113,6 +114,7 @@ static const ::rtl::OUString PROP_CONTROL_ENABLE      = ::rtl::OUString::createF
 //-----------------------------------------------------------------------------
 class VistaFilePickerImpl : private ::cppu::BaseMutex
                           , public  RequestHandler
+                          , public  IVistaFilePickerInternalNotify
 {
     public:
 
@@ -158,6 +160,9 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
         virtual void doRequest(const RequestRef& rRequest);
         virtual void after();
 
+        //---------------------------------------------------------------------
+        virtual void onAutoExtensionChanged (bool bChecked);
+
     private:
 
         //---------------------------------------------------------------------
-- 
cgit