diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 13:12:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 13:12:01 +0000 |
| commit | 467b96a9e1f1647e597c2aa4bad6501e534e0605 (patch) | |
| tree | 14305019fc0c5275aa097d44c11c5822bec69775 /sfx2 | |
| parent | 68f578d246238871fa6c8af9595f71d396341829 (diff) | |
CWS-TOOLING: integrate CWS filepicker03
2009-08-28 10:59:09 +0200 cd r275520 : #i103568# Added context for Writer export
2009-08-27 13:42:55 +0200 cd r275478 : #i103568# The expression must be negated to be correct!
2009-08-26 14:26:24 +0200 cd r275423 : CWS-TOOLING: rebase CWS filepicker03 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 11:53:11 +0200 cd r275411 : #i103568# Fix file type suggestion inconsistency
2009-08-26 11:27:16 +0200 cd r275407 : #i83457# Fix compiler warnings for wntmsci11 and 12
2009-08-26 11:26:32 +0200 cd r275406 : #i83457# Remove fpicker from modules with warnings
2009-08-25 16:20:06 +0200 cd r275368 : #i83457# Fix msvc warnings
2009-08-03 15:12:44 +0200 cd r274582 : CWS-TOOLING: rebase CWS filepicker03 to trunk@274203 (milestone: DEV300:m53)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/filedlghelper.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index f9377f9908ea..e6dc185ef919 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -151,7 +151,8 @@ public: SD_INSERT_SOUND, // insert sound in draw SD_INSERT_VIDEO, // insert video in draw SD_EXPORT, // export in draw - SI_EXPORT // export in impress + SI_EXPORT, // export in impress + SW_EXPORT // export in writer }; private: diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index b9fe056112c5..d8989c6a21ea 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -128,6 +128,7 @@ const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) { static const OUString aSD_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SdExportLastFilter" ) ); static const OUString aSI_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SiExportLastFilter" ) ); + static const OUString aSW_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SwExportLastFilter" ) ); const OUString* pRet = NULL; @@ -135,6 +136,7 @@ const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) { case FileDialogHelper::SD_EXPORT: pRet = &aSD_EXPORT_IDENTIFIER; break; case FileDialogHelper::SI_EXPORT: pRet = &aSI_EXPORT_IDENTIFIER; break; + case FileDialogHelper::SW_EXPORT: pRet = &aSW_EXPORT_IDENTIFIER; break; default: break; } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 66cbedfc7a6b..c46a467fa41d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -808,6 +808,9 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, eCtxt = sfx2::FileDialogHelper::SD_EXPORT; if( aDocServiceName.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ) eCtxt = sfx2::FileDialogHelper::SI_EXPORT; + if( aDocServiceName.equalsAscii( "com.sun.star.text.TextDocument" ) ) + eCtxt = sfx2::FileDialogHelper::SW_EXPORT; + if ( eCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT ) pFileDlg->SetContext( eCtxt ); @@ -836,7 +839,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ::rtl::OUString aAdjustToType; // bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format - if ( bSetStandardName || GetStorable()->hasLocation() ) + if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) &&
+ ( bSetStandardName || GetStorable()->hasLocation() ))
{ uno::Sequence< beans::PropertyValue > aOldFilterProps; ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( |