diff options
| author | Christian Barth <Christian.Barth@zoho.com> | 2017-08-11 19:15:02 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-08-12 08:07:36 +0200 |
| commit | c8696bd396e013b07944930d4267bfc9da827d5a (patch) | |
| tree | ebd0f753af16df569bdbad7fc7fef58bec8d96ec | |
| parent | 595cfbc432b8d4bef5d1a078beb389c3b49535cd (diff) | |
tdf#107197: Replace relationship URI
Replaced URIs in sw/source/filter
Change-Id: If73c30e9d590742568a3009a6d593f1b3249a5a4
Signed-off-by: Christian Barth <Christian.Barth@zoho.com>
Reviewed-on: https://gerrit.libreoffice.org/41055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | include/oox/token/relationship.hxx | 4 | ||||
| -rw-r--r-- | oox/source/token/relationship.inc | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index bc42c7922df4..8d91fd651904 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -42,7 +42,9 @@ enum class Relationship PACKAGE, SETTINGS, STYLES, - THEME + THEME, + VBAPROJECT, + WORDVBADATA }; OUString OOX_DLLPUBLIC getRelationship(Relationship eRelationship); diff --git a/oox/source/token/relationship.inc b/oox/source/token/relationship.inc index bc41797ae90c..f07cfd7f99b2 100644 --- a/oox/source/token/relationship.inc +++ b/oox/source/token/relationship.inc @@ -25,4 +25,6 @@ {Relationship::PACKAGE, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"}, {Relationship::SETTINGS, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"}, {Relationship::STYLES, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"}, -{Relationship::THEME, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"} +{Relationship::THEME, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"}, +{Relationship::VBAPROJECT, "http://schemas.microsoft.com/office/2006/relationships/vbaProject"}, +{Relationship::WORDVBADATA, "http://schemas.microsoft.com/office/2006/relationships/wordVbaData"} diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index b5c5e0bba337..87de4e11b242 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1294,7 +1294,7 @@ void DocxExport::WriteVBA() pOut->WriteStream(*pIn); // Write the relationship. - m_pFilter->addRelation(m_pDocumentFS->getOutputStream(), "http://schemas.microsoft.com/office/2006/relationships/vbaProject", "vbaProject.bin"); + m_pFilter->addRelation(m_pDocumentFS->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), "vbaProject.bin"); } OUString aDataName("_MS_VBA_Macros_XML"); @@ -1320,7 +1320,7 @@ void DocxExport::WriteVBA() if (!xProjectStream.is()) return; - m_pFilter->addRelation(xProjectStream, "http://schemas.microsoft.com/office/2006/relationships/wordVbaData", "vbaData.xml"); + m_pFilter->addRelation(xProjectStream, oox::getRelationship(Relationship::WORDVBADATA), "vbaData.xml"); } } |