diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-09 23:07:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-10 15:32:27 +0100 |
| commit | 349bfa2a9a621e6e8041ffea847a76d7c7b114cc (patch) | |
| tree | 0308cb6f0c8eae7d1029a03edf7cc8e29ee699e3 /include | |
| parent | 9b498bb45b34a474b666107265896d69707472d1 (diff) | |
editeng: fix more 32-bit Time breakage
SfxDateTimeItem and SvxExtTimeField need to use 64-bit integer to store
Time as well. These classes also have binary serialization
Load()/Save() methods but they are unlikely to be used in a persistent
way, just for the clipboard.
The problem is easy to reproduce in Impress: Insert->Field->Time(fixed)
(regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a)
Change-Id: I5946c5b94dd5a509805b6dc40461bbd910caffc4
(cherry picked from commit 7b9c61c7f20a679c5316a288c2ec2ffbf04b4200)
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/flditem.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 5b2756337e52..34ff0b994d74 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -257,7 +257,7 @@ enum SvxTimeFormat { SVXTIMEFORMAT_APPDEFAULT = 0, // Set as in App class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData { private: - sal_uInt32 nFixTime; + sal_Int64 m_nFixTime; SvxTimeType eType; SvxTimeFormat eFormat; @@ -268,8 +268,8 @@ public: SvxTimeType eType = SVXTIMETYPE_VAR, SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD ); - sal_uInt32 GetFixTime() const { return nFixTime; } - void SetFixTime( const Time& rTime ) { nFixTime = rTime.GetTime(); } + sal_Int64 GetFixTime() const { return m_nFixTime; } + void SetFixTime( const Time& rTime ) { m_nFixTime = rTime.GetTime(); } SvxTimeType GetType() const { return eType; } void SetType( SvxTimeType eTp ) { eType = eTp; } |