Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
dbaccess/source/ui/app/makefile.mk

1 files changed, 1 insertions, 29 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index c30b36782582..a3fa95b01533 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1680,35 +1680,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
     }
 
     if ( sDefault.getLength() )
-    {
-        sal_uInt32 nFormatKey;
-        try
-        {
-            if ( isTextFormat(pFieldDescr,nFormatKey) || pBoolDefault )
-            {
-                pFieldDescr->SetControlDefault(makeAny(sDefault));
-            }
-            else
-            {
-                try
-                {
-                    double nValue = GetFormatter()->convertStringToNumber(nFormatKey,sDefault);
-                    nValue = checkDoubleForDateFormat(nValue,nFormatKey,GetFormatter());
-                    pFieldDescr->SetControlDefault(makeAny(nValue));
-                }
-                catch(const Exception&)
-                {
-                    if ( sDefault.getLength() )
-                        pFieldDescr->SetControlDefault(makeAny(sDefault));
-                    else
-                        pFieldDescr->SetControlDefault(Any());
-                }
-            }
-        }
-        catch(const Exception&)
-        {
-        }
-    }
+        pFieldDescr->SetControlDefault(makeAny(sDefault));
     else
         pFieldDescr->SetControlDefault(Any());