TimeFields not loaded from resource files anymore

Change-Id: Idf69d375eff4bfff7115e59530b37200ee79f086

include/tools/rc.h

@@ -118,9 +118,6 @@ typedef short RSWND_STYLE;
 #define DATEFIELD_FIRST                 0x01
 #define DATEFIELD_LAST                  0x02
 
-#define TIMEFIELD_FIRST                 0x01
-#define TIMEFIELD_LAST                  0x02
-
 // For "ToolBoxItem" resources:
 #define RSC_TOOLBOXITEM_ID              0x0001
 #define RSC_TOOLBOXITEM_TYPE            0x0002

include/tools/rcid.h

@@ -79,7 +79,6 @@
 #define RSC_METRICFIELD         (RSC_NOTYPE + 0x64)
 
 #define RSC_DATEFIELD           (RSC_NOTYPE + 0x66)
-#define RSC_TIMEFIELD           (RSC_NOTYPE + 0x67)
 
 
 #define RSC_TOOLBOXITEM         (RSC_NOTYPE + 0x70)

include/vcl/field.hxx

@@ -667,11 +667,9 @@ private:
 
 protected:
     SAL_DLLPRIVATE void     ImplTimeSpinArea( bool bUp );
-    SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
     explicit                TimeField( vcl::Window* pParent, WinBits nWinStyle );
-    explicit                TimeField( vcl::Window* pParent, const ResId& );
     virtual                 ~TimeField();
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;

rsc/inc/rscdb.hxx

@@ -219,7 +219,6 @@ class RscTypCont
     RscTop *    InitClassNumericField( RscTop * pSuper );
     RscTop *    InitClassMetricField( RscTop * pSuper );
     RscTop *    InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
-    RscTop *    InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
 
     RscTop *    InitClassDockingWindow( RscTop * pSuper,
                                         RscEnum * pMapUnit );

rsc/source/parser/rscicpx.cxx

@@ -1193,27 +1193,6 @@ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
     return pClassDateField;
 }
 
-RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime )
-{
-    Atom        nId;
-    RscTop *    pClassTimeField;
-
-    // Klasse anlegen
-    nId = pHS->getID( "TimeField" );
-    pClassTimeField = new RscClass( nId, RSC_TIMEFIELD, pSuper );
-    pClassTimeField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
-    aNmTb.Put( nId, CLASSNAME, pClassTimeField );
-
-    // Variablen anlegen
-    nId = aNmTb.Put( "First", VARNAME );
-    pClassTimeField->SetVariable( nId, pClassTime, NULL, 0, TIMEFIELD_FIRST );
-    nId = aNmTb.Put( "Last", VARNAME );
-    pClassTimeField->SetVariable( nId, pClassTime, NULL, 0, TIMEFIELD_LAST );
-
-    return pClassTimeField;
-}
-
 RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
                                              RscEnum * pMapUnit )
 {

rsc/source/parser/rscinit.cxx

@@ -94,7 +94,6 @@ void RscTypCont::Init()
     RscTop   *  pClassNumericField;
     RscTop   *  pClassMetricField;
     RscTop   *  pClassDateField;
-    RscTop   *  pClassTimeField;
     RscTop   *  pClassDockingWindow;
     RscTop   *  pClassToolBoxItem;
     RscTop   *  pClassToolBox;
@@ -481,8 +480,6 @@ void RscTypCont::Init()
                                                  pTimeFieldFormat );
     aBaseLst.push_back( pClassTmp );
 
-    pClassTimeField = InitClassTimeField( pClassTmp, pClassTime );
-    pRoot->Insert( pClassTimeField );
     }
 }
 {

tools/source/rc/resmgr.cxx

@@ -1483,7 +1483,6 @@ OString ResMgr::GetAutoHelpId()
                     case RSC_NUMERICFIELD:      aHID.append( "NumericField" );     break;
                     case RSC_METRICFIELD:       aHID.append( "MetricField" );      break;
                     case RSC_DATEFIELD:         aHID.append( "DateField" );        break;
-                    case RSC_TIMEFIELD:         aHID.append( "TimeField" );        break;
                     case RSC_IMAGEBUTTON:       aHID.append( "ImageButton" );      break;
                     default:
                         // no type, no auto HID

vcl/source/control/field2.cxx

@@ -2652,47 +2652,6 @@ TimeField::TimeField( vcl::Window* pParent, WinBits nWinStyle ) :
     Reformat();
 }
 
-TimeField::TimeField( vcl::Window* pParent, const ResId& rResId ) :
-    SpinField( WINDOW_TIMEFIELD ),
-    maFirst( GetMin() ),
-    maLast( GetMax() )
-{
-    rResId.SetRT( RSC_TIMEFIELD );
-    WinBits nStyle = ImplInitRes( rResId );
-    SpinField::ImplInit( pParent, nStyle );
-    SetField( this );
-    SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, false, false ) );
-    ImplLoadRes( rResId );
-
-    if ( !(nStyle & WB_HIDE ) )
-        Show();
-}
-
-void TimeField::ImplLoadRes( const ResId& rResId )
-{
-    SpinField::ImplLoadRes( rResId );
-    ResMgr* pMgr = rResId.GetResMgr();
-    if( pMgr )
-    {
-        TimeFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-
-        sal_uLong      nMask = ReadLongRes();
-
-        if ( TIMEFIELD_FIRST & nMask )
-        {
-            maFirst = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-            IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) );
-        }
-        if ( TIMEFIELD_LAST & nMask )
-        {
-            maLast = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-            IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) );
-        }
-    }
-
-    Reformat();
-}
-
 TimeField::~TimeField()
 {
 }