diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-12-31 15:04:30 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-31 18:10:51 +0000 |
commit | 756fe1b298762ed145784a09c512d793d9c6fa92 (patch) | |
tree | c4fc65efc1668975f7d36770c5fc480fb73540d0 /rsc | |
parent | d21d606236d7d9d93cfba0a16c3d9ec4473ef8f0 (diff) |
drop dateformatter resource loading
Change-Id: Ie94c7502b0a82ca406b8d76e18def7bab8233a00
Diffstat (limited to 'rsc')
-rw-r--r-- | rsc/inc/rscdb.hxx | 3 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 77 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 13 |
3 files changed, 0 insertions, 93 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index e53c902475c8..ce37ba54b8eb 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -205,17 +205,14 @@ class RscTypCont RscTop * pClassKeyCode ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); RscTop * InitClassSplitWindow( RscTop * pSuper ); - RscTop * InitClassDate( RscTop * pSuper ); RscTop * InitClassNumericFormatter( RscTop * pSuper ); RscTop * InitClassMetricFormatter( RscTop * pSuper, RscEnum * pFieldUnits ); - RscTop * InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate ); RscTop * InitClassSpinField( RscTop * pSuper ); RscTop * InitClassNumericField( RscTop * pSuper ); RscTop * InitClassMetricField( RscTop * pSuper ); - RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate ); RscTop * InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 19c61647cea0..f62ff3e61ba7 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -929,31 +929,6 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) return pClassSplitWindow; } -RscTop * RscTypCont::InitClassDate( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassDate; - - // Klasse anlegen - nId = pHS->getID( "Date" ); - pClassDate = new RscClass( nId, RSC_DATE, pSuper ); - pClassDate->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - - aNmTb.Put( nId, CLASSNAME, pClassDate ); - - // Variablen anlegen - nId = aNmTb.Put( "Year", VARNAME ); - pClassDate->SetVariable( nId, &a0to9999Short, NULL, 0, DATE_YEAR ); - - nId = aNmTb.Put( "Month", VARNAME ); - pClassDate->SetVariable( nId, &a1to12Short, NULL, 0, DATE_MONTH ); - - nId = aNmTb.Put( "Day", VARNAME ); - pClassDate->SetVariable( nId, &a1to31Short, NULL, 0, DATE_DAY ); - - return pClassDate; -} - RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) { Atom nId; @@ -1009,37 +984,6 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, return pClassMetric; } -RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper, - RscTop * pClassDate ) -{ - Atom nId; - RscTop * pClassDateF; - - // Klasse anlegen - nId = pHS->getID( "DateFormatter" ); - pClassDateF = new RscClass( nId, RSC_NOTYPE, pSuper ); - pClassDateF->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - - // Variablen anlegen - nId = aNmTb.Put( "Minimum", VARNAME ); - pClassDateF->SetVariable( nId, pClassDate, NULL, - 0, DATEFORMATTER_MIN ); - nId = aNmTb.Put( "Maximum", VARNAME ); - pClassDateF->SetVariable( nId, pClassDate, NULL, - 0, DATEFORMATTER_MAX ); - nId = aNmTb.Put( "LongFormat", VARNAME ); - pClassDateF->SetVariable( nId, &aBool, NULL, - 0, DATEFORMATTER_LONGFORMAT ); - nId = aNmTb.Put( "StrictFormat", VARNAME ); - pClassDateF->SetVariable( nId, &aBool, NULL, - 0, DATEFORMATTER_STRICTFORMAT ); - nId = aNmTb.Put( "Value", VARNAME ); - pClassDateF->SetVariable( nId, pClassDate, NULL, - 0, DATEFORMATTER_VALUE ); - - return pClassDateF; -} - RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) { Atom nId; @@ -1109,27 +1053,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) return pClassMetricField; } -RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate ) -{ - Atom nId; - RscTop * pClassDateField; - - // Klasse anlegen - nId = pHS->getID( "DateField" ); - pClassDateField = new RscClass( nId, RSC_DATEFIELD, pSuper ); - pClassDateField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - - aNmTb.Put( nId, CLASSNAME, pClassDateField ); - - // Variablen anlegen - nId = aNmTb.Put( "First", VARNAME ); - pClassDateField->SetVariable( nId, pClassDate, NULL, 0, DATEFIELD_FIRST ); - nId = aNmTb.Put( "Last", VARNAME ); - pClassDateField->SetVariable( nId, pClassDate, NULL, 0, DATEFIELD_LAST ); - - return pClassDateField; -} - RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 1ffc64f83fa5..94eb8900bf97 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -87,11 +87,9 @@ void RscTypCont::Init() RscTop * pClassMenu; RscTop * pClassSplitWindow; RscTop * pClassSpinButton; - RscTop * pClassDate; RscTop * pClassSpinField; RscTop * pClassNumericField; RscTop * pClassMetricField; - RscTop * pClassDateField; RscTop * pClassDockingWindow; RscTop * pClassToolBoxItem; RscTop * pClassToolBox; @@ -438,10 +436,6 @@ void RscTypCont::Init() pRoot->Insert( pClassSpinButton ); } { - pClassDate = InitClassDate( pClassMgr ); - pRoot->Insert( pClassDate ); -} -{ pClassSpinField = InitClassSpinField( pClassEdit ); pRoot->Insert( pClassSpinField ); } @@ -462,13 +456,6 @@ void RscTypCont::Init() pClassMetricField = InitClassMetricField( pClassTmp ); pRoot->Insert( pClassMetricField ); } - { // Mehrfachvererbung von Hand - RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate ); - aBaseLst.push_back( pClassTmp ); - - pClassDateField = InitClassDateField( pClassTmp, pClassDate ); - pRoot->Insert( pClassDateField ); - } } { pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); |