diff options
author | László Németh <nemeth@numbertext.org> | 2019-04-24 12:30:56 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-04-26 08:28:11 +0200 |
commit | 071c3309260aeae22f464d26bfa56a747f6a02cb (patch) | |
tree | a09f43b6ccbca9d61a48d6075ca23e9ac43bfd49 /writerfilter/source/dmapper/PropertyIds.cxx | |
parent | e1a75c1c3069efa303c480d0e50928c0761f468f (diff) |
tdf#67207 DOCX mail merge: fix export/import of database fields
to support the registered databases (containing ODS, XLSX
sheet or ODT text table data sources).
Now database fields don't lose their database connection,
and File->Print can merge mails after DOCX export/import, if
the LO instance has got a registered database with the same
name and table, as in saved in w:settings/w:mailMerge/w:query
element of the DOCX document in the form of
SELECT * FROM [databaseName].dbo.[tableName]$
query.
Notes:
– This fix supports only single table usage.
– The exported DOCX document is editable in MSO, too,
without losing the database connection in LO later.
Change-Id: I97826b7ee7defd0243dbaffa0325c5b11dd2c0d1
Reviewed-on: https://gerrit.libreoffice.org/71228
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source/dmapper/PropertyIds.cxx')
-rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index e51062541d47..28b9092e96e2 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -350,6 +350,10 @@ OUString getPropertyName( PropertyIds eId ) case PROP_RUBY_ADJUST: sName = "RubyAdjust"; break; case PROP_RUBY_POSITION: sName = "RubyPosition"; break; case PROP_LAYOUT_IN_CELL: sName = "IsLayoutInCell"; break; + case PROP_DATABASE_NAME: sName = "DataBaseName"; break; + case PROP_COMMAND_TYPE: sName = "DataCommandType"; break; + case PROP_DATATABLE_NAME: sName = "DataTableName"; break; + case PROP_DATACOLUMN_NAME: sName = "DataColumnName"; break; } assert(sName.getLength()>0); return sName; |