From feff54d8ceeb42d5c9d7fec9b7ec1b99236c6dcb Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 13 Mar 2014 09:48:37 +0000
Subject: MetricBoxes cannot be loaded from .src anymore

Change-Id: Id7b44402975ed75171f4475aa64ebd2a3d6bd687
---
 rsc/inc/rscdb.hxx             |  1 -
 rsc/source/parser/rscicpx.cxx | 17 -----------------
 rsc/source/parser/rscinit.cxx | 11 -----------
 3 files changed, 29 deletions(-)

(limited to 'rsc')

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 );
 
-- 
cgit