summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-13 09:46:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-13 11:18:37 +0000
commit1de7c36a94a65cd3906f79066b33381df929b71b (patch)
treeadad01d09a2e16bf533342441f9f2ad71fd89cf2
parent4737ed363a93d1c1743fd38251a91a988fde5ce7 (diff)
CurrencyBoxes cannot be loaded from .src anymore
Change-Id: I662aab01ecf5f78c4406838118ccea3988060521
-rw-r--r--include/tools/rcid.h4
-rw-r--r--include/vcl/field.hxx1
-rw-r--r--rsc/inc/rscdb.hxx2
-rw-r--r--rsc/source/parser/rscicpx.cxx22
-rw-r--r--rsc/source/parser/rscinit.cxx13
-rw-r--r--tools/source/rc/resmgr.cxx1
6 files changed, 2 insertions, 41 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 2fbeb212b856..cdc8107fcae4 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -98,11 +98,11 @@
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
-#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
+
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
-#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
+
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index e9bd9e5f4440..6e037fb81320 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -777,7 +777,6 @@ class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
{
public:
explicit CurrencyBox( Window* pParent, WinBits nWinStyle );
- explicit CurrencyBox( Window* pParent, const ResId& );
virtual ~CurrencyBox();
virtual bool PreNotify( NotifyEvent& rNEvt );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 9101f63b6034..8e6df88bf055 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -225,8 +225,6 @@ class RscTypCont
RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassMetricBox( RscTop * pSuper );
- RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
- RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 679cd4c1855f..18a29f6477d3 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1577,28 +1577,6 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
return pClassMetricBox;
}
-RscTop * RscTypCont::InitClassCurrencyBox
-(
- const char * pClassName,
- sal_uInt32 nRT,
- RscTop * pSuper
-)
-{
- Atom nId;
- RscTop * pClassCurrencyBox;
-
- // Klasse anlegen
- nId = pHS->getID( pClassName );
- pClassCurrencyBox = new RscClass( nId, nRT, pSuper );
- pClassCurrencyBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassCurrencyBox );
-
- // Variablen anlegen
-
- return pClassCurrencyBox;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index cd0003d6a3ff..5928f97c432a 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -123,8 +123,6 @@ void RscTypCont::Init()
RscTop * pClassPatternBox;
RscTop * pClassNumericBox;
RscTop * pClassMetricBox;
- RscTop * pClassCurrencyBox;
- RscTop * pClassLongCurrencyBox;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -667,18 +665,7 @@ void RscTypCont::Init()
pClassMetricBox = InitClassMetricBox( pClassTmp );
pRoot->Insert( pClassMetricBox );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.push_back( pClassTmp );
- pClassTmp = InitClassCurrencyFormatter( pClassTmp );
- aBaseLst.push_back( pClassTmp );
-
- pClassCurrencyBox = InitClassCurrencyBox( "CurrencyBox", RSC_CURRENCYBOX, pClassTmp );
- pRoot->Insert( pClassCurrencyBox );
- pClassLongCurrencyBox = InitClassCurrencyBox( "LongCurrencyBox", RSC_LONGCURRENCYBOX, pClassTmp );
- pRoot->Insert( pClassLongCurrencyBox );
- }
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 75cff3efe254..952392234a41 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1499,7 +1499,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
- case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default: