[Libreoffice-commits] core.git: include/tools rsc/inc rsc/source tools/source vcl/source

[Caolán McNamara]

 include/tools/rcid.h          |    2 +-
 rsc/inc/rscdb.hxx             |    1 -
 rsc/source/parser/rscicpx.cxx |   20 --------------------
 rsc/source/parser/rscinit.cxx |    4 ----
 tools/source/rc/resmgr.cxx    |    1 -
 vcl/source/control/button.cxx |   11 ++++-------
 6 files changed, 5 insertions(+), 34 deletions(-)

New commits:
commit 1c13f9c2b67d3a26a8cbbc11b6ae0dc1dc2d30ca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 16 18:36:24 2014 +0100

    RSC_TRISTATEBOX is no longer used
    
    Change-Id: Ib3f43db131cf5562ad011538873c2ee51839665c

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index d3b4e63..47244ea 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -72,7 +72,7 @@
 #define RSC_RADIOBUTTON         (RSC_NOTYPE + 0x4e)
 
 #define RSC_CHECKBOX            (RSC_NOTYPE + 0x50)
-#define RSC_TRISTATEBOX         (RSC_NOTYPE + 0x51)
+
 #define RSC_EDIT                (RSC_NOTYPE + 0x52)
 
 #define RSC_COMBOBOX            (RSC_NOTYPE + 0x54)
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b8fc762..6aca602 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -176,7 +176,6 @@ class RscTypCont
     RscTop *    InitClassControl( RscTop * pSuper );
     RscTop *    InitClassCheckBox( RscTop * pSuper );
     RscTop *    InitClassPushButton( RscTop * pSuper );
-    RscTop *    InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState );
     RscTop *    InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
                                     RscEnum * pTriState );
     RscTop *    InitClassEdit( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 195f6af..6169eda 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -432,26 +432,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
     return pClassPushButton;
 }
 
-RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper,
-                                           RscEnum * pTriState )
-{
-    Atom        nId;
-    RscTop *    pClassTriStateBox;
-
-    nId = pHS->getID( "TriStateBox" );
-    pClassTriStateBox = new RscClass( nId, RSC_TRISTATEBOX, pSuper );
-    pClassTriStateBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassTriStateBox );
-
-    // Variablen anlegen
-    nId = aNmTb.Put( "State", VARNAME );
-    pClassTriStateBox->SetVariable( nId, pTriState );
-    nId = aNmTb.Put( "TriStateDisable", VARNAME );
-    pClassTriStateBox->SetVariable( nId, &aBool );
-
-    return pClassTriStateBox;
-}
-
 RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
                                            RscTop * pClassImage,
                                            RscEnum * pTriState )
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 0aecf07..70415bc 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -82,7 +82,6 @@ void RscTypCont::Init()
     RscTop   *  pClassHelpButton;
     RscTop   *  pClassRadioButton;
     RscTop   *  pClassImageButton;
-    RscTop   *  pClassTriStateBox;
     RscTop   *  pClassEdit;
     RscTop   *  pClassListBox;
     RscTop   *  pClassComboBox;
@@ -417,9 +416,6 @@ void RscTypCont::Init()
     pClassRadioButton = InitClassRadioButton( pClassButton );
     pRoot->Insert( pClassRadioButton );
 
-    pClassTriStateBox = InitClassTriStateBox( pClassControl, pTriState );
-    pRoot->Insert( pClassTriStateBox );
-
     pClassImageButton = InitClassImageButton( pClassPushButton,
                                               pClassImage, pTriState );
     pRoot->Insert( pClassImageButton );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index a41f981..e31071a 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1481,7 +1481,6 @@ OString ResMgr::GetAutoHelpId()
                 switch( pRC->pResource->GetRT() ) {
                     case RSC_RADIOBUTTON:       aHID.append( "RadioButton" );      break;
                     case RSC_CHECKBOX:          aHID.append( "CheckBox" );         break;
-                    case RSC_TRISTATEBOX:       aHID.append( "TriStateBox" );      break;
                     case RSC_EDIT:              aHID.append( "Edit" );             break;
                     case RSC_LISTBOX:           aHID.append( "ListBox" );          break;
                     case RSC_COMBOBOX:          aHID.append( "ComboBox" );         break;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 465e15a..60cff9b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2984,13 +2984,10 @@ void CheckBox::ImplLoadRes( const ResId& rResId )
 {
     Button::ImplLoadRes( rResId );
 
-    if ( rResId.GetRT() != RSC_TRISTATEBOX )
-    {
-        sal_uInt16 nChecked = ReadShortRes();
-        //anderer Wert als Default ?
-        if( nChecked )
-            Check( true );
-    }
+    sal_uInt16 nChecked = ReadShortRes();
+    //anderer Wert als Default ?
+    if( nChecked )
+        Check( true );
 }
 
 void CheckBox::ImplInvalidateOrDrawCheckBoxState()