#102407# (on behalf of BerryJia@openoffice.org) when importing a control model which can be ALIGNed, initialize this property to the XML default

2 files changed, 36 insertions, 4 deletions

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 5ae824dd7c1c..b2d5f393709a 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: elementimport.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-25 13:14:15 $
+ *  last change: $Author: fs $ $Date: 2002-11-06 10:37:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -704,6 +704,22 @@ namespace xmloff
         }
     }
 
+    //---------------------------------------------------------------------
+    //added by BerryJia for fixing bug102407 2002-11-5
+    Reference< XPropertySet > OControlImport::createElement()
+    {
+        Reference<XPropertySet> xPropSet = OElementImport::createElement();
+        if(xPropSet.is())
+        {
+            Reference<XPropertySetInfo> xInfo(xPropSet->getPropertySetInfo());
+            if(xInfo.is() && xInfo->hasPropertyByName(PROPERTY_ALIGN))
+            {
+                Any aValue;
+                xPropSet->setPropertyValue(PROPERTY_ALIGN,aValue);
+            }
+        }
+        return xPropSet;
+    }
     //=====================================================================
     //= OReferredControlImport
     //=====================================================================
@@ -1413,6 +1429,9 @@ namespace xmloff
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.31  2002/10/25 13:14:15  fs
+ *  #104402# importing grid column styles now
+ *
  *  Revision 1.30  2002/10/02 14:31:10  fs
  *  #103388# some performance logging
  *
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index e3bca2940c80..53a2cdb3dc65 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: elementimport.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-25 13:14:15 $
+ *  last change: $Author: fs $ $Date: 2002-11-06 10:37:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -261,6 +261,16 @@ namespace xmloff
         void implTranslateValueProperty(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo,
             ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue);
+
+    protected:
+            //added by BerryJia for fixing bug102407 2002-11-5
+            /** create the (uninitialized) element which is to represent the read data
+
+                <p>The default implementation uses <member>m_xORB</member> to create a object with <member>m_sServiceName</member>.
+            */
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                            createElement();
+
     };
 
     //=====================================================================
@@ -651,6 +661,9 @@ namespace xmloff
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.16  2002/10/25 13:14:15  fs
+ *  #104402# importing grid column styles now
+ *
  *  Revision 1.15  2002/10/02 14:31:09  fs
  *  #103388# some performance logging
  *