diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-13 09:48:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-13 11:18:37 +0000 |
commit | feff54d8ceeb42d5c9d7fec9b7ec1b99236c6dcb (patch) | |
tree | 1ab1cda966410cf0153224d33b861e91979b7327 | |
parent | 1de7c36a94a65cd3906f79066b33381df929b71b (diff) |
MetricBoxes cannot be loaded from .src anymore
Change-Id: Id7b44402975ed75171f4475aa64ebd2a3d6bd687
-rw-r--r-- | include/tools/rcid.h | 2 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 17 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 11 | ||||
-rw-r--r-- | tools/source/rc/resmgr.cxx | 1 |
5 files changed, 1 insertions, 31 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index cdc8107fcae4..17b81cdbac8c 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -97,7 +97,7 @@ #define RSC_TIMEFIELD (RSC_NOTYPE + 0x67) #define RSC_PATTERNBOX (RSC_NOTYPE + 0x68) #define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) -#define RSC_METRICBOX (RSC_NOTYPE + 0x6a) + diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 8e6df88bf055..b71e094f54eb 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -224,7 +224,6 @@ class RscTypCont RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ); RscTop * InitClassPatternBox( RscTop * pSuper ); RscTop * InitClassNumericBox( RscTop * pSuper ); - RscTop * InitClassMetricBox( RscTop * pSuper ); RscTop * InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 18a29f6477d3..5bd3dcdf34d2 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1560,23 +1560,6 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) return pClassNumericBox; } -RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassMetricBox; - - // Klasse anlegen - nId = pHS->getID( "MetricBox" ); - pClassMetricBox = new RscClass( nId, RSC_METRICBOX, pSuper ); - pClassMetricBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - - aNmTb.Put( nId, CLASSNAME, pClassMetricBox ); - - // Variablen anlegen - - return pClassMetricBox; -} - RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 5928f97c432a..1d73ffaf6968 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -122,7 +122,6 @@ void RscTypCont::Init() RscTop * pClassTimeField; RscTop * pClassPatternBox; RscTop * pClassNumericBox; - RscTop * pClassMetricBox; RscTop * pClassDockingWindow; RscTop * pClassToolBoxItem; RscTop * pClassToolBox; @@ -656,16 +655,6 @@ void RscTypCont::Init() } } { - { // Mehrfachvererbung von Hand - RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox ); - aBaseLst.push_back( pClassTmp ); - pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits ); - aBaseLst.push_back( pClassTmp ); - - pClassMetricBox = InitClassMetricBox( pClassTmp ); - pRoot->Insert( pClassMetricBox ); - } - pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pRoot->Insert( pClassDockingWindow ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 952392234a41..a8c123f9716d 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1498,7 +1498,6 @@ OString ResMgr::GetAutoHelpId() case RSC_DATEFIELD: aHID.append( "DateField" ); break; case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; - case RSC_METRICBOX: aHID.append( "MetricBox" ); break; case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; default: |