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

2017-02-13 Thread Noel Grandin
 include/tools/rcid.h|   14 +++---
 include/tools/resid.hxx |   16 +---
 include/tools/resmgr.hxx|2 +-
 rsc/inc/rscarray.hxx|4 ++--
 rsc/inc/rscclass.hxx|6 +++---
 rsc/inc/rscconst.hxx|5 +++--
 rsc/inc/rsccont.hxx |8 
 rsc/inc/rscflag.hxx |4 ++--
 rsc/inc/rscmgr.hxx  |2 +-
 rsc/inc/rscrange.hxx|   10 +-
 rsc/inc/rscstr.hxx  |2 +-
 rsc/inc/rsctop.hxx  |3 ++-
 rsc/source/parser/rscdb.cxx |8 
 rsc/source/res/rscarray.cxx |4 ++--
 rsc/source/res/rscclass.cxx |6 +++---
 rsc/source/res/rscconst.cxx |4 ++--
 rsc/source/res/rsccont.cxx  |8 
 rsc/source/res/rscflag.cxx  |4 ++--
 rsc/source/res/rscmgr.cxx   |2 +-
 rsc/source/res/rscrange.cxx |   10 +-
 rsc/source/res/rscstr.cxx   |2 +-
 rsc/source/res/rsctop.cxx   |2 +-
 tools/source/rc/resmgr.cxx  |   10 +-
 23 files changed, 70 insertions(+), 66 deletions(-)

New commits:
commit 2b70fb58be039fbd05ea833a40b1b3e9f922e45c
Author: Noel Grandin 
Date:   Mon Feb 13 19:09:17 2017 +0200

Use o3tl::strong_int on RESOURCE_TYPE

Change-Id: I42690c07a611e031963ff41942f530af4a5c672a
Reviewed-on: https://gerrit.libreoffice.org/34220
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 8a58f66..6c6cbf4f 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -30,15 +30,15 @@
 // Resource types
 // Minimum is 0x100 due to MS-Windows resource types
 // (RSC_NOTYPE=0x100) is defined in resid.hxx
-#define RSC_VERSIONCONTROL  (RSC_NOTYPE + 0x02) // Version control
+#define RSC_VERSIONCONTROL  (RSC_NOTYPE + RESOURCE_TYPE(0x02)) // Version 
control
 
-#define RSC_RESOURCE(RSC_NOTYPE + 0x10)
-#define RSC_STRING  (RSC_NOTYPE + 0x11)
-#define RSC_BITMAP  (RSC_NOTYPE + 0x13)
-#define RSC_MENU(RSC_NOTYPE + 0x1c)
-#define RSC_MENUITEM(RSC_NOTYPE + 0x1d) // only used internally
+#define RSC_RESOURCE(RSC_NOTYPE + RESOURCE_TYPE(0x10))
+#define RSC_STRING  (RSC_NOTYPE + RESOURCE_TYPE(0x11))
+#define RSC_BITMAP  (RSC_NOTYPE + RESOURCE_TYPE(0x13))
+#define RSC_MENU(RSC_NOTYPE + RESOURCE_TYPE(0x1c))
+#define RSC_MENUITEM(RSC_NOTYPE + RESOURCE_TYPE(0x1d)) // only 
used internally
 
-#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
+#define RSC_STRINGARRAY (RSC_NOTYPE + RESOURCE_TYPE(0x79))
 
 // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
 
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 480f5b7..53a229b 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -24,10 +24,12 @@
 #include 
 #include 
 #include 
+#include 
 
 struct RSHEADER_TYPE;
-typedef sal_uInt32 RESOURCE_TYPE;
-#define RSC_NOTYPE  0x100
+struct RESOURCE_TYPE_Tag {};
+typedef o3tl::strong_int RESOURCE_TYPE;
+#define RSC_NOTYPE  RESOURCE_TYPE(0x100)
 #define RSC_DONTRELEASE (sal_uInt32(1U << 31))
 
 class ResMgr;
@@ -45,11 +47,11 @@ class SAL_WARN_UNUSED ResId
 release the Resource context after loading this id.
 */
 RSHEADER_TYPE*  m_pResource;
-mutable sal_uInt32  m_nResId;  // Resource Identifier
+mutable RESOURCE_TYPE   m_nResId;  // Resource Identifier
 mutable RESOURCE_TYPE   m_nRT; // type for loading (mutable to be 
set later)
 mutable ResMgr *m_pResMgr; // load from this ResMgr (mutable 
for setting on demand)
 
-void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
+void ImplInit( RESOURCE_TYPE nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
 {
 m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = 

 OSL_ENSURE( m_pResMgr != nullptr, "ResId without ResMgr created" );
@@ -60,7 +62,7 @@ public:
 {
 ImplInit( 0, rMgr, pRc );
 }
-ResId( sal_uInt32 nId, ResMgr& rMgr )
+ResId( RESOURCE_TYPE nId, ResMgr& rMgr )
 {
 ImplInit( nId, rMgr, nullptr );
 }
@@ -87,9 +89,9 @@ public:
 ResMgr *GetResMgr() const { return m_pResMgr; }
 voidClearResMgr() const { m_pResMgr = nullptr; }
 
-boolIsAutoRelease()  const { return !(m_nResId & 
RSC_DONTRELEASE); }
+boolIsAutoRelease()  const { return !(sal_uInt32(m_nResId) & 
RSC_DONTRELEASE); }
 
-sal_uInt32  GetId()  const { return m_nResId & 
~RSC_DONTRELEASE; }
+sal_uInt32  GetId()  const { return sal_uInt32(m_nResId) & 
~RSC_DONTRELEASE; }
 RSHEADER_TYPE*  GetpResource()   const { return m_pResource; }
 
 TOOLS_DLLPUBLIC OUString toString() const;
diff --git 

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

2016-10-06 Thread Caolán McNamara
 include/tools/color.hxx|3 ---
 include/tools/rc.h |3 ---
 rsc/inc/rscdb.hxx  |1 -
 rsc/source/parser/rscicpx.cxx  |   24 
 tools/source/generic/color.cxx |   29 -
 5 files changed, 60 deletions(-)

New commits:
commit 8e61b0150b9d62d8ffd40089f69f49055187c998
Author: Caolán McNamara 
Date:   Thu Oct 6 15:34:05 2016 +0100

drop loading Colors from src files

Change-Id: I43f2fda133371a1284a53beeeb774552210c7e3f

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 659da71..3b7cd38 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -23,7 +23,6 @@
 #include 
 
 class SvStream;
-class ResId;
 
 #include 
 
@@ -47,8 +46,6 @@ public:
 Color(sal_uInt8 nTransparency, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 
nBlue)
 : mnColor(TRGB_COLORDATA(nTransparency, nRed, nGreen, nBlue))
 {}
-// This ctor is defined in svtools, not tools!
-Color(const ResId& rResId);
 
 // constructor to create a tools-Color from ::basegfx::BColor
 explicit Color(const basegfx::BColor& rBColor)
diff --git a/include/tools/rc.h b/include/tools/rc.h
index fefaede..e213e6f 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -153,9 +153,6 @@ namespace o3tl {
 template<> struct typed_flags : 
is_typed_flags {};
 }
 
-// FIXME obsolete, should be removed by MM
-#define RSC_COLOR   (RSC_NOTYPE + 0x16)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 3e80b39..4f507f4 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -176,7 +176,6 @@ class RscTypCont
 RscTop *InitClassMgr();
 RscTop *InitClassString( RscTop * pSuper );
 RscTop *InitClassBitmap( RscTop * pSuper );
-RscTop *InitClassColor( RscTop * pSuper, RscEnum * pColor );
 RscTop *InitClassImage( RscTop * pSuper, RscTop *pClassBitmap );
 RscTop *InitClassImageList( RscTop * pSuper, RscCont * pStrLst );
 RscTop *InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e67747c..e757a7b 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -114,30 +114,6 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper )
 return pClassBitmap;
 }
 
-RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor )
-{
-AtomnId;
-RscTop *pClassColor;
-
-// initialize class
-nId = pHS->getID( "Color" );
-pClassColor = new RscClass( nId, RSC_COLOR, pSuper );
-pClassColor->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-aNmTb.Put( nId, CLASSNAME, pClassColor );
-
-// initialize variables
-nId = aNmTb.Put( "Red", VARNAME );
-pClassColor->SetVariable( nId,  );
-nId = aNmTb.Put( "Green", VARNAME );
-pClassColor->SetVariable( nId,  );
-nId = aNmTb.Put( "Blue", VARNAME );
-pClassColor->SetVariable( nId,  );
-nId = aNmTb.Put( "Predefine", VARNAME );
-pClassColor->SetVariable( nId, pColor );
-
-return pClassColor;
-}
-
 RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap )
 {
 AtomnId;
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index c5a14c5..2c59bc4 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -26,38 +26,9 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 
-Color::Color( const ResId& rResId )
-{
-rResId.SetRT( RSC_COLOR );
-ResMgr* pResMgr = rResId.GetResMgr();
-if ( pResMgr && pResMgr->GetResource( rResId ) )
-{
-// Header ueberspringen
-pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
-
-// Daten laden
-sal_uInt16 nRed = pResMgr->ReadShort();
-sal_uInt16 nGreen   = pResMgr->ReadShort();
-sal_uInt16 nBlue= pResMgr->ReadShort();
-// one more historical sal_uIntPtr
-pResMgr->ReadLong();
-
-// RGB-Farbe
-mnColor = RGB_COLORDATA( nRed>>8, nGreen>>8, nBlue>>8 );
-}
-else
-{
-mnColor = RGB_COLORDATA( 0, 0, 0 );
-}
-}
-
 sal_uInt8 Color::GetColorError( const Color& rCompareColor ) const
 {
 const long nErrAbs = labs( (long) rCompareColor.GetRed() - GetRed() ) +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-08-16 Thread 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/edit.cxx   |4 +---
 6 files changed, 2 insertions(+), 30 deletions(-)

New commits:
commit b0da096c610b4392277a3b7fe3c7c29d2c8c3fcf
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Aug 16 18:33:04 2014 +0100

RSC_MULTILINEEDIT no longer used

Change-Id: If56233b5226cec9516d5e2f8992e1b0beae733bf

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 74fdef6..d3b4e63 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -74,7 +74,7 @@
 #define RSC_CHECKBOX(RSC_NOTYPE + 0x50)
 #define RSC_TRISTATEBOX (RSC_NOTYPE + 0x51)
 #define RSC_EDIT(RSC_NOTYPE + 0x52)
-#define RSC_MULTILINEEDIT   (RSC_NOTYPE + 0x53)
+
 #define RSC_COMBOBOX(RSC_NOTYPE + 0x54)
 #define RSC_LISTBOX (RSC_NOTYPE + 0x55)
 
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c688190..b8fc762 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -180,7 +180,6 @@ class RscTypCont
 RscTop *InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
 RscEnum * pTriState );
 RscTop *InitClassEdit( RscTop * pSuper );
-RscTop *InitClassMultiLineEdit( RscTop * pSuper );
 RscTop *InitClassScrollBar( RscTop * pSuper );
 RscTop *InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
 RscTop *InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 0760f32..195f6af 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -542,26 +542,6 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
 return pClassEdit;
 }
 
-RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper )
-{
-AtomnId;
-RscTop *pClassMultiLineEdit;
-
-// Klasse anlegen
-nId = pHS-getID( MultiLineEdit );
-pClassMultiLineEdit = new RscClass( nId, RSC_MULTILINEEDIT, pSuper );
-pClassMultiLineEdit-SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
-aNmTb.Put( nId, CLASSNAME, pClassMultiLineEdit );
-
-INS_WINBIT( pClassMultiLineEdit, HScroll );
-INS_WINBIT( pClassMultiLineEdit, VScroll );
-INS_WINBIT( pClassMultiLineEdit, IgnoreTab );
-INS_WINBIT( pClassMultiLineEdit, AutoVScroll )
-
-return pClassMultiLineEdit;
-}
-
 RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
 {
 AtomnId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 7068140..0aecf07 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -84,7 +84,6 @@ void RscTypCont::Init()
 RscTop   *  pClassImageButton;
 RscTop   *  pClassTriStateBox;
 RscTop   *  pClassEdit;
-RscTop   *  pClassMultiLineEdit;
 RscTop   *  pClassListBox;
 RscTop   *  pClassComboBox;
 RscTop   *  pClassFixedText;
@@ -427,9 +426,6 @@ void RscTypCont::Init()
 
 pClassEdit = InitClassEdit( pClassControl );
 pRoot-Insert( pClassEdit );
-
-pClassMultiLineEdit = InitClassMultiLineEdit( pClassEdit );
-pRoot-Insert( pClassMultiLineEdit );
 }
 {
 pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList 
);
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d3f02e8..a41f981 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1483,7 +1483,6 @@ OString ResMgr::GetAutoHelpId()
 case RSC_CHECKBOX:  aHID.append( CheckBox ); 
break;
 case RSC_TRISTATEBOX:   aHID.append( TriStateBox );  
break;
 case RSC_EDIT:  aHID.append( Edit ); 
break;
-case RSC_MULTILINEEDIT: aHID.append( MultiLineEdit 
);break;
 case RSC_LISTBOX:   aHID.append( ListBox );  
break;
 case RSC_COMBOBOX:  aHID.append( ComboBox ); 
break;
 case RSC_PUSHBUTTON:aHID.append( PushButton );   
break;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e03f0e5..bf6b283 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -177,9 +177,7 @@ Edit::Edit( Window* pParent, const ResId rResId ) :
 ImplInit( pParent, nStyle );
 ImplLoadRes( rResId );
 
-// Derived MultiLineEdit takes care to call Show only after MultiLineEdit
-// ctor has already started:
-if ( !(nStyle  WB_HIDE)  rResId.GetRT() != RSC_MULTILINEEDIT )
+if ( !(nStyle  WB_HIDE) )
 Show();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

2014-08-16 Thread 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 caol...@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 )
-{
-AtomnId;
-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 =