Replace exisiting TriState, AutoState with more generic TriState

Change-Id: Ida05478aae5a379775c671e0c2f2851d820d78be

5 files changed, 77 insertions, 77 deletions

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 37adb5f80608..dd2fe1aeffd6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -207,7 +207,7 @@ ImplStyleData::ImplStyleData() :
     mnOptions                   = 0;
     mnAutoMnemonic              = 1;
     mnToolbarIconSize           = STYLE_TOOLBAR_ICONSIZE_UNKNOWN;
-    mnUseImagesInMenus          = AUTO_STATE_AUTO;
+    mnUseImagesInMenus          = TRISTATE_INDET;
     mpFontOptions              = NULL;
     mnEdgeBlending = 35;
     maEdgeBlendingTopLeftColor = RGB_COLORDATA(0xC0, 0xC0, 0xC0);
@@ -520,11 +520,11 @@ bool StyleSettings::GetUseImagesInMenus() const
 {
     // icon mode selected in Tools -> Options... -> OpenOffice.org -> View
     switch (mpData->mnUseImagesInMenus) {
-    case AUTO_STATE_OFF:
+    case TRISTATE_FALSE:
         return false;
-    case AUTO_STATE_ON:
+    case TRISTATE_TRUE:
         return true;
-    default: // AUTO_STATE_AUTO:
+    default: // TRISTATE_INDET:
         return GetPreferredUseImagesInMenus();
     }
 }
@@ -800,8 +800,8 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
 
 ImplMiscData::ImplMiscData()
 {
-    mnEnableATT                 = AUTO_STATE_AUTO;
-    mnDisablePrinting           = AUTO_STATE_AUTO;
+    mnEnableATT                 = TRISTATE_INDET;
+    mnDisablePrinting           = TRISTATE_INDET;
     static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set default without UI
     mbEnableLocalizedDecimalSep = (pEnv != NULL) ? sal_True : sal_False;
 }
@@ -872,16 +872,16 @@ bool MiscSettings::operator ==( const MiscSettings& rSet ) const
 
 bool MiscSettings::GetDisablePrinting() const
 {
-    if( mpData->mnDisablePrinting == AUTO_STATE_AUTO )
+    if( mpData->mnDisablePrinting == TRISTATE_INDET )
     {
         OUString aEnable =
             vcl::SettingsConfigItem::get()->
             getValue( OUString( "DesktopManagement"  ),
                       OUString( "DisablePrinting"  ) );
-        mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? AUTO_STATE_ON : AUTO_STATE_OFF;
+        mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE;
     }
 
-    return mpData->mnDisablePrinting != AUTO_STATE_OFF;
+    return mpData->mnDisablePrinting != TRISTATE_FALSE;
 }
 // -----------------------------------------------------------------------
 
@@ -889,7 +889,7 @@ bool MiscSettings::GetEnableATToolSupport() const
 {
 
 #ifdef WNT
-    if( mpData->mnEnableATT == AUTO_STATE_AUTO )
+    if( mpData->mnEnableATT == TRISTATE_INDET )
     {
         // Check in the Windows registry if an AT tool wants Accessibility support to
         // be activated ..
@@ -909,19 +909,19 @@ bool MiscSettings::GetEnableATToolSupport() const
                 switch (dwType)
                 {
                     case REG_SZ:
-                        mpData->mnEnableATT = ((0 == stricmp((const char *) Data, "1")) || (0 == stricmp((const char *) Data, "true"))) ? AUTO_STATE_ON : AUTO_STATE_OFF;
+                        mpData->mnEnableATT = ((0 == stricmp((const char *) Data, "1")) || (0 == stricmp((const char *) Data, "true"))) ? TRISTATE_TRUE : TRISTATE_FALSE;
                         break;
                     case REG_DWORD:
                         switch (((DWORD *) Data)[0]) {
                         case 0:
-                            mpData->mnEnableATT = AUTO_STATE_OFF;
+                            mpData->mnEnableATT = TRISTATE_FALSE;
                             break;
                         case 1:
-                            mpData->mnEnableATT = AUTO_STATE_ON;
+                            mpData->mnEnableATT = TRISTATE_TRUE;
                             break;
                         default:
-                            mpData->mnEnableATT = AUTO_STATE_AUTO;
-                                //TODO: or AUTO_STATE_ON?
+                            mpData->mnEnableATT = TRISTATE_INDET;
+                                //TODO: or TRISTATE_TRUE?
                             break;
                         }
                         break;
@@ -936,7 +936,7 @@ bool MiscSettings::GetEnableATToolSupport() const
     }
 #endif
 
-    if( mpData->mnEnableATT == AUTO_STATE_AUTO )
+    if( mpData->mnEnableATT == TRISTATE_INDET )
     {
         static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" );
         if( !pEnv || !*pEnv )
@@ -945,21 +945,21 @@ bool MiscSettings::GetEnableATToolSupport() const
                 vcl::SettingsConfigItem::get()->
                 getValue( OUString( "Accessibility"  ),
                           OUString( "EnableATToolSupport"  ) );
-            mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? AUTO_STATE_ON : AUTO_STATE_OFF;
+            mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? TRISTATE_TRUE : TRISTATE_FALSE;
         }
         else
         {
-            mpData->mnEnableATT = AUTO_STATE_ON;
+            mpData->mnEnableATT = TRISTATE_TRUE;
         }
     }
 
-    return mpData->mnEnableATT != AUTO_STATE_OFF;
+    return mpData->mnEnableATT != TRISTATE_FALSE;
 }
 
 #ifdef WNT
 void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
 {
-    if ( (bEnable ? AUTO_STATE_ON : AUTO_STATE_OFF) != mpData->mnEnableATT )
+    if ( (bEnable ? TRISTATE_TRUE : TRISTATE_FALSE) != mpData->mnEnableATT )
     {
         if( bEnable && !ImplInitAccessBridge() )
             return;
@@ -1004,7 +1004,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
             setValue( OUString( "Accessibility"  ),
                       OUString( "EnableATToolSupport"  ),
                       bEnable ? OUString("true") : OUString("false" ) );
-        mpData->mnEnableATT = bEnable ? AUTO_STATE_ON : AUTO_STATE_OFF;
+        mpData->mnEnableATT = bEnable ? TRISTATE_TRUE : TRISTATE_FALSE;
     }
 }
 #endif
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 94d2ab883c67..7e5f28cef894 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -626,8 +626,8 @@ void PushButton::ImplInitPushButtonData()
     mpWindowImpl->mbPushButton    = true;
 
     meSymbol        = SYMBOL_NOSYMBOL;
-    meState         = STATE_NOCHECK;
-    meSaveValue     = STATE_NOCHECK;
+    meState         = TRISTATE_FALSE;
+    meSaveValue     = TRISTATE_FALSE;
     mnDDStyle       = 0;
     mbPressed       = false;
     mbInUserDraw    = false;
@@ -1639,14 +1639,14 @@ void PushButton::SetState( TriState eState )
     if ( meState != eState )
     {
         meState = eState;
-        if ( meState == STATE_NOCHECK )
+        if ( meState == TRISTATE_FALSE )
             ImplGetButtonState() &= ~(BUTTON_DRAW_CHECKED | BUTTON_DRAW_DONTKNOW);
-        else if ( meState == STATE_CHECK )
+        else if ( meState == TRISTATE_TRUE )
         {
             ImplGetButtonState() &= ~BUTTON_DRAW_DONTKNOW;
             ImplGetButtonState() |= BUTTON_DRAW_CHECKED;
         }
-        else // STATE_DONTKNOW
+        else // TRISTATE_INDET
         {
             ImplGetButtonState() &= ~BUTTON_DRAW_CHECKED;
             ImplGetButtonState() |= BUTTON_DRAW_DONTKNOW;
@@ -3129,8 +3129,8 @@ Size RadioButton::GetOptimalSize() const
 
 void CheckBox::ImplInitCheckBoxData()
 {
-    meState         = STATE_NOCHECK;
-    meSaveValue     = STATE_NOCHECK;
+    meState         = TRISTATE_FALSE;
+    meSaveValue     = TRISTATE_FALSE;
     mbTriState      = false;
 }
 
@@ -3240,7 +3240,7 @@ void CheckBox::ImplDrawCheckBoxState()
 
     if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) )
     {
-        ImplControlValue    aControlValue( meState == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
+        ImplControlValue    aControlValue( meState == TRISTATE_TRUE ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
         Rectangle           aCtrlRegion( maStateRect );
         ControlState        nState = 0;
 
@@ -3249,9 +3249,9 @@ void CheckBox::ImplDrawCheckBoxState()
         if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )   nState |= CTRL_STATE_PRESSED;
         if ( IsEnabled() )                      nState |= CTRL_STATE_ENABLED;
 
-        if ( meState == STATE_CHECK )
+        if ( meState == TRISTATE_TRUE )
             aControlValue.setTristateVal( BUTTONVALUE_ON );
-        else if ( meState == STATE_DONTKNOW )
+        else if ( meState == TRISTATE_INDET )
             aControlValue.setTristateVal( BUTTONVALUE_MIXED );
 
         if ( IsMouseOver() && maMouseRect.IsInside( GetPointerPosPixel() ) )
@@ -3266,9 +3266,9 @@ void CheckBox::ImplDrawCheckBoxState()
         sal_uInt16 nStyle = ImplGetButtonState();
         if ( !IsEnabled() )
             nStyle |= BUTTON_DRAW_DISABLED;
-        if ( meState == STATE_DONTKNOW )
+        if ( meState == TRISTATE_INDET )
             nStyle |= BUTTON_DRAW_DONTKNOW;
-        else if ( meState == STATE_CHECK )
+        else if ( meState == TRISTATE_TRUE )
             nStyle |= BUTTON_DRAW_CHECKED;
         Image aImage = GetCheckImage( GetSettings(), nStyle );
         if ( IsZoom() )
@@ -3410,14 +3410,14 @@ void CheckBox::ImplDrawCheckBox( bool bLayout )
 void CheckBox::ImplCheck()
 {
     TriState eNewState;
-    if ( meState == STATE_NOCHECK )
-        eNewState = STATE_CHECK;
+    if ( meState == TRISTATE_FALSE )
+        eNewState = TRISTATE_TRUE;
     else if ( !mbTriState )
-        eNewState = STATE_NOCHECK;
-    else if ( meState == STATE_CHECK )
-        eNewState = STATE_DONTKNOW;
+        eNewState = TRISTATE_FALSE;
+    else if ( meState == TRISTATE_TRUE )
+        eNewState = TRISTATE_INDET;
     else
-        eNewState = STATE_NOCHECK;
+        eNewState = TRISTATE_FALSE;
     meState = eNewState;
 
     ImplDelData aDelData;
@@ -3619,13 +3619,13 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     aStateRect.Top()    += aBrd1Size.Height();
     aStateRect.Right()  -= aBrd1Size.Width();
     aStateRect.Bottom() -= aBrd1Size.Height();
-    if ( meState == STATE_DONTKNOW )
+    if ( meState == TRISTATE_INDET )
         pDev->SetFillColor( Color( COL_LIGHTGRAY ) );
     else
         pDev->SetFillColor( Color( COL_WHITE ) );
     pDev->DrawRect( aStateRect );
 
-    if ( meState == STATE_CHECK )
+    if ( meState == TRISTATE_TRUE )
     {
         aStateRect.Left()   += aBrd2Size.Width();
         aStateRect.Top()    += aBrd2Size.Height();
@@ -3829,8 +3829,8 @@ void CheckBox::Toggle()
 
 void CheckBox::SetState( TriState eState )
 {
-    if ( !mbTriState && (eState == STATE_DONTKNOW) )
-        eState = STATE_NOCHECK;
+    if ( !mbTriState && (eState == TRISTATE_INDET) )
+        eState = TRISTATE_FALSE;
 
     if ( meState != eState )
     {
@@ -3843,7 +3843,7 @@ void CheckBox::SetState( TriState eState )
 bool CheckBox::set_property(const OString &rKey, const OString &rValue)
 {
     if (rKey == "active")
-        SetState(toBool(rValue) ? STATE_CHECK : STATE_NOCHECK);
+        SetState(toBool(rValue) ? TRISTATE_TRUE : TRISTATE_FALSE);
     else
         return Button::set_property(rKey, rValue);
     return true;
@@ -3857,8 +3857,8 @@ void CheckBox::EnableTriState( bool bTriState )
     {
         mbTriState = bTriState;
 
-        if ( !bTriState && (meState == STATE_DONTKNOW) )
-            SetState( STATE_NOCHECK );
+        if ( !bTriState && (meState == TRISTATE_INDET) )
+            SetState( TRISTATE_FALSE );
     }
 }
 
@@ -4129,7 +4129,7 @@ void DisclosureButton::ImplDrawCheckBoxState()
 
     Rectangle aStateRect( GetStateRect() );
 
-    ImplControlValue    aControlValue( GetState() == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
+    ImplControlValue    aControlValue( GetState() == TRISTATE_TRUE ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
     Rectangle           aCtrlRegion( aStateRect );
     ControlState        nState = 0;
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7f4ac6312fda..c845d8cf4d7e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1237,7 +1237,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
             new TriStateBox(pParent, nBits) :
             new CheckBox(pParent, nBits);
         if (bIsTriState)
-            pCheckBox->SetState(STATE_DONTKNOW);
+            pCheckBox->SetState(TRISTATE_INDET);
         pCheckBox->SetImageAlign(IMAGEALIGN_LEFT); //default to left
         pWindow = pCheckBox;
     }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 175af19aa236..b0401ae3545c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3159,11 +3159,11 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
         return;
     }
 
-    if ( pItem->meState == STATE_CHECK )
+    if ( pItem->meState == TRISTATE_TRUE )
     {
         nStyle |= BUTTON_DRAW_CHECKED;
     }
-    else if ( pItem->meState == STATE_DONTKNOW )
+    else if ( pItem->meState == TRISTATE_INDET )
     {
         nStyle |= BUTTON_DRAW_DONTKNOW;
     }
@@ -3176,7 +3176,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
     {
         if ( mnOutStyle & TOOLBOX_STYLE_FLAT )
         {
-            if ( (pItem->meState != STATE_NOCHECK) || !bPaint )
+            if ( (pItem->meState != TRISTATE_FALSE) || !bPaint )
             {
                 ImplErase( this, pItem->maRect, nHighlight != 0, bHasOpenPopup );
             }
@@ -3244,12 +3244,12 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
             nImageOffX += (nBtnWidth-aImageSize.Width())/2;
             nImageOffY += (nBtnHeight-aImageSize.Height())/2;
         }
-        if ( nHighlight != 0 || (pItem->meState == STATE_CHECK) )
+        if ( nHighlight != 0 || (pItem->meState == TRISTATE_TRUE) )
         {
             if( bHasOpenPopup )
                 ImplDrawFloatwinBorder( pItem );
             else
-                ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == STATE_CHECK, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
+                ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
 
             if( nHighlight != 0 )
             {
@@ -3298,12 +3298,12 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
         }
 
         // draw selection only if not already drawn during image output (see above)
-        if ( !bLayout && !bImage && (nHighlight != 0 || (pItem->meState == STATE_CHECK) ) )
+        if ( !bLayout && !bImage && (nHighlight != 0 || (pItem->meState == TRISTATE_TRUE) ) )
         {
             if( bHasOpenPopup )
                 ImplDrawFloatwinBorder( pItem );
             else
-                ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == STATE_CHECK, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
+                ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
         }
 
         sal_uInt16 nTextStyle = 0;
@@ -3340,12 +3340,12 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
         {
             ImplErase( this, aDropDownRect, nHighlight != 0, bHasOpenPopup );
 
-            if( nHighlight != 0 || (pItem->meState == STATE_CHECK) )
+            if( nHighlight != 0 || (pItem->meState == TRISTATE_TRUE) )
             {
                 if( bHasOpenPopup )
                     ImplDrawFloatwinBorder( pItem );
                 else
-                    ImplDrawButton( this, aDropDownRect, nHighlight, pItem->meState == STATE_CHECK, pItem->mbEnabled && IsEnabled(), false );
+                    ImplDrawButton( this, aDropDownRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), false );
             }
         }
         ImplDrawDropdownArrow( this, aDropDownRect, bSetColor, bRotate );
@@ -3576,15 +3576,15 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
                     {
                         if ( pItem->mnBits & TIB_RADIOCHECK )
                         {
-                            if ( pItem->meState != STATE_CHECK )
-                                SetItemState( pItem->mnId, STATE_CHECK );
+                            if ( pItem->meState != TRISTATE_TRUE )
+                                SetItemState( pItem->mnId, TRISTATE_TRUE );
                         }
                         else
                         {
-                            if ( pItem->meState != STATE_CHECK )
-                                pItem->meState = STATE_CHECK;
+                            if ( pItem->meState != TRISTATE_TRUE )
+                                pItem->meState = TRISTATE_TRUE;
                             else
-                                pItem->meState = STATE_NOCHECK;
+                                pItem->meState = TRISTATE_FALSE;
                         }
                     }
 
@@ -5080,15 +5080,15 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
             {
                 if ( pItem->mnBits & TIB_RADIOCHECK )
                 {
-                    if ( pItem->meState != STATE_CHECK )
-                        SetItemState( pItem->mnId, STATE_CHECK );
+                    if ( pItem->meState != TRISTATE_TRUE )
+                        SetItemState( pItem->mnId, TRISTATE_TRUE );
                 }
                 else
                 {
-                    if ( pItem->meState != STATE_CHECK )
-                        pItem->meState = STATE_CHECK;
+                    if ( pItem->meState != TRISTATE_TRUE )
+                        pItem->meState = TRISTATE_TRUE;
                     else
-                        pItem->meState = STATE_NOCHECK;
+                        pItem->meState = TRISTATE_FALSE;
                 }
             }
             mnMouseModifier = aKeyCode.GetModifier();
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f1aad48bcf7b..ea5e3ef2200f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -73,7 +73,7 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
 
     maMenuType = TOOLBOX_MENUTYPE_NONE;
     maMenubuttonItem.maItemSize = Size( TB_MENUBUTTON_SIZE+TB_MENUBUTTON_OFFSET, TB_MENUBUTTON_SIZE+TB_MENUBUTTON_OFFSET );
-    maMenubuttonItem.meState = STATE_NOCHECK;
+    maMenubuttonItem.meState = TRISTATE_FALSE;
     mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
 
 
@@ -106,7 +106,7 @@ void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits,
     mpUserData      = NULL;
     meType          = TOOLBOXITEM_BUTTON;
     mnBits          = nItemBits;
-    meState         = STATE_NOCHECK;
+    meState         = TRISTATE_FALSE;
     mbEnabled       = true;
     mbVisible       = true;
     mbEmptyBtn      = bEmptyBtn;
@@ -1672,7 +1672,7 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
         if ( pItem->meState != eState )
         {
             // Wenn RadioCheck, dann vorherigen unchecken
-            if ( (eState == STATE_CHECK) && (pItem->mnBits & TIB_AUTOCHECK) &&
+            if ( (eState == TRISTATE_TRUE) && (pItem->mnBits & TIB_AUTOCHECK) &&
                  (pItem->mnBits & TIB_RADIOCHECK) )
             {
                 ImplToolItem*    pGroupItem;
@@ -1685,8 +1685,8 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
                     pGroupItem = &mpData->m_aItems[nGroupPos-1];
                     if ( pGroupItem->mnBits & TIB_RADIOCHECK )
                     {
-                        if ( pGroupItem->meState != STATE_NOCHECK )
-                            SetItemState( pGroupItem->mnId, STATE_NOCHECK );
+                        if ( pGroupItem->meState != TRISTATE_FALSE )
+                            SetItemState( pGroupItem->mnId, TRISTATE_FALSE );
                     }
                     else
                         break;
@@ -1699,8 +1699,8 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
                     pGroupItem = &mpData->m_aItems[nGroupPos];
                     if ( pGroupItem->mnBits & TIB_RADIOCHECK )
                     {
-                        if ( pGroupItem->meState != STATE_NOCHECK )
-                            SetItemState( pGroupItem->mnId, STATE_NOCHECK );
+                        if ( pGroupItem->meState != TRISTATE_FALSE )
+                            SetItemState( pGroupItem->mnId, TRISTATE_FALSE );
                     }
                     else
                         break;
@@ -1730,7 +1730,7 @@ TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const
     if ( pItem )
         return pItem->meState;
     else
-        return STATE_NOCHECK;
+        return TRISTATE_FALSE;
 }
 
 
@@ -2139,7 +2139,7 @@ void ToolBox::UpdateCustomMenu()
                 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
                 pMenu->InsertItem( id, it->maText, it->maImage, 0, OString(), 0 );
                 pMenu->EnableItem( id, it->mbEnabled );
-                pMenu->CheckItem ( id, it->meState == STATE_CHECK );
+                pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE );
                 nSepPos++;
             }
         }
@@ -2156,7 +2156,7 @@ void ToolBox::UpdateCustomMenu()
                 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
                 pMenu->InsertItem( id, it->maText, it->maImage, 0, OString(), nSepPos+1 );
                 pMenu->EnableItem( id, it->mbEnabled );
-                pMenu->CheckItem( id, it->meState == STATE_CHECK );
+                pMenu->CheckItem( id, it->meState == TRISTATE_TRUE );
             }
         }
     }