f5cf0c10eb
In the document we set the mime type for the images stored, but at import we never actually used the mime types. We always did mime type detection from the filename extension. The problem with this is that files stored as base64 streams don't have a filename so it is also not possible to determine the mime type from the file name. The consequence of this is that we can't know which image to take if we have multiple images (fallback images) so we always take the last one, which could be the wrong one. This happend in the test document. This changes the behavior so that we always first use the document set mime type as there is no reason to not trust that. Only if the mime type isn't provided by the document we use other mime type detection methods. Change-Id: I175c509ce5f11eab2c0454d4d9901ca1fe975272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160237 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
57 lines
2.3 KiB
C++
57 lines
2.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <xmloff/xmlimp.hxx>
|
|
|
|
|
|
class MultiImageImportHelper
|
|
{
|
|
private:
|
|
std::vector< SvXMLImportContextRef > maImplContextVector;
|
|
bool mbSupportsMultipleContents;
|
|
|
|
protected:
|
|
/// helper to get the created xShape instance, override this
|
|
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) = 0;
|
|
virtual OUString getGraphicPackageURLFromImportContext(const SvXMLImportContext& rContext) const = 0;
|
|
virtual OUString getMimeTypeFromImportContext(const SvXMLImportContext& rContext) const = 0;
|
|
virtual css::uno::Reference<css::graphic::XGraphic> getGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0;
|
|
|
|
public:
|
|
MultiImageImportHelper();
|
|
virtual ~MultiImageImportHelper();
|
|
|
|
/// solve multiple imported images. The most valuable one is chosen,
|
|
/// see implementation for evtl. changing weights and/or adding filetypes.
|
|
///
|
|
/// @returns import context of the selected image
|
|
SvXMLImportContextRef solveMultipleImages();
|
|
|
|
/// add a content to the remembered image import contexts
|
|
void addContent(const SvXMLImportContext& rSvXMLImportContext);
|
|
|
|
/// read/write access to boolean switch
|
|
bool getSupportsMultipleContents() const { return mbSupportsMultipleContents; }
|
|
void setSupportsMultipleContents(bool bNew) { mbSupportsMultipleContents = bNew; }
|
|
};
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|