From 756fe1b298762ed145784a09c512d793d9c6fa92 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 31 Dec 2014 15:04:30 +0000
Subject: drop dateformatter resource loading

Change-Id: Ie94c7502b0a82ca406b8d76e18def7bab8233a00
---
 vcl/source/control/field2.cxx | 79 -------------------------------------------
 1 file changed, 79 deletions(-)

(limited to 'vcl')

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()
 {
 }
-- 
cgit