diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:15:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:15:04 +0000 |
| commit | 94db89c2795bc815de1d07e0d6a9e21d587424e7 (patch) | |
| tree | 7c930df3cd39c6b290514f321f307697b00b5186 /tools/source | |
| parent | 167987e27c67ebea44316c997cf6e1a821499a08 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.5.34); FILE MERGED
2003/07/14 14:22:50 fa 1.5.34.1: The Time::Time( const Time& ) constructor and the = operator confused the
Apple compiler somehwhat, so that it created bad exception-handling frame
symbols for them (silly Apple, .eh frames are for kids!), but only when
they were compiled outside the Tools library. Moving them out of the
header and into the tools library itself corrects this. Symptom on
Mac OS X was the linker complaining that these symbols didn't exist,
but were expected to be defined in Security.framework.
Second, for OS X pull the system language/locale from sal functions,
and not from the environment. The tools locale functions are used
in psprint for font language recognition.
http://www.openoffice.org/project/www/issues/showattachment.cgi?attach_id=7554&file=tools.071003.11rc.patch
Dan
fa@ooo
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/datetime/ttime.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 86c64b0d6e04..f50500469b7a 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ttime.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:03:57 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:15:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,6 +208,13 @@ Time::Time() // ----------------------------------------------------------------------- +Time::Time( const Time& rTime ) +{ + nTime = rTime.nTime; +} + +// ----------------------------------------------------------------------- + Time::Time( ULONG nHour, ULONG nMin, ULONG nSec, ULONG n100Sec ) { // Zeit normalisieren @@ -328,6 +335,14 @@ double Time::GetTimeInDays() const // ----------------------------------------------------------------------- +Time& Time::operator =( const Time& rTime ) +{ + nTime = rTime.nTime; + return *this; +} + +// ----------------------------------------------------------------------- + Time& Time::operator +=( const Time& rTime ) { nTime = Sec100ToTime( TimeToSec100( *this ) + |