convert half of optfltr.src to .ui

Converted the "VBA Properties" half of optfltr.src to optfltrpage.ui.

Change-Id: Ie200377f2956aa243b1be859eb52972b79e9dc66
Reviewed-on: https://gerrit.libreoffice.org/2961
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>

4 files changed, 50 insertions, 164 deletions

diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index df2d57e4718a..2271fab7e057 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -39,23 +39,19 @@ enum MSFltrPg2_CheckBoxEntries {
 // -----------------------------------------------------------------------
 
 OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
-    aMSWordGB       ( this, CUI_RES( GB_WORD        ) ),
-    aWBasicCodeCB   ( this, CUI_RES( CB_WBAS_CODE ) ),
-    aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
-    aWBasicStgCB    ( this, CUI_RES( CB_WBAS_STG  ) ),
-    aMSExcelGB      ( this, CUI_RES( GB_EXCEL     ) ),
-    aEBasicCodeCB   ( this, CUI_RES( CB_EBAS_CODE ) ),
-    aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
-    aEBasicStgCB    ( this, CUI_RES( CB_EBAS_STG  ) ),
-    aMSPPointGB     ( this, CUI_RES( GB_PPOINT    ) ),
-    aPBasicCodeCB   ( this, CUI_RES( CB_PBAS_CODE ) ),
-    aPBasicStgCB    ( this, CUI_RES( CB_PBAS_STG  ) )
+    : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", rSet )
 {
-    FreeResource();
-
-    aWBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) );
-    aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
+    get( aWBasicCodeCB      , "wo_basic"    );
+    get( aWBasicWbctblCB    , "wo_exec"     );
+    get( aWBasicStgCB       , "wo_saveorig" );
+    get( aEBasicCodeCB      , "ex_basic"    );
+    get( aEBasicExectblCB   , "ex_exec"     );
+    get( aEBasicStgCB       , "ex_saveorig" );
+    get( aPBasicCodeCB      , "pp_basic"    );
+    get( aPBasicStgCB       , "pp_saveorig" );
+
+    aWBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) );
+    aEBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
 }
 
 OfaMSFilterTabPage::~OfaMSFilterTabPage()
@@ -64,13 +60,13 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage()
 
 IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
 {
-    aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() );
+    aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
     return 0;
 }
 
 IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
 {
-    aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() );
+    aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
     return 0;
 }
 
@@ -85,23 +81,23 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
     SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
     sal_Bool bFlag;
-    if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
+    if( aWBasicCodeCB->GetSavedValue() != (bFlag = aWBasicCodeCB->IsChecked()))
         rOpt.SetLoadWordBasicCode( bFlag );
-    if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked()))
+    if( aWBasicWbctblCB->GetSavedValue() != (bFlag = aWBasicWbctblCB->IsChecked()))
         rOpt.SetLoadWordBasicExecutable( bFlag );
-    if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
+    if( aWBasicStgCB->GetSavedValue() != (bFlag = aWBasicStgCB->IsChecked()))
         rOpt.SetLoadWordBasicStorage( bFlag );
 
-    if( aEBasicCodeCB.GetSavedValue() != (bFlag = aEBasicCodeCB.IsChecked()))
+    if( aEBasicCodeCB->GetSavedValue() != (bFlag = aEBasicCodeCB->IsChecked()))
         rOpt.SetLoadExcelBasicCode( bFlag );
-    if( aEBasicExectblCB.GetSavedValue() != (bFlag = aEBasicExectblCB.IsChecked()))
+    if( aEBasicExectblCB->GetSavedValue() != (bFlag = aEBasicExectblCB->IsChecked()))
         rOpt.SetLoadExcelBasicExecutable( bFlag );
-    if( aEBasicStgCB.GetSavedValue() != (bFlag = aEBasicStgCB.IsChecked()))
+    if( aEBasicStgCB->GetSavedValue() != (bFlag = aEBasicStgCB->IsChecked()))
         rOpt.SetLoadExcelBasicStorage( bFlag );
 
-    if( aPBasicCodeCB.GetSavedValue() != (bFlag = aPBasicCodeCB.IsChecked()))
+    if( aPBasicCodeCB->GetSavedValue() != (bFlag = aPBasicCodeCB->IsChecked()))
         rOpt.SetLoadPPointBasicCode( bFlag );
-    if( aPBasicStgCB.GetSavedValue() != (bFlag = aPBasicStgCB.IsChecked()))
+    if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked()))
         rOpt.SetLoadPPointBasicStorage( bFlag );
 
     return sal_False;
@@ -111,26 +107,26 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 {
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
-    aWBasicCodeCB.Check( rOpt.IsLoadWordBasicCode() );
-    aWBasicCodeCB.SaveValue();
-    aWBasicWbctblCB.Check( rOpt.IsLoadWordBasicExecutable() );
-    aWBasicWbctblCB.SaveValue();
-    aWBasicStgCB.Check( rOpt.IsLoadWordBasicStorage() );
-    aWBasicStgCB.SaveValue();
-    LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB );
-
-    aEBasicCodeCB.Check( rOpt.IsLoadExcelBasicCode() );
-    aEBasicCodeCB.SaveValue();
-    aEBasicExectblCB.Check( rOpt.IsLoadExcelBasicExecutable() );
-    aEBasicExectblCB.SaveValue();
-    aEBasicStgCB.Check( rOpt.IsLoadExcelBasicStorage() );
-    aEBasicStgCB.SaveValue();
-    LoadExcelBasicCheckHdl_Impl( &aEBasicCodeCB );
-
-    aPBasicCodeCB.Check( rOpt.IsLoadPPointBasicCode() );
-    aPBasicCodeCB.SaveValue();
-    aPBasicStgCB.Check( rOpt.IsLoadPPointBasicStorage() );
-    aPBasicStgCB.SaveValue();
+    aWBasicCodeCB->Check( rOpt.IsLoadWordBasicCode() );
+    aWBasicCodeCB->SaveValue();
+    aWBasicWbctblCB->Check( rOpt.IsLoadWordBasicExecutable() );
+    aWBasicWbctblCB->SaveValue();
+    aWBasicStgCB->Check( rOpt.IsLoadWordBasicStorage() );
+    aWBasicStgCB->SaveValue();
+    LoadWordBasicCheckHdl_Impl( aWBasicCodeCB );
+
+    aEBasicCodeCB->Check( rOpt.IsLoadExcelBasicCode() );
+    aEBasicCodeCB->SaveValue();
+    aEBasicExectblCB->Check( rOpt.IsLoadExcelBasicExecutable() );
+    aEBasicExectblCB->SaveValue();
+    aEBasicStgCB->Check( rOpt.IsLoadExcelBasicStorage() );
+    aEBasicStgCB->SaveValue();
+    LoadExcelBasicCheckHdl_Impl( aEBasicCodeCB );
+
+    aPBasicCodeCB->Check( rOpt.IsLoadPPointBasicCode() );
+    aPBasicCodeCB->SaveValue();
+    aPBasicStgCB->Check( rOpt.IsLoadPPointBasicStorage() );
+    aPBasicStgCB->SaveValue();
 }
 
 OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc
index 9f1c01c77a5d..f1bf33a4ee0d 100644
--- a/cui/source/options/optfltr.hrc
+++ b/cui/source/options/optfltr.hrc
@@ -21,19 +21,6 @@
 
 // defines ------------------------------------------------------------------
 
-#define GB_WORD         1
-#define GB_EXCEL        2
-#define GB_PPOINT       3
-
-#define CB_WBAS_CODE    1
-#define CB_WBAS_STG     2
-#define CB_EBAS_CODE    3
-#define CB_EBAS_EXECTBL 4
-#define CB_EBAS_STG     5
-#define CB_PBAS_CODE    6
-#define CB_PBAS_STG     7
-#define CB_WBAS_WBCTBL  8
-
 #define CLB_SETTINGS    1
 #define ST_CHG_MATH     1
 #define ST_CHG_WRITER   2
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 655bc106f5b1..fb4fd067e270 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -29,17 +29,14 @@
 
 class OfaMSFilterTabPage : public SfxTabPage
 {
-    FixedLine       aMSWordGB;
-    CheckBox        aWBasicCodeCB;
-    CheckBox        aWBasicWbctblCB;
-    CheckBox        aWBasicStgCB;
-    FixedLine       aMSExcelGB;
-    CheckBox        aEBasicCodeCB;
-    CheckBox        aEBasicExectblCB;
-    CheckBox        aEBasicStgCB;
-    FixedLine       aMSPPointGB;
-    CheckBox        aPBasicCodeCB;
-    CheckBox        aPBasicStgCB;
+    CheckBox*       aWBasicCodeCB;
+    CheckBox*       aWBasicWbctblCB;
+    CheckBox*       aWBasicStgCB;
+    CheckBox*       aEBasicCodeCB;
+    CheckBox*       aEBasicExectblCB;
+    CheckBox*       aEBasicStgCB;
+    CheckBox*       aPBasicCodeCB;
+    CheckBox*       aPBasicStgCB;
 
     OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage();
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 2084005094de..f1d3ae371cf7 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -20,100 +20,6 @@
 #include "optfltr.hrc"
 #include <cuires.hrc>
 
-// RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
-TabPage RID_OFAPAGE_MSFILTEROPT
-{
-    HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-
-    FixedLine GB_WORD
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Microsoft Word 97/2000/XP";
-    };
-    CheckBox CB_WBAS_CODE
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Load Basic ~code";
-    };
-    CheckBox CB_WBAS_WBCTBL
-    {
-        Pos = MAP_APPFONT ( 22 , 28 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "E~xecutable code";
-    };
-    CheckBox CB_WBAS_STG
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG";
-        Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Save ~original Basic code";
-    };
-
-    FixedLine GB_EXCEL
-    {
-        Pos = MAP_APPFONT ( 6 , 58 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Microsoft Excel 97/2000/XP";
-    };
-    CheckBox CB_EBAS_CODE
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE";
-        Pos = MAP_APPFONT ( 12 , 69 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Lo~ad Basic code";
-    };
-    CheckBox CB_EBAS_EXECTBL
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL";
-        Pos = MAP_APPFONT ( 22 , 83 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "E~xecutable code";
-    };
-    CheckBox CB_EBAS_STG
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG";
-        Pos = MAP_APPFONT ( 12 , 97 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Sa~ve original Basic code";
-    };
-
-    FixedLine GB_PPOINT
-    {
-        Pos = MAP_APPFONT ( 6 , 113 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Microsoft PowerPoint 97/2000/XP";
-    };
-    CheckBox CB_PBAS_CODE
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE";
-        Pos = MAP_APPFONT ( 12 , 124 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Load Ba~sic code";
-    };
-    CheckBox CB_PBAS_STG
-    {
-        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG";
-        Pos = MAP_APPFONT ( 12 , 138 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Sav~e original Basic code";
-    };
-};
-
 // RID_OFAPAGE_MSFILTEROPT2 -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {