From 1de7c36a94a65cd3906f79066b33381df929b71b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 13 Mar 2014 09:46:07 +0000 Subject: CurrencyBoxes cannot be loaded from .src anymore Change-Id: I662aab01ecf5f78c4406838118ccea3988060521 --- rsc/inc/rscdb.hxx | 2 -- rsc/source/parser/rscicpx.cxx | 22 ---------------------- rsc/source/parser/rscinit.cxx | 13 ------------- 3 files changed, 37 deletions(-) (limited to 'rsc') 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 ); -- cgit