User: obo     
Date: 05/03/18 02:06:00

Modified:
 /dba/dbaccess/source/filter/xml/
  xmlColumn.cxx

Log:
 INTEGRATION: CWS dba25 (1.2.102); FILE MERGED
 2005/03/09 08:25:27 oj 1.2.102.2: #i44064# save the type as well
 2005/03/04 14:23:47 oj 1.2.102.1: #i44064# export control default

File Changes:

Directory: /dba/dbaccess/source/filter/xml/
===========================================

File [changed]: xmlColumn.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlColumn.cxx?r1=1.2&r2=1.3
Delta lines:  +18 -3
--------------------
--- xmlColumn.cxx       2 Aug 2004 15:18:40 -0000       1.2
+++ xmlColumn.cxx       18 Mar 2005 10:05:57 -0000      1.3
@@ -67,6 +67,9 @@
 #ifndef _XMLOFF_XMLTOKEN_HXX
 #include <xmloff/xmltoken.hxx>
 #endif
+#ifndef _XMLOFF_XMLUCONV_HXX
+#include <xmloff/xmluconv.hxx>
+#endif
 #ifndef _XMLOFF_XMLNMSPE_HXX
 #include <xmloff/xmlnmspe.hxx>
 #endif
@@ -121,6 +124,7 @@
 
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        sal_Bool bAutoEnabled = sal_False;
+    ::rtl::OUString sType;
        for(sal_Int16 i = 0; i < nLength; ++i)
        {
                OUString sLocalName;
@@ -142,6 +146,14 @@
                        case XML_TOK_COLUMN_VISIBILITY:
                                m_bHidden = !sValue.equalsAscii("visible");
                                break;
+            case XML_TOK_COLUMN_TYPE_NAME:
+                sType = sValue;
+                OSL_ENSURE(sType.getLength(),"No type name set");
+                break;
+            case XML_TOK_COLUMN_DEFAULT_VALUE:
+                if ( sValue.getLength() && sType.getLength() )
+                    
SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
+                break;
                }
        }
        OSL_ENSURE(m_sName.getLength(),"Invalid column name of length: ZERO");
@@ -164,6 +176,9 @@
                        
xProp->setPropertyValue(PROPERTY_HIDDEN,makeAny(m_bHidden));
                        if ( m_sHelpMessage.getLength() )
                                
xProp->setPropertyValue(PROPERTY_HELPTEXT,makeAny(m_sHelpMessage));
+
+            if ( m_aDefaultValue.hasValue() )
+                               
xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue);
                        
                        if ( m_sStyleName.getLength() )
                        {




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to