remove instantiated but unused ui elements without existing resources

Change-Id: Icefcd4746d416d5a0d4a244ee32eeddb376221ae

cui/source/options/optgdlg.cxx

@@ -200,8 +200,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aExtHelpCB          ( this, CUI_RES( CB_EXTHELP ) ),
     aHelpAgentCB        ( this, CUI_RES( CB_HELPAGENT ) ),
     aHelpAgentResetBtn  ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
-    aHelpFormatFT       ( this, CUI_RES( FT_HELPFORMAT ) ),
-    aHelpFormatLB       ( this, CUI_RES( LB_HELPFORMAT ) ),
     aFileDlgFL          ( this, CUI_RES( FL_FILEDLG ) ),
     aFileDlgROImage     ( this, CUI_RES( FI_FILEDLG_RO ) ),
     aFileDlgCB          ( this, CUI_RES( CB_FILEDLG ) ),
@@ -220,11 +218,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
 {
     FreeResource();
 
-#if !defined(ENABLE_HELP_FORMATTING)
-    aHelpFormatFT.Hide();
-    aHelpFormatLB.Hide();
-#endif
-
     if (!lcl_HasSystemFilePicker())
     {
         aFileDlgFL.Hide();
@@ -334,22 +327,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
     aToolTipsCB.SetClickHdl( aLink );
     aHelpAgentCB.SetClickHdl( aLink );
     aHelpAgentResetBtn.SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) );
-
-    //fill default names as user data
-    static const char* aHelpFormatNames[] =
-    {
-        "Default",
-        "HighContrast1",
-        "HighContrast2",
-        "HighContrastBlack",
-        "HighContrastWhite"
-    };
-
-    for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
-    {
-        String* pData = new String( rtl::OUString::createFromAscii( aHelpFormatNames[i] ) );
-        aHelpFormatLB.SetEntryData( i, pData );
-    }
 }
 
 #ifdef WNT
@@ -364,10 +341,6 @@ IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled)
 
 OfaMiscTabPage::~OfaMiscTabPage()
 {
-    for(sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++)
-    {
-        delete static_cast< String* >( aHelpFormatLB.GetEntryData(i) );
-    }
 }
 
 // -----------------------------------------------------------------------
@@ -393,12 +366,6 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
     bChecked = aHelpAgentCB.IsChecked();
     if ( bChecked != aHelpAgentCB.GetSavedValue() )
         aHelpOptions.SetHelpAgentAutoStartMode( bChecked );
-    sal_uInt16 nHelpFormatPos = aHelpFormatLB.GetSelectEntryPos();
-    if ( nHelpFormatPos != LISTBOX_ENTRY_NOTFOUND &&
-         nHelpFormatPos != aHelpFormatLB.GetSavedValue() )
-    {
-        aHelpOptions.SetHelpStyleSheet( *static_cast< String* >( aHelpFormatLB.GetEntryData( nHelpFormatPos ) ) );
-    }
 
     if ( aFileDlgCB.IsChecked() != aFileDlgCB.GetSavedValue() )
     {
@@ -469,20 +436,10 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
     aToolTipsCB.Check( aHelpOptions.IsHelpTips() );
     aExtHelpCB.Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
     aHelpAgentCB.Check( aHelpOptions.IsHelpAgentAutoStartMode() );
-    String sStyleSheet = aHelpOptions.GetHelpStyleSheet();
-    for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); ++i )
-    {
-        if ( *static_cast< String* >( aHelpFormatLB.GetEntryData(i) ) == sStyleSheet )
-        {
-            aHelpFormatLB.SelectEntryPos(i);
-            break;
-        }
-    }
 
     aToolTipsCB.SaveValue();
     aExtHelpCB.SaveValue();
     aHelpAgentCB.SaveValue();
-    aHelpFormatLB.SaveValue();
     HelpCheckHdl_Impl( &aHelpAgentCB );
 
     SvtMiscOptions aMiscOpt;

cui/source/options/optgdlg.hrc

@@ -21,8 +21,6 @@
 
 // defines for positions and sizes ---------------------------------------
 
-#define ENABLE_HELP_FORMATTING 0
-
 #define WHOLE_WIDTH             248
 #define EDIT_WIDTH              30
 #define UNIT_WIDTH              40
@@ -39,11 +37,7 @@
 #define ROWSPACE                RSC_SP_CTRL_DESC_Y
 #define ROW0                    3
 #define ROW1                    (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#if ENABLE_HELP_FORMATTING
-#define ROW2                    (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#else
 #define ROW2                    (ROW1)
-#endif
 #define ROW3                    (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
 #define ROW4                    (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
 #define ROW5                    (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
@@ -99,10 +93,8 @@
 #define CB_EXTHELP                  12
 #define CB_HELPAGENT                13
 #define PB_HELPAGENT_RESET          14
-#define FT_HELPFORMAT               15
-#define LB_HELPFORMAT               16
-#define CB_EXPERIMENTAL             18
-#define CB_MACRORECORDER            20
+#define CB_EXPERIMENTAL             15
+#define CB_MACRORECORDER            16
 
 #define FL_TWOFIGURE                40
 #define FT_INTERPRET                41

cui/source/options/optgdlg.hxx

@@ -50,8 +50,6 @@ private:
     CheckBox            aExtHelpCB;
     CheckBox            aHelpAgentCB;
     PushButton          aHelpAgentResetBtn;
-    FixedText           aHelpFormatFT;
-    ListBox             aHelpFormatLB;
 
     FixedLine           aFileDlgFL;
     ReadOnlyImage       aFileDlgROImage;

cui/source/options/optgdlg.src

@@ -62,31 +62,6 @@ TabPage OFA_TP_MISC
         Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Extended tips";
     };
-#if ENABLE_HELP_FORMATTING
-    FixedText FT_HELPFORMAT
-    {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
-        Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Help ~formatting";
-    };
-    ListBox LB_HELPFORMAT
-    {
-        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
-        Pos = MAP_APPFONT( COL3, ROW2 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
-        DropDown = TRUE ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Default" ; > ;
-            < "High Contrast #1" ; > ;
-            < "High Contrast #2" ; > ;
-            < "High Contrast Black" ; > ;
-            < "High Contrast White" ; > ;
-        };
-    };
-#endif
     CheckBox CB_HELPAGENT
     {
         HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";