diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:33:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 15:33:00 +0000 |
| commit | f65d85da35ef5ee9d4cc7d8e9a43a8aa0522a670 (patch) | |
| tree | 982f57d507b75842ad295f74a4840b963bc6ffa5 /basic/source/runtime/methods.cxx | |
| parent | 46a39770d5b0e0593d6116f976063027afb217cc (diff) | |
INTEGRATION: CWS npower4 (1.66.14); FILE MERGED
2006/10/18 15:46:54 npower 1.66.14.4: #i64882# get rid of compiler warning
2006/10/16 08:27:10 npower 1.66.14.3: i#64882# compile bug
2006/10/14 11:02:52 npower 1.66.14.2: RESYNC: (1.66-1.71); FILE MERGED
2006/04/28 13:23:55 npower 1.66.14.1: #i64884# change behavior of wait function depending on stat of VBASupport option
Diffstat (limited to 'basic/source/runtime/methods.cxx')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 204519c48a37..205cdc2e09fe 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4,9 +4,9 @@ * * $RCSfile: methods.cxx,v $ * - * $Revision: 1.73 $ + * $Revision: 1.74 $ * - * last change: $Author: vg $ $Date: 2006-11-02 11:03:11 $ + * last change: $Author: vg $ $Date: 2006-11-02 16:33:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2051,13 +2051,8 @@ RTLFUNC(Second) } } -// Date Now(void) - -RTLFUNC(Now) +double Now_Impl() { - (void)pBasic; - (void)bWrite; - Date aDate; Time aTime; double aSerial = (double)GetDayDiff( aDate ); @@ -2067,7 +2062,16 @@ RTLFUNC(Now) nSeconds += aTime.GetSec(); double nDays = ((double)nSeconds) / (double)(24.0*3600.0); aSerial += nDays; - rPar.Get(0)->PutDate( aSerial ); + return aSerial; +} + +// Date Now(void) + +RTLFUNC(Now) +{ + (void)pBasic; + (void)bWrite; + rPar.Get(0)->PutDate( Now_Impl() ); } // Date Time(void) |