mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CurrencyBoxes cannot be loaded from .src anymore

Browse Source 
Change-Id: I662aab01ecf5f78c4406838118ccea3988060521
This commit is contained in:
Caolán McNamara 2014-03-13 09:46:07 +00:00
parent 4737ed363a
commit 1de7c36a94
6 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/tools/rcid.h
View File

@ -98,11 +98,11 @@
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68) #define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) #define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a) #define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e) #define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70) #define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71) #define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72) #define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)

1
include/vcl/field.hxx
View File

@ -777,7 +777,6 @@ class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
{ {
public: public:
explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); explicit CurrencyBox( Window* pParent, WinBits nWinStyle );
explicit CurrencyBox( Window* pParent, const ResId& );
virtual ~CurrencyBox(); virtual ~CurrencyBox();
virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool PreNotify( NotifyEvent& rNEvt );

2
rsc/inc/rscdb.hxx
View File

@ -225,8 +225,6 @@ class RscTypCont
RscTop * InitClassPatternBox( RscTop * pSuper ); RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper ); RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassMetricBox( RscTop * pSuper ); RscTop * InitClassMetricBox( RscTop * pSuper );
RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper, RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ); RscEnum * pMapUnit );

22
rsc/source/parser/rscicpx.cxx
View File

@ -1577,28 +1577,6 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
return pClassMetricBox; 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, RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ) RscEnum * pMapUnit )
{ {

13
rsc/source/parser/rscinit.cxx
View File

@ -123,8 +123,6 @@ void RscTypCont::Init()
RscTop * pClassPatternBox; RscTop * pClassPatternBox;
RscTop * pClassNumericBox; RscTop * pClassNumericBox;
RscTop * pClassMetricBox; RscTop * pClassMetricBox;
RscTop * pClassCurrencyBox;
RscTop * pClassLongCurrencyBox;
RscTop * pClassDockingWindow; RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem; RscTop * pClassToolBoxItem;
RscTop * pClassToolBox; RscTop * pClassToolBox;
@ -667,18 +665,7 @@ void RscTypCont::Init()
pClassMetricBox = InitClassMetricBox( pClassTmp ); pClassMetricBox = InitClassMetricBox( pClassTmp );
pRoot->Insert( pClassMetricBox ); 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 ); pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow ); pRoot->Insert( pClassDockingWindow );

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

@ -1499,7 +1499,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break; case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default: default: