summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-09-04 06:07:53 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-09-04 06:07:53 +0000
commitfd0b325a17e0d6917e7e97beb5338524c5c064dc (patch)
treefc45a283fa7017692e6cf0ef9a2feaf2fd34f797 /fpicker
parentb6af6dca1fd9ce6ff0904e5a4f54b180327dbe66 (diff)
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
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx8
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx7
2 files changed, 12 insertions, 3 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 8956622e51..2729f12461 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();
//------------------------------------------------------------------------------------
@@ -201,6 +202,9 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
TFileDialog m_pDialog;
//---------------------------------------------------------------------
+ IVistaFilePickerInternalNotify* m_pInternalNotify;
+
+ //---------------------------------------------------------------------
/** used to inform file picker listener asynchronously.
* Those listener must be called asynchronously .. because
* every request will block the caller thread. Mostly that will be
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 79800a7ef7..10276dc4b4 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:
//---------------------------------------------------------------------