INTEGRATION: CWS ab51 (1.15.42); FILE MERGED

2008/05/06 15:51:39 ab 1.15.42.1: #i88690# New Checkbox CB_EBAS_EXECTBL

1 files changed, 15 insertions, 1 deletions

diff --git a/svx/source/dialog/optfltr.cxx b/svx/source/dialog/optfltr.cxx
index 9c82836c7c60..7c1856978c62 100644
--- a/svx/source/dialog/optfltr.cxx
+++ b/svx/source/dialog/optfltr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: optfltr.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,18 +65,27 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
     aWBasicStgCB    ( this, SVX_RES( CB_WBAS_STG  ) ),
     aMSExcelGB      ( this, SVX_RES( GB_EXCEL     ) ),
     aEBasicCodeCB   ( this, SVX_RES( CB_EBAS_CODE ) ),
+    aEBasicExectblCB( this, SVX_RES( CB_EBAS_EXECTBL ) ),
     aEBasicStgCB    ( this, SVX_RES( CB_EBAS_STG  ) ),
     aMSPPointGB     ( this, SVX_RES( GB_PPOINT    ) ),
     aPBasicCodeCB   ( this, SVX_RES( CB_PBAS_CODE ) ),
     aPBasicStgCB    ( this, SVX_RES( CB_PBAS_STG  ) )
 {
     FreeResource();
+
+    aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
 }
 
 OfaMSFilterTabPage::~OfaMSFilterTabPage()
 {
 }
 
+IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG )
+{
+    aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() );
+    return 0;
+}
+
 SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
                                         const SfxItemSet& rAttrSet )
 {
@@ -95,6 +104,8 @@ BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
 
     if( aEBasicCodeCB.GetSavedValue() != (bFlag = aEBasicCodeCB.IsChecked()))
         pOpt->SetLoadExcelBasicCode( bFlag );
+    if( aEBasicExectblCB.GetSavedValue() != (bFlag = aEBasicExectblCB.IsChecked()))
+        pOpt->SetLoadExcelBasicExecutable( bFlag );
     if( aEBasicStgCB.GetSavedValue() != (bFlag = aEBasicStgCB.IsChecked()))
         pOpt->SetLoadExcelBasicStorage( bFlag );
 
@@ -121,8 +132,11 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 
     aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() );
     aEBasicCodeCB.SaveValue();
+    aEBasicExectblCB.Check( pOpt->IsLoadExcelBasicExecutable() );
+    aEBasicExectblCB.SaveValue();
     aEBasicStgCB.Check( pOpt->IsLoadExcelBasicStorage() );
     aEBasicStgCB.SaveValue();
+    LoadExcelBasicCheckHdl_Impl( &aEBasicCodeCB );
 
     aPBasicCodeCB.Check( pOpt->IsLoadPPointBasicCode() );
     aPBasicCodeCB.SaveValue();