strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS hotmac_DEV300 (1.3.46); FILE MERGED

Browse source 
2008/08/29 11:43:18 as 1.3.46.1: #i92438# handle AutoExtension toggle right
This commit is contained in:
Rüdiger Timm 2008-09-04 06:07:53 +00:00
parent c16ebca652
commit 14ad4b8501
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
View file

@ -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

7
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
View file

@ -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:
//---------------------------------------------------------------------