merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0505-linkwarn-sfx2-disable-cb-persistency.diff
blob4c8b162e04ea07d9b7b645b551d228e3903eaf7d
1 --- sfx2/source/dialog/filedlghelper.cxx 2008-04-15 16:18:43.000000000 +0200
2 +++ sfx2/source/dialog/filedlghelper.cxx 2008-05-08 08:03:49.000000000 +0200
3 @@ -1960,11 +1960,7 @@
5 try
7 - aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 );
8 sal_Bool bValue = sal_False;
9 - aValue >>= bValue;
10 - aUserData.SetToken( 0, ' ', String::CreateFromInt32( (sal_Int32) bValue ) );
12 aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 );
13 bValue = sal_False;
14 aValue >>= bValue;
15 @@ -2089,14 +2085,6 @@
17 try
19 - // respect the last "insert as link" state
20 - sal_Bool bLink = (sal_Bool) aUserData.GetToken( 0, ' ' ).ToInt32();
21 - if ( !xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 ).hasValue() )
22 - {
23 - aValue <<= bLink;
24 - xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aValue );
25 - }
27 // respect the last "show preview" state
28 sal_Bool bShowPreview = (sal_Bool) aUserData.GetToken( 1, ' ' ).ToInt32();
29 if ( !xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 ).hasValue() )