summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vogelheim <dvo@openoffice.org>2001-03-30 11:28:15 +0000
committerDaniel Vogelheim <dvo@openoffice.org>2001-03-30 11:28:15 +0000
commitd493fa10e007e094129549cfc7b397c364432029 (patch)
tree55273506536f84db46d0a5fa05cd98699f7c2c0f
parent2dcc5db688ece2cebc9dc7016f987c5eba36b73c (diff)
#85254# database display field now seems to work again; order of properties import changed
-rw-r--r--xmloff/source/text/txtfldi.cxx10
-rw-r--r--xmloff/source/text/txtvfldi.cxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index de28a3c626d3..aa61d2763e6d 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtfldi.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: sab $ $Date: 2001-03-29 15:14:08 $
+ * last change: $Author: dvo $ $Date: 2001-03-30 12:28:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1523,11 +1523,11 @@ void XMLDatabaseFieldImportContext::PrepareField(
{
Any aAny;
- aAny <<= sDatabaseName;
- xPropertySet->setPropertyValue(sPropertyDatabaseName, aAny);
-
aAny <<= sTableName;
xPropertySet->setPropertyValue(sPropertyTableName, aAny);
+
+ aAny <<= sDatabaseName;
+ xPropertySet->setPropertyValue(sPropertyDatabaseName, aAny);
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 8f742cdd17e5..182567b50055 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtvfldi.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: mib $ $Date: 2001-03-19 09:41:43 $
+ * last change: $Author: dvo $ $Date: 2001-03-30 12:28:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1123,13 +1123,13 @@ void XMLDatabaseDisplayImportContext::EndElement()
OUString(RTL_CONSTASCII_USTRINGPARAM(
sAPI_fieldmaster_database))))
{
- // fieldmaster takes database, table and column name
- XMLDatabaseFieldImportContext::PrepareField(xMaster);
-
Any aAny;
aAny <<= sColumnName;
xMaster->setPropertyValue(sPropertyColumnName, aAny);
+ // fieldmaster takes database, table and column name
+ XMLDatabaseFieldImportContext::PrepareField(xMaster);
+
// create field
Reference<XPropertySet> xField;
if (CreateField(xField,