summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-06 12:07:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-06 12:34:46 +0100
commitc8c4f28f1131f4e993f5cc7693077457b03b4400 (patch)
treefbf5a408c82e0e753679637b7227afef95f02e32 /rsc
parent65b1fee217f03dcaff498ba21fac77ef8a320a0b (diff)
no MetricFields are loaded from .src files now
Change-Id: I4b30cbc7bc6a3a3a635c3889d43b7fa6513209f5
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscdb.hxx3
-rw-r--r--rsc/source/parser/rscicpx.cxx48
-rw-r--r--rsc/source/parser/rscinit.cxx9
3 files changed, 0 insertions, 60 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 6e3f6d955b49..dee45c8eddb1 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -199,12 +199,9 @@ class RscTypCont
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
RscTop * InitClassNumericFormatter( RscTop * pSuper );
- RscTop * InitClassMetricFormatter( RscTop * pSuper,
- RscEnum * pFieldUnits );
RscTop * InitClassSpinField( RscTop * pSuper );
RscTop * InitClassNumericField( RscTop * pSuper );
- RscTop * InitClassMetricField( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 39db9c852da3..56a6c2ea1142 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -800,28 +800,6 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
return pClassNumeric;
}
-RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper,
- RscEnum * pFieldUnits )
-{
- Atom nId;
- RscTop * pClassMetric;
-
- // initialize class
- nId = pHS->getID( "MetricFormatter" );
- pClassMetric = new RscClass( nId, RSC_NOTYPE, pSuper );
- pClassMetric->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
- // initialize variables
- nId = aNmTb.Put( "Unit", VARNAME );
- pClassMetric->SetVariable( nId, pFieldUnits, nullptr,
- 0, (sal_uInt32)RscMetricFormatterFlags::Unit );
- nId = aNmTb.Put( "CustomUnitText", VARNAME );
- pClassMetric->SetVariable( nId, &aLangString, nullptr,
- 0, (sal_uInt32)RscMetricFormatterFlags::CustomUnitText );
-
- return pClassMetric;
-}
-
RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper )
{
Atom nId;
@@ -865,32 +843,6 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper )
return pClassNumericField;
}
-RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassMetricField;
-
- // initialize class
- nId = pHS->getID( "MetricField" );
- pClassMetricField = new RscClass( nId, RSC_METRICFIELD, pSuper );
- pClassMetricField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassMetricField );
-
- // initialize variables
- nId = aNmTb.Put( "First", VARNAME );
- pClassMetricField->SetVariable( nId, &aIdLong, nullptr,
- 0, (sal_uInt32)RscMetricFieldFlags::First );
- nId = aNmTb.Put( "Last", VARNAME );
- pClassMetricField->SetVariable( nId, &aIdLong, nullptr,
- 0, (sal_uInt32)RscMetricFieldFlags::Last );
- nId = aNmTb.Put( "SpinSize", VARNAME );
- pClassMetricField->SetVariable( nId, &aIdLong, nullptr,
- 0, (sal_uInt32)RscMetricFieldFlags::SpinSize );
-
- return pClassMetricField;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 7a363813c8d1..022889a010f9 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -396,15 +396,6 @@ void RscTypCont::Init()
RscTop* pClassNumericField = InitClassNumericField( pClassTmp );
pRoot->Insert( pClassNumericField );
}
- { // hand-made multiple inheritance
- RscTop* pClassTmp = InitClassNumericFormatter( pClassSpinField );
- aBaseLst.push_back( pClassTmp );
- pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
- aBaseLst.push_back( pClassTmp );
-
- RscTop* pClassMetricField = InitClassMetricField( pClassTmp );
- pRoot->Insert( pClassMetricField );
- }
}
{
RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );