diff options
Diffstat (limited to 'oox/source/ppt/pptimport.cxx')
| -rw-r--r-- | oox/source/ppt/pptimport.cxx | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index f7d00920705e..98a855c77fa4 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -73,37 +73,6 @@ PowerPointImport::~PowerPointImport() maPPTShapes.clear(); } -/// Visits the relations from pRelations which are of type rType. -static void visitRelations(PowerPointImport& rImport, const core::RelationsRef& pRelations, const OUString& rType, std::vector<OUString>& rImageFragments) -{ - core::RelationsRef pRelationsOfType = pRelations->getRelationsFromTypeFromOfficeDoc(rType); - if (!pRelationsOfType) - return; - - for (const auto& rRelation : *pRelationsOfType) - { - OUString aFragment = pRelationsOfType->getFragmentPathFromRelation(rRelation.second); - if (core::RelationsRef pFragmentRelations = rImport.importRelations(aFragment)) - { - // See if the fragment has images. - if (core::RelationsRef pImages = pFragmentRelations->getRelationsFromTypeFromOfficeDoc("image")) - { - for (const auto& rImage : *pImages) - { - OUString aPath = pImages->getFragmentPathFromRelation(rImage.second); - // Safe subset: e.g. WMF may have an external header from the - // referencing fragment. - if (aPath.endsWith(".jpg") || aPath.endsWith(".jpeg")) - rImageFragments.push_back(aPath); - } - } - - // See if the fragment has a slide layout, and recurse. - visitRelations(rImport, pFragmentRelations, "slideLayout", rImageFragments); - } - } -} - bool PowerPointImport::importDocument() { /* to activate the PPTX dumper, define the environment variable @@ -132,16 +101,6 @@ bool PowerPointImport::importDocument() const OUString sPresPropsPath = xPresentationFragmentHandler->getFragmentPathFromFirstTypeFromOfficeDoc("presProps"); - // importRelations() is cheap, it will do an actual import for the first time only. - if (core::RelationsRef pFragmentRelations = importRelations(aFragmentPath)) - { - std::vector<OUString> aImageFragments; - visitRelations(*this, pFragmentRelations, "slide", aImageFragments); - visitRelations(*this, pFragmentRelations, "slideMaster", aImageFragments); - - getGraphicHelper().importEmbeddedGraphics(aImageFragments); - } - bool bRet = importFragment(xPresentationFragmentHandler); if (bRet && !sPresPropsPath.isEmpty()) { |