diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:57:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:57:11 +0000 |
| commit | 2a2c9fc73b4f344b15158a5cc512be4eb40f087b (patch) | |
| tree | a6c567b6fe1a6cbb9243264975b8a850d4d27b6c /sfx2 | |
| parent | b1c467730f3467e768b3a860487a1e9ff8ba7d84 (diff) | |
INTEGRATION: CWS asyncdialogs (1.8.650); FILE MERGED
2006/07/12 20:55:54 pb 1.8.650.5: RESYNC: (1.9-1.10); FILE MERGED
2006/03/01 09:28:03 pb 1.8.650.4: fix: #i57125# IsPasswordEnabled() added
2005/12/08 08:59:46 kso 1.8.650.3: RESYNC: (1.8-1.9); FILE MERGED
2005/11/10 09:53:44 pb 1.8.650.2: fix: #i57125# isSystemFilePicker() added
2005/11/01 14:26:47 kso 1.8.650.1: #i57125# - dialog adaptions for Threading Framework.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlgimpl.hxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 39cd2e6e24c8..6b31bb10175d 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: filedlgimpl.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2006-06-19 22:21:39 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:57:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #include <vcl/graph.hxx> #endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ -#include <cppuhelper/implbase1.hxx> +#ifndef _CPPUHELPER_IMPLBASE2_HXX_ +#include <cppuhelper/implbase2.hxx> #endif #ifndef _COM_SUN_STAR_BEANS_STRINGPAIR_HPP_ @@ -58,6 +58,9 @@ #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERLISTENER_HPP_ #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #endif +#ifndef _COM_SUN_STAR_UI_DIALOGS_XDIALOGCLOSEDLISTENER_HPP_ +#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> +#endif #ifndef _SFX_FCONTNR_HXX #include "fcontnr.hxx" @@ -74,10 +77,12 @@ class FileDialogHelper; namespace sfx2 { - typedef ::com::sun::star::beans::StringPair FilterPair; - class FileDialogHelper_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XFilePickerListener > + class FileDialogHelper_Impl : + public ::cppu::WeakImplHelper2< + ::com::sun::star::ui::dialogs::XFilePickerListener, + ::com::sun::star::ui::dialogs::XDialogClosedListener > { friend class FileDialogHelper; @@ -157,6 +162,7 @@ namespace sfx2 void preExecute(); void postExecute( sal_Int16 _nResult ); sal_Int16 implDoExecute(); + void implStartExecute(); void correctVirtualDialogType(); @@ -186,6 +192,9 @@ namespace sfx2 virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException ); + // XDialogClosedListener methods + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException); + // XEventListener methods virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); @@ -234,6 +243,9 @@ namespace sfx2 ::rtl::OUString getFilterWithExtension( const ::rtl::OUString& rFilter ) const; void SetContext( FileDialogHelper::Context _eNewContext ); + + inline sal_Bool isSystemFilePicker() const { return mbSystemPicker; } + inline sal_Bool isPasswordEnabled() const { return mbIsPwdEnabled; } }; } // end of namespace sfx2 |