From 4737ed363a93d1c1743fd38251a91a988fde5ce7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 13 Mar 2014 09:40:54 +0000 Subject: DateBoxes cannot be loaded from .src anymore Change-Id: Ic9d3c73cf67e855dc5931e96bc03014998cce9e0 --- include/tools/rcid.h | 2 +- rsc/inc/rscdb.hxx | 1 - rsc/source/parser/rscicpx.cxx | 17 ----------------- rsc/source/parser/rscinit.cxx | 8 -------- tools/source/rc/resmgr.cxx | 1 - 5 files changed, 1 insertion(+), 28 deletions(-) diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 8d78ae5597b8..2fbeb212b856 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -99,7 +99,7 @@ #define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) #define RSC_METRICBOX (RSC_NOTYPE + 0x6a) #define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b) -#define RSC_DATEBOX (RSC_NOTYPE + 0x6c) + #define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e) #define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f) diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 6545499b30cc..9101f63b6034 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -227,7 +227,6 @@ class RscTypCont RscTop * InitClassMetricBox( RscTop * pSuper ); RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT, RscTop * pSuper ); - RscTop * InitClassDateBox( RscTop * pSuper ); RscTop * InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index b3b26b1f9897..679cd4c1855f 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1599,23 +1599,6 @@ RscTop * RscTypCont::InitClassCurrencyBox return pClassCurrencyBox; } -RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassDateBox; - - // Klasse anlegen - nId = pHS->getID( "DateBox" ); - pClassDateBox = new RscClass( nId, RSC_DATEBOX, pSuper ); - pClassDateBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - - aNmTb.Put( nId, CLASSNAME, pClassDateBox ); - - // Variablen anlegen - - return pClassDateBox; -} - RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index ddf6862989b8..cd0003d6a3ff 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -125,7 +125,6 @@ void RscTypCont::Init() RscTop * pClassMetricBox; RscTop * pClassCurrencyBox; RscTop * pClassLongCurrencyBox; - RscTop * pClassDateBox; RscTop * pClassDockingWindow; RscTop * pClassToolBoxItem; RscTop * pClassToolBox; @@ -680,13 +679,6 @@ void RscTypCont::Init() pClassLongCurrencyBox = InitClassCurrencyBox( "LongCurrencyBox", RSC_LONGCURRENCYBOX, pClassTmp ); pRoot->Insert( pClassLongCurrencyBox ); } - { // Mehrfachvererbung von Hand - RscTop * pClassTmp = InitClassDateFormatter( pClassComboBox, pClassDate ); - aBaseLst.push_back( pClassTmp ); - - pClassDateBox = InitClassDateBox( pClassTmp ); - pRoot->Insert( pClassDateBox ); - } pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pRoot->Insert( pClassDockingWindow ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 882741689d03..75cff3efe254 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1500,7 +1500,6 @@ OString ResMgr::GetAutoHelpId() case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; case RSC_METRICBOX: aHID.append( "MetricBox" ); break; case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; - case RSC_DATEBOX: aHID.append( "DateBox" ); break; case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; default: -- cgit