diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 12:07:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 12:34:46 +0100 |
commit | c8c4f28f1131f4e993f5cc7693077457b03b4400 (patch) | |
tree | fbf5a408c82e0e753679637b7227afef95f02e32 /vcl | |
parent | 65b1fee217f03dcaff498ba21fac77ef8a320a0b (diff) |
no MetricFields are loaded from .src files now
Change-Id: I4b30cbc7bc6a3a3a635c3889d43b7fa6513209f5
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/control/field.cxx | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index c71ae85c40f0..4ea339ced88a 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1407,28 +1407,6 @@ MetricFormatter::MetricFormatter() ImplInit(); } -void MetricFormatter::ImplLoadRes( const ResId& rResId ) -{ - NumericFormatter::ImplLoadRes( rResId ); - - ResMgr* pMgr = rResId.GetResMgr(); - if( pMgr ) - { - RscMetricFormatterFlags nMask = (RscMetricFormatterFlags)pMgr->ReadLong(); - - if ( RscMetricFormatterFlags::Unit & nMask ) - { - sal_uLong nUnit = pMgr->ReadLong(); - assert(nUnit <= FUNIT_MILLISECOND && "out of FieldUnit bounds"); - if (nUnit <= FUNIT_MILLISECOND) - meUnit = (FieldUnit)nUnit; - } - - if ( RscMetricFormatterFlags::CustomUnitText & nMask ) - maCustomUnitText = pMgr->ReadString(); - } -} - MetricFormatter::~MetricFormatter() { } @@ -1605,19 +1583,6 @@ MetricField::MetricField( vcl::Window* pParent, WinBits nWinStyle ) : Reformat(); } -MetricField::MetricField( vcl::Window* pParent, const ResId& rResId ) : - SpinField( WINDOW_METRICFIELD ) -{ - rResId.SetRT( RSC_METRICFIELD ); - WinBits nStyle = ImplInitRes( rResId ) ; - SpinField::ImplInit( pParent, nStyle ); - SetField( this ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - void MetricField::dispose() { MetricFormatter::SetField( nullptr ); @@ -1640,25 +1605,6 @@ bool MetricField::set_property(const OString &rKey, const OString &rValue) return true; } -void MetricField::ImplLoadRes( const ResId& rResId ) -{ - SpinField::ImplLoadRes( rResId ); - MetricFormatter::ImplLoadRes( ResId( static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr() ) ); - - RscMetricFieldFlags nMask = (RscMetricFieldFlags)ReadLongRes(); - - if ( RscMetricFieldFlags::First & nMask ) - mnFirst = ReadLongRes(); - - if ( RscMetricFieldFlags::Last & nMask ) - mnLast = ReadLongRes(); - - if ( RscMetricFieldFlags::SpinSize & nMask ) - mnSpinSize = ReadLongRes(); - - Reformat(); -} - void MetricField::SetUnit( FieldUnit nNewUnit ) { sal_Int64 nRawMax = GetMax( nNewUnit ); |