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

sfx2::FileDialogHelper: the punchline:

Browse source 
Now that we have removed all the pointless clutter, we can finally make it
possible to create a file dialog that has a link checkbox but not dozens of
graphic filters pre-registered: only add them if SFXWB_GRAPHIC is given.
This commit is contained in:
Michael Stahl 2011-11-30 16:08:23 +01:00
parent 5754213c70
commit c6fdc42e87
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sfx2/source/dialog/filedlghelper.cxx
View file

@ -919,7 +919,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mbHasVersions = sal_False;
mbHasPreview = sal_False;
mbShowPreview = sal_False;
mbHasLink = sal_False;
mbAddGraphicFilter = SFXWB_GRAPHIC == (nFlags & SFXWB_GRAPHIC);
mbDeleteMatcher = sal_False;
mbInsert = SFXWB_INSERT == ( nFlags & SFXWB_INSERT );
mbExport = SFXWB_EXPORT == ( nFlags & SFXWB_EXPORT );
@ -1016,7 +1016,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
nTemplateDescription = TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE;
mbHasPreview = sal_True;
mbHasLink = sal_True;
// aPreviewTimer
maPreViewTimer.SetTimeout( 500 );
@ -1035,7 +1034,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
case FILEOPEN_LINK_PREVIEW:
nTemplateDescription = TemplateDescription::FILEOPEN_LINK_PREVIEW;
mbHasPreview = sal_True;
mbHasLink = sal_True;
// aPreviewTimer
maPreViewTimer.SetTimeout( 500 );
maPreViewTimer.SetTimeoutHdl( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) );
@ -1105,8 +1103,10 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
if ( nFlags & SFXWB_MULTISELECTION )
mxFileDlg->setMultiSelectionMode( sal_True );
if ( mbHasLink ) // generate graphic filter only on demand
if (mbAddGraphicFilter) // generate graphic filter only on demand
{
addGraphicFilter();
}
// Export dialog
if ( mbExport )

2
sfx2/source/dialog/filedlgimpl.hxx
View file

@ -96,7 +96,7 @@ namespace sfx2
sal_Bool m_bHaveFilterOptions : 1;
sal_Bool mbHasVersions : 1;
sal_Bool mbHasAutoExt : 1;
sal_Bool mbHasLink : 1;
sal_Bool mbAddGraphicFilter : 1;
sal_Bool mbHasPreview : 1;
sal_Bool mbShowPreview : 1;
sal_Bool mbIsSaveDlg : 1;