6621da38b3
The bug document has:
<style:page-layout-properties ... style:repeat="no-repeat">
<style:background-image ... style:repeat="stretch"/>
</style:page-layout-properties>
When a stretched background image is set on a page style using the Writer UI,
then these two style:repeat attributes always match, but not in the bugdoc.
The later used to have priority, till commit
7d9bb549d4 (Related: #i124638# Second step of
DrawingLayer FillAttributes..., 2014-06-02).
Fix the problem by extending XMLBackgroundImageContext::EndElement(): if we
know that the <style:page-layout-properties> sets the FillBitmapMode property,
then don't blindly set BackGraphicLocation, but try to overwrite the exiting
FillBitmapMode one.
Change-Id: I64ab4363b20cc95003d35acd63ea421472b1c071
79 lines
2.6 KiB
C++
79 lines
2.6 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
|
|
#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
|
|
|
|
#include <com/sun/star/style/GraphicLocation.hpp>
|
|
#include "XMLElementPropertyContext.hxx"
|
|
|
|
namespace com { namespace sun { namespace star {
|
|
namespace io { class XOutputStream; }
|
|
} } }
|
|
|
|
class XMLBackgroundImageContext : public XMLElementPropertyContext
|
|
{
|
|
XMLPropertyState aPosProp;
|
|
sal_Int32 m_nBitmapModeIdx;
|
|
XMLPropertyState aFilterProp;
|
|
XMLPropertyState aTransparencyProp;
|
|
|
|
::com::sun::star::style::GraphicLocation ePos;
|
|
OUString sURL;
|
|
OUString sFilter;
|
|
sal_Int8 nTransparency;
|
|
|
|
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream;
|
|
|
|
private:
|
|
void ProcessAttrs(
|
|
const ::com::sun::star::uno::Reference<
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
|
|
|
|
public:
|
|
TYPEINFO_OVERRIDE();
|
|
|
|
XMLBackgroundImageContext(
|
|
SvXMLImport& rImport,
|
|
sal_uInt16 nPrfx,
|
|
const OUString& rLName,
|
|
const ::com::sun::star::uno::Reference<
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
|
|
const XMLPropertyState& rProp,
|
|
sal_Int32 nPosIdx,
|
|
sal_Int32 nFilterIdx,
|
|
sal_Int32 nTransparencyIdx,
|
|
sal_Int32 nBitmapModeIdx,
|
|
::std::vector< XMLPropertyState > &rProps );
|
|
|
|
virtual ~XMLBackgroundImageContext();
|
|
|
|
SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
|
|
const OUString& rLocalName,
|
|
const ::com::sun::star::uno::Reference<
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
|
|
|
|
virtual void EndElement() SAL_OVERRIDE;
|
|
};
|
|
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|