diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-28 09:13:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-28 12:37:31 +0200 |
| commit | bdabb4c07d89bf57fa5cc52455c889337052a8c8 (patch) | |
| tree | 5f0b5bdf066ea12457d012fe0c283719c39543f7 /writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | |
| parent | 8c1d3c07d6903ac8cb5feb1dc2f403af17a95593 (diff) | |
loplugin:oncevar in writerfilter..xmlhelp
Change-Id: I1319494e16586f7e0b5149faecd3d1c36e336b1b
Reviewed-on: https://gerrit.libreoffice.org/39343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/ooxml/OOXMLDocumentImpl.cxx')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 74f3ef3e7dc7..fa9ff2d16cbc 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -562,7 +562,6 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) { static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"; static const char sCustomTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/customXml"; - OUString sTarget("Target"); bool bFound = false; sal_Int32 counter = 0; uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = xRelationshipAccess->getAllRelationships(); @@ -579,7 +578,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) if (aPair.Second == sCustomType || aPair.Second == sCustomTypeStrict) bFound = true; - else if(aPair.First == sTarget && bFound) + else if(aPair.First == "Target" && bFound) { // Adding value to extern variable customTarget. It will be used in ooxmlstreamimpl // to ensure customxml target is visited in lcl_getTarget. @@ -727,7 +726,6 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS OUString sHeaderType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"); OUString sHeaderTypeStrict("http://purl.oclc.org/ooxml/officeDocument/relationships/header"); - OUString sTarget("Target"); bool bFound = false; bool bHeaderFooterFound = false; OOXMLStream::StreamType_t streamType = OOXMLStream::UNKNOWN; @@ -755,7 +753,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS bHeaderFooterFound = true; streamType = OOXMLStream::HEADER; } - else if(aPair.First == sTarget && ( bFound || bHeaderFooterFound )) + else if(aPair.First == "Target" && ( bFound || bHeaderFooterFound )) { // Adding value to extern variable customTarget. It will be used in ooxmlstreamimpl // to ensure chart.xml target is visited in lcl_getTarget. @@ -814,7 +812,6 @@ void OOXMLDocumentImpl::resolveActiveXStream(Stream & rStream) { static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"; static const char sCustomTypeStrict[] = "http://purl.oclc.org/ooxml/officeDocument/relationships/control"; - OUString sTarget("Target"); bool bFound = false; sal_Int32 counter = 0; uno::Sequence< uno::Sequence< beans::StringPair > > aSeqs = xRelationshipAccess->getAllRelationships(); @@ -831,7 +828,7 @@ void OOXMLDocumentImpl::resolveActiveXStream(Stream & rStream) if (aPair.Second == sCustomType || aPair.Second == sCustomTypeStrict) bFound = true; - else if(aPair.First == sTarget && bFound) + else if(aPair.First == "Target" && bFound) { // Adding value to extern variable customTarget. It will be used in ooxmlstreamimpl // to ensure ActiveX.xml target is visited in lcl_getTarget. |