Kaydet (Commit) 1eeb20f3 authored tarafından Caolán McNamara's avatar Caolán McNamara

CurrencyFields cannot be loaded from .src anymore

Change-Id: I3ccdb71e39a13dc8c697d3a52dc693cff10c614d
üst feff54d8
......@@ -92,7 +92,7 @@
#define RSC_PATTERNFIELD (RSC_NOTYPE + 0x62)
#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63)
#define RSC_METRICFIELD (RSC_NOTYPE + 0x64)
#define RSC_CURRENCYFIELD (RSC_NOTYPE + 0x65)
#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
......@@ -101,7 +101,7 @@
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
......
......@@ -600,9 +600,8 @@ public:
class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
{
public:
CurrencyField( Window* pParent, WinBits nWinStyle );
~CurrencyField();
CurrencyField( Window* pParent, WinBits nWinStyle );
~CurrencyField();
virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
......
......@@ -218,8 +218,6 @@ class RscTypCont
RscTop * InitClassPatternField( RscTop * pSuper );
RscTop * InitClassNumericField( RscTop * pSuper );
RscTop * InitClassMetricField( RscTop * pSuper );
RscTop * InitClassCurrencyField( const char * pClassName, sal_uInt32 nRT,
RscTop * pSuper );
RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
RscTop * InitClassPatternBox( RscTop * pSuper );
......
......@@ -1455,37 +1455,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
return pClassMetricField;
}
RscTop * RscTypCont::InitClassCurrencyField
(
const char * pClassName,
sal_uInt32 nRT,
RscTop * pSuper
)
{
Atom nId;
RscTop * pClassCurrencyField;
// Klasse anlegen
nId = pHS->getID( pClassName );
pClassCurrencyField = new RscClass( nId, nRT, pSuper );
pClassCurrencyField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassCurrencyField );
// Variablen anlegen
nId = aNmTb.Put( "First", VARNAME );
pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
0, CURRENCYFIELD_FIRST );
nId = aNmTb.Put( "Last", VARNAME );
pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
0, CURRENCYFIELD_LAST );
nId = aNmTb.Put( "SpinSize", VARNAME );
pClassCurrencyField->SetVariable( nId, &aIdLong, NULL,
0, CURRENCYFIELD_SPINSIZE );
return pClassCurrencyField;
}
RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
{
Atom nId;
......
......@@ -116,8 +116,6 @@ void RscTypCont::Init()
RscTop * pClassPatternField;
RscTop * pClassNumericField;
RscTop * pClassMetricField;
RscTop * pClassCurrencyField;
RscTop * pClassLongCurrencyField;
RscTop * pClassDateField;
RscTop * pClassTimeField;
RscTop * pClassPatternBox;
......@@ -610,19 +608,6 @@ void RscTypCont::Init()
pClassMetricField = InitClassMetricField( pClassTmp );
pRoot->Insert( pClassMetricField );
}
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassCurrencyFormatter( pClassTmp );
aBaseLst.push_back( pClassTmp );
pClassCurrencyField = InitClassCurrencyField( "CurrencyField", RSC_CURRENCYFIELD, pClassTmp );
pRoot->Insert( pClassCurrencyField );
pClassLongCurrencyField = InitClassCurrencyField( "LongCurrencyField", RSC_LONGCURRENCYFIELD, pClassTmp );
pRoot->Insert( pClassLongCurrencyField );
}
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate );
......
......@@ -1494,7 +1494,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break;
case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break;
case RSC_METRICFIELD: aHID.append( "MetricField" ); break;
case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break;
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment