summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/tools/rcid.h3
-rw-r--r--include/vcl/field.hxx3
-rw-r--r--rsc/inc/rscdb.hxx3
-rw-r--r--rsc/source/parser/rscicpx.cxx77
-rw-r--r--rsc/source/parser/rscinit.cxx13
-rw-r--r--tools/source/rc/resmgr.cxx1
-rw-r--r--vcl/source/control/field2.cxx79
7 files changed, 0 insertions, 179 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index fb204309f7fc..b78a420c42e6 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -78,9 +78,6 @@
#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63)
#define RSC_METRICFIELD (RSC_NOTYPE + 0x64)
-#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
-
-
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 02da97b59ab7..179c16a974a1 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -325,7 +325,6 @@ private:
protected:
DateFormatter();
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE const Date& ImplGetFieldDate() const { return maFieldDate; }
SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString& rOutStr,
const AllSettings& rSettings );
@@ -630,11 +629,9 @@ private:
protected:
SAL_DLLPRIVATE void ImplDateSpinArea( bool bUp );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
explicit DateField( vcl::Window* pParent, WinBits nWinStyle );
- explicit DateField( vcl::Window* pParent, const ResId& );
virtual ~DateField();
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index e53c902475c8..ce37ba54b8eb 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -205,17 +205,14 @@ class RscTypCont
RscTop * pClassKeyCode );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
RscTop * InitClassSplitWindow( RscTop * pSuper );
- RscTop * InitClassDate( RscTop * pSuper );
RscTop * InitClassNumericFormatter( RscTop * pSuper );
RscTop * InitClassMetricFormatter( RscTop * pSuper,
RscEnum * pFieldUnits );
- RscTop * InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassSpinField( RscTop * pSuper );
RscTop * InitClassNumericField( RscTop * pSuper );
RscTop * InitClassMetricField( RscTop * pSuper );
- RscTop * InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 19c61647cea0..f62ff3e61ba7 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -929,31 +929,6 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper )
return pClassSplitWindow;
}
-RscTop * RscTypCont::InitClassDate( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassDate;
-
- // Klasse anlegen
- nId = pHS->getID( "Date" );
- pClassDate = new RscClass( nId, RSC_DATE, pSuper );
- pClassDate->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassDate );
-
- // Variablen anlegen
- nId = aNmTb.Put( "Year", VARNAME );
- pClassDate->SetVariable( nId, &a0to9999Short, NULL, 0, DATE_YEAR );
-
- nId = aNmTb.Put( "Month", VARNAME );
- pClassDate->SetVariable( nId, &a1to12Short, NULL, 0, DATE_MONTH );
-
- nId = aNmTb.Put( "Day", VARNAME );
- pClassDate->SetVariable( nId, &a1to31Short, NULL, 0, DATE_DAY );
-
- return pClassDate;
-}
-
RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
{
Atom nId;
@@ -1009,37 +984,6 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper,
return pClassMetric;
}
-RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper,
- RscTop * pClassDate )
-{
- Atom nId;
- RscTop * pClassDateF;
-
- // Klasse anlegen
- nId = pHS->getID( "DateFormatter" );
- pClassDateF = new RscClass( nId, RSC_NOTYPE, pSuper );
- pClassDateF->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
- // Variablen anlegen
- nId = aNmTb.Put( "Minimum", VARNAME );
- pClassDateF->SetVariable( nId, pClassDate, NULL,
- 0, DATEFORMATTER_MIN );
- nId = aNmTb.Put( "Maximum", VARNAME );
- pClassDateF->SetVariable( nId, pClassDate, NULL,
- 0, DATEFORMATTER_MAX );
- nId = aNmTb.Put( "LongFormat", VARNAME );
- pClassDateF->SetVariable( nId, &aBool, NULL,
- 0, DATEFORMATTER_LONGFORMAT );
- nId = aNmTb.Put( "StrictFormat", VARNAME );
- pClassDateF->SetVariable( nId, &aBool, NULL,
- 0, DATEFORMATTER_STRICTFORMAT );
- nId = aNmTb.Put( "Value", VARNAME );
- pClassDateF->SetVariable( nId, pClassDate, NULL,
- 0, DATEFORMATTER_VALUE );
-
- return pClassDateF;
-}
-
RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper )
{
Atom nId;
@@ -1109,27 +1053,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper )
return pClassMetricField;
}
-RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate )
-{
- Atom nId;
- RscTop * pClassDateField;
-
- // Klasse anlegen
- nId = pHS->getID( "DateField" );
- pClassDateField = new RscClass( nId, RSC_DATEFIELD, pSuper );
- pClassDateField->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
- aNmTb.Put( nId, CLASSNAME, pClassDateField );
-
- // Variablen anlegen
- nId = aNmTb.Put( "First", VARNAME );
- pClassDateField->SetVariable( nId, pClassDate, NULL, 0, DATEFIELD_FIRST );
- nId = aNmTb.Put( "Last", VARNAME );
- pClassDateField->SetVariable( nId, pClassDate, NULL, 0, DATEFIELD_LAST );
-
- return pClassDateField;
-}
-
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1ffc64f83fa5..94eb8900bf97 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -87,11 +87,9 @@ void RscTypCont::Init()
RscTop * pClassMenu;
RscTop * pClassSplitWindow;
RscTop * pClassSpinButton;
- RscTop * pClassDate;
RscTop * pClassSpinField;
RscTop * pClassNumericField;
RscTop * pClassMetricField;
- RscTop * pClassDateField;
RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
@@ -438,10 +436,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassSpinButton );
}
{
- pClassDate = InitClassDate( pClassMgr );
- pRoot->Insert( pClassDate );
-}
-{
pClassSpinField = InitClassSpinField( pClassEdit );
pRoot->Insert( pClassSpinField );
}
@@ -462,13 +456,6 @@ void RscTypCont::Init()
pClassMetricField = InitClassMetricField( pClassTmp );
pRoot->Insert( pClassMetricField );
}
- { // Mehrfachvererbung von Hand
- RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate );
- aBaseLst.push_back( pClassTmp );
-
- pClassDateField = InitClassDateField( pClassTmp, pClassDate );
- pRoot->Insert( pClassDateField );
- }
}
{
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 592bf9b09d74..39daa7d1b19d 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1482,7 +1482,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_SPINFIELD: aHID.append( "SpinField" ); break;
case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break;
case RSC_METRICFIELD: aHID.append( "MetricField" ); break;
- case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
default:
// no type, no auto HID
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 7192b22faa63..185ba22c4a24 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1431,42 +1431,6 @@ DateFormatter::DateFormatter() :
ImplInit();
}
-void DateFormatter::ImplLoadRes( const ResId& rResId )
-{
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- {
- sal_uLong nMask = pMgr->ReadLong();
-
- if ( DATEFORMATTER_MIN & nMask )
- {
- maMin = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
- }
- if ( DATEFORMATTER_MAX & nMask )
- {
- maMax = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
- }
- if ( DATEFORMATTER_LONGFORMAT & nMask )
- mbLongFormat = pMgr->ReadShort() != 0;
-
- if ( DATEFORMATTER_STRICTFORMAT & nMask )
- SetStrictFormat( pMgr->ReadShort() != 0 );
-
- if ( DATEFORMATTER_VALUE & nMask )
- {
- maFieldDate = Date( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) );
- pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) );
- if ( maFieldDate > maMax )
- maFieldDate = maMax;
- if ( maFieldDate < maMin )
- maFieldDate = maMin;
- maLastDate = maFieldDate;
- }
- }
-}
-
DateFormatter::~DateFormatter()
{
delete mpCalendarWrapper;
@@ -1773,49 +1737,6 @@ DateField::DateField( vcl::Window* pParent, WinBits nWinStyle ) :
ResetLastDate();
}
-DateField::DateField( vcl::Window* pParent, const ResId& rResId ) :
- SpinField( WINDOW_DATEFIELD ),
- maFirst( GetMin() ),
- maLast( GetMax() )
-{
- rResId.SetRT( RSC_DATEFIELD );
- WinBits nStyle = ImplInitRes( rResId );
- SpinField::ImplInit( pParent, nStyle );
- SetField( this );
- SetText( ImplGetLocaleDataWrapper().getDate( ImplGetFieldDate() ) );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE ) )
- Show();
-
- ResetLastDate();
-}
-
-void DateField::ImplLoadRes( const ResId& rResId )
-{
- SpinField::ImplLoadRes( rResId );
-
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- {
- DateFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
-
- sal_uLong nMask = ReadLongRes();
- if ( DATEFIELD_FIRST & nMask )
- {
- maFirst = Date( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) );
- }
- if ( DATEFIELD_LAST & nMask )
- {
- maLast = Date( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) );
- }
- }
-
- Reformat();
-}
-
DateField::~DateField()
{
}
generated by cgit (git 2.34.1) at 2025-02-24 10:23:36 +0000