diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:14:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:14:24 +0000 |
| commit | 02d63535707f9c4eae33508995524bad1829b72d (patch) | |
| tree | e44eca86e54dc592ab869f30843cd14c8d2778d3 /fpicker | |
| parent | cacdd40efc8e8a9a0ee92f3c09b5e9e3b015630d (diff) | |
INTEGRATION: CWS asyncdialogs (1.2.34); FILE MERGED
2005/12/01 12:57:46 kso 1.2.34.2: RESYNC: (1.2-1.3); FILE MERGED
2005/11/01 14:24:42 kso 1.2.34.1: #i57125# - dialog adaptions for Threading Framework.
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index a497e1657f2b..79cc3342a5f4 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -4,9 +4,9 @@ * * $RCSfile: OfficeFilePicker.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2006-08-07 14:00:34 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:14:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,8 +35,8 @@ #ifndef INCLUDED_SVT_FILEPICKER_HXX #define INCLUDED_SVT_FILEPICKER_HXX -#ifndef _CPPUHELPER_IMPLBASE6_HXX_ -#include <cppuhelper/implbase6.hxx> +#ifndef _CPPUHELPER_IMPLBASE7_HXX_ +#include <cppuhelper/implbase7.hxx> #endif #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_ @@ -57,6 +57,9 @@ #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERLISTENER_HPP_ #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #endif +#ifndef _COM_SUN_STAR_UI_DIALOGS_XASYNCHRONOUSEXECUTABLEDIALOG_HPP_ +#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> +#endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> @@ -82,6 +85,8 @@ #include <list> +class Dialog; + struct FilterEntry; struct ElementEntry_Impl; @@ -93,12 +98,13 @@ typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // c // class SvtFilePicker --------------------------------------------------- -typedef ::cppu::ImplHelper6 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess +typedef ::cppu::ImplHelper7 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess , ::com::sun::star::ui::dialogs::XFilePickerNotifier , ::com::sun::star::ui::dialogs::XFilePreview , ::com::sun::star::ui::dialogs::XFilterManager , ::com::sun::star::ui::dialogs::XFilterGroupManager , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog > SvtFilePicker_Base; class SvtFilePicker :public SvtFilePicker_Base @@ -120,6 +126,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener > + m_xDlgClosedListener; public: SvtFilePicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); @@ -142,6 +150,12 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------ + // XAsynchronousExecutableDialog functions + //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDialogTitle( const ::rtl::OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + + //------------------------------------------------------------------------------------ // XFilePicker functions //------------------------------------------------------------------------------------ @@ -239,6 +253,10 @@ private: sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); void ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ); + + void prepareExecute( ); + + DECL_LINK( DialogClosedHdl, Dialog* ); }; #endif // INCLUDED_SVT_FILEPICKER_HXX |