mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba204a (1.20.32); FILE MERGED

Browse Source 
2006/07/05 08:00:31 oj 1.20.32.2: RESYNC: (1.20-1.21); FILE MERGED
2006/06/02 14:16:29 fs 1.20.32.1: #i6544# no 'today' / 'now' default value
This commit is contained in:
Oliver Bolte
2006-07-13 14:19:03 +00:00
parent 9e992e9702
commit 0e5d472d48
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forms/source/component/Time.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: Time.cxx,v $ * $RCSfile: Time.cxx,v $
* *
* $Revision: 1.21 $ * $Revision: 1.22 $
* *
* last change: $Author: hr $ $Date: 2006-06-19 12:53:13 $ * last change: $Author: obo $ $Date: 2006-07-13 15:19:03 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -383,16 +383,7 @@ Any OTimeModel::translateDbColumnToControlValue()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Any OTimeModel::getDefaultForReset() const Any OTimeModel::getDefaultForReset() const
{ {
Any aValue; return m_aDefault;
if (m_aDefault.getValueType().getTypeClass() == TypeClass_LONG)
aValue = m_aDefault;
else
{ // aktuelles Datum einstellen
::Time aCurrentTime;
aValue <<= (sal_Int32)aCurrentTime.GetTime();
}
return aValue;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------