diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:54:43 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:54:43 +0000 |
commit | f31b85c43ab7302483dd5611767293c481435cce (patch) | |
tree | 30db678e62f0fe5d313edb05e6f3f8cb0d2ed8f0 /sfx2/source/doc/docvor.cxx | |
parent | 85cd316f384bf3bd9a6d99e4080a95bfecf97aa0 (diff) |
INTEGRATION: CWS sb59 (1.45.20); FILE MERGED
2006/08/18 19:21:55 sb 1.45.20.2: RESYNC: (1.45-1.46); FILE MERGED
2006/08/16 09:31:21 sb 1.45.20.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'sfx2/source/doc/docvor.cxx')
-rw-r--r-- | sfx2/source/doc/docvor.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 4780de8e1a92..1f0e85397508 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docvor.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:41:01 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:54:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,7 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include <stdio.h> @@ -1588,7 +1589,9 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName ) { String aPath; String aExtension( DEFINE_CONST_UNICODE( "vor" ) ); - short nDialogType = bOpen ? ::sfx2::FILEOPEN_SIMPLE : ::sfx2::FILESAVE_SIMPLE; + short nDialogType = bOpen + ? com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE + : com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE; sfx2::FileDialogHelper aFileDlg( nDialogType, 0L ); // add "All" filter @@ -1697,7 +1700,9 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName ) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aPaths; String aExtension( DEFINE_CONST_UNICODE( "vor" ) ); - sfx2::FileDialogHelper aFileDlg( ::sfx2::FILEOPEN_SIMPLE , SFXWB_MULTISELECTION ); + sfx2::FileDialogHelper aFileDlg( + com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + SFXWB_MULTISELECTION ); // add "All" filter aFileDlg.AddFilter( String( SfxResId( STR_SFX_FILTERNAME_ALL ) ), |