strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MetricBoxes cannot be loaded from .src anymore

Browse source 
Change-Id: Id7b44402975ed75171f4475aa64ebd2a3d6bd687
This commit is contained in:
Caolán McNamara 2014-03-13 09:48:37 +00:00
parent 1de7c36a94
commit feff54d8ce
5 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/tools/rcid.h
View file

@ -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)

1
rsc/inc/rscdb.hxx
View file

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

17
rsc/source/parser/rscicpx.cxx
View file

@ -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 )
{

11
rsc/source/parser/rscinit.cxx
View file

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

1
tools/source/rc/resmgr.cxx
View file

@ -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: