CurrencyFields cannot be loaded from .src anymore

Change-Id: I3ccdb71e39a13dc8c697d3a52dc693cff10c614d

6 files changed, 4 insertions, 54 deletions

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 17b81cdbac8c..0b2ac1711d70 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -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)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 6e037fb81320..435bed63eb32 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -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 );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b71e094f54eb..e36e296a29fc 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -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 );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 5bd3dcdf34d2..432cc80e813c 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -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;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1d73ffaf6968..abcc5942e282 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -116,8 +116,6 @@ void RscTypCont::Init()
     RscTop   *  pClassPatternField;
     RscTop   *  pClassNumericField;
     RscTop   *  pClassMetricField;
-    RscTop   *  pClassCurrencyField;
-    RscTop   *  pClassLongCurrencyField;
     RscTop   *  pClassDateField;
     RscTop   *  pClassTimeField;
     RscTop   *  pClassPatternBox;
@@ -612,19 +610,6 @@ void RscTypCont::Init()
     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 );
     aBaseLst.push_back( pClassTmp );
 
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index a8c123f9716d..e8bd4479c054 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -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;