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

TimeBoxes cannot be loaded from .src anymore

Browse Source 
Change-Id: I1fa101656538c40c402fc8608f33961f293bd58d
This commit is contained in:
Caolán McNamara
2014-03-13 09:34:12 +00:00
parent d40971a478
commit 24cfa40779
5 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/tools/rcid.h
View File

@@ -100,7 +100,7 @@
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a) #define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b) #define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b)
#define RSC_DATEBOX (RSC_NOTYPE + 0x6c) #define RSC_DATEBOX (RSC_NOTYPE + 0x6c)
#define RSC_TIMEBOX (RSC_NOTYPE + 0x6d)
#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e) #define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f) #define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f)
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70) #define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)

1
rsc/inc/rscdb.hxx
View File

@@ -228,7 +228,6 @@ class RscTypCont
RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT, RscTop * InitClassCurrencyBox( const char * pClassName, sal_uInt32 nRT,
RscTop * pSuper ); RscTop * pSuper );
RscTop * InitClassDateBox( RscTop * pSuper ); RscTop * InitClassDateBox( RscTop * pSuper );
RscTop * InitClassTimeBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper, RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ); RscEnum * pMapUnit );

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

@@ -1616,23 +1616,6 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper )
return pClassDateBox; return pClassDateBox;
} }
RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper )
{
Atom nId;
RscTop * pClassTimeBox;
// Klasse anlegen
nId = pHS->getID( "TimeBox" );
pClassTimeBox = new RscClass( nId, RSC_TIMEBOX, pSuper );
pClassTimeBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassTimeBox );
// Variablen anlegen
return pClassTimeBox;
}
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ) RscEnum * pMapUnit )
{ {

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

@@ -126,7 +126,6 @@ void RscTypCont::Init()
RscTop * pClassCurrencyBox; RscTop * pClassCurrencyBox;
RscTop * pClassLongCurrencyBox; RscTop * pClassLongCurrencyBox;
RscTop * pClassDateBox; RscTop * pClassDateBox;
RscTop * pClassTimeBox;
RscTop * pClassDockingWindow; RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem; RscTop * pClassToolBoxItem;
RscTop * pClassToolBox; RscTop * pClassToolBox;
@@ -688,14 +687,6 @@ void RscTypCont::Init()
pClassDateBox = InitClassDateBox( pClassTmp ); pClassDateBox = InitClassDateBox( pClassTmp );
pRoot->Insert( pClassDateBox ); pRoot->Insert( pClassDateBox );
} }
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassTimeFormatter( pClassComboBox, pClassTime,
pTimeFieldFormat );
aBaseLst.push_back( pClassTmp );
pClassTimeBox = InitClassTimeBox( pClassTmp );
pRoot->Insert( pClassTimeBox );
}
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow ); pRoot->Insert( pClassDockingWindow );

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

@@ -1501,7 +1501,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_METRICBOX: aHID.append( "MetricBox" ); break; case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
case RSC_DATEBOX: aHID.append( "DateBox" ); break; case RSC_DATEBOX: aHID.append( "DateBox" ); break;
case RSC_TIMEBOX: aHID.append( "TimeBox" ); 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: