diff options
-rw-r--r-- | include/tools/rc.h | 3 | ||||
-rw-r--r-- | include/tools/rcid.h | 1 | ||||
-rw-r--r-- | include/vcl/field.hxx | 2 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 21 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 3 | ||||
-rw-r--r-- | tools/source/rc/resmgr.cxx | 1 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 41 |
8 files changed, 0 insertions, 73 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 64f397df1d41..14ad10de4ef9 100644 --- a/include/tools/rc.h +++ b/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 diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 260626ed479e..fb204309f7fc 100644 --- a/include/tools/rcid.h +++ b/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) diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index f3d6c8209bdd..0065e1a2e476 100644 --- a/include/vcl/field.hxx +++ b/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; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index b490566e1c15..5834ead61eed 100644 --- a/rsc/inc/rscdb.hxx +++ b/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 ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 24f65dd7e5a0..13c9e59b286a 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/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 ) { diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index de4f0aa358b6..2a6801c7be9a 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/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 ); } } { diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 652f42006bd6..592bf9b09d74 100644 --- a/tools/source/rc/resmgr.cxx +++ b/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 diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 0a651c7f191c..89b6884a4b45 100644 --- a/vcl/source/control/field2.cxx +++ b/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() { } |