summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-31 15:19:09 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-31 18:10:52 +0000
commit190196b98fc630d8aa3889e93797cb6268008447 (patch)
tree62a877d8d4e8ee1fa9065f77dcc8c23fbad7c2aa
parent959bcd564bca2e33036e0947a293ef2009341cf7 (diff)
Date/Time no longer loaded from rsc files
Change-Id: Ia9ed86b0d96cac76c2e1639065a4ac594c2966b1
-rw-r--r--include/tools/date.hxx3
-rw-r--r--include/tools/rcid.h3
-rw-r--r--include/tools/time.hxx3
-rw-r--r--tools/source/rc/rc.cxx44
4 files changed, 0 insertions, 53 deletions
diff --git a/include/tools/date.hxx b/include/tools/date.hxx
index e7505733c2a3..b0f1612f5bed 100644
--- a/include/tools/date.hxx
+++ b/include/tools/date.hxx
@@ -23,8 +23,6 @@
#include <com/sun/star/util/Date.hpp>
#include <sal/log.hxx>
-class ResId;
-
enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
SATURDAY, SUNDAY };
@@ -53,7 +51,6 @@ public:
Date( DateInitEmpty)
{ nDate = 0; }
Date( DateInitSystem );
- Date( const ResId & rResId );
Date( sal_uInt32 _nDate ) { Date::nDate = _nDate; }
Date( const Date& rDate )
{ nDate = rDate.nDate; }
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index b78a420c42e6..3bcbf441a50d 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -41,9 +41,6 @@
#define RSC_MENU (RSC_NOTYPE + 0x1c)
#define RSC_MENUITEM (RSC_NOTYPE + 0x1d) // only used internally
#define RSC_KEYCODE (RSC_NOTYPE + 0x1f)
-#define RSC_TIME (RSC_NOTYPE + 0x20)
-#define RSC_DATE (RSC_NOTYPE + 0x21)
-//#define RSC_INTERNATIONAL (RSC_NOTYPE + 0x22) // removed (2005-06-17)
#define RSC_IMAGE (RSC_NOTYPE + 0x23)
#define RSC_IMAGELIST (RSC_NOTYPE + 0x24)
diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index cac4117e5426..140b69ffb4db 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -23,8 +23,6 @@
#include <tools/solar.h>
#include <com/sun/star/util/Time.hpp>
-class ResId;
-
/**
@WARNING: This class can serve both as wall clock time and time duration, and
the mixing of these concepts leads to problems such as there being
@@ -68,7 +66,6 @@ public:
Time( TimeInitEmpty )
{ nTime = 0; }
Time( TimeInitSystem );
- Time( const ResId & rResId );
Time( sal_Int64 _nTime ) { Time::nTime = _nTime; }
Time( const tools::Time& rTime );
Time( const ::com::sun::star::util::Time& rTime );
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index a4bd8f269e18..cefccad9dc40 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.cxx
@@ -39,50 +39,6 @@ void Resource::GetRes( const ResId& rResId )
IncrementRes( sizeof( RSHEADER_TYPE ) );
}
-namespace tools {
-
-Time::Time( const ResId& rResId )
-{
- nTime = 0;
- rResId.SetRT( RSC_TIME );
- ResMgr* pResMgr = NULL;
-
- ResMgr::GetResourceSkipHeader( rResId, &pResMgr );
-
- sal_uIntPtr nObjMask = (sal_uInt16)pResMgr->ReadLong();
-
- if ( 0x01 & nObjMask )
- SetHour( (sal_uInt16)pResMgr->ReadShort() );
- if ( 0x02 & nObjMask )
- SetMin( (sal_uInt16)pResMgr->ReadShort() );
- if ( 0x04 & nObjMask )
- SetSec( (sal_uInt16)pResMgr->ReadShort() );
- if ( 0x08 & nObjMask )
- // TODO: when we change the place that writes this binary resource format to match:
- // SetNanoSec( pResMgr->ReadLong() );
- // In the meantime:
- SetNanoSec( pResMgr->ReadShort() * ::tools::Time::nanoPerCenti );
-}
-
-} /* namespace tools */
-
-Date::Date( const ResId& rResId ) : nDate(0)
-{
- rResId.SetRT( RSC_DATE );
- ResMgr* pResMgr = NULL;
-
- ResMgr::GetResourceSkipHeader( rResId, &pResMgr );
-
- sal_uIntPtr nObjMask = (sal_uInt16)pResMgr->ReadLong();
-
- if ( 0x01 & nObjMask )
- SetYear( (sal_uInt16)pResMgr->ReadShort() );
- if ( 0x02 & nObjMask )
- SetMonth( (sal_uInt16)pResMgr->ReadShort() );
- if ( 0x04 & nObjMask )
- SetDay( (sal_uInt16)pResMgr->ReadShort() );
-}
-
OUString ResId::toString() const
{
SetRT( RSC_STRING );