4a0cd89904
Handling EmphasisMarks for direct text rendering was a hard task - the EmphasisMark stuff is deeply buried in vcl (would have needed to move quite some includes from vcl to public) and thus hard to use. It is also quite old (tools Polygon, Rectangle). It was missing in the decomposition of the TextDecoratedPortionPrimitive2D (for good reason), but is needed now. I found a way using a callback lambda function to create the needed geometry in vcl and hand back the needed data to the caller, in this case to the decomposition. Adding it to the decomposition of TextDecoratedPortionPrimitive2D also guarantees that other renderers/usages will do the correct thing and all will look identical. Interestingly EmphasisMarks were never added to Metafiles (see OutputDevice::ImplDrawEmphasisMarks) so they were not 'missing' in Metafile-based exports. But for SDPRs they have to work. I added another encapsulating TextHierarchyPrimitive to encapsulate primitives that do represent EmphasisMarks and added to ignore these in the VclMetafileProcessor2D (as needed). Change-Id: I5b5c1528d86a123df2beb57d8366f05aa71e77cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171826 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
173 lines
5.7 KiB
C++
173 lines
5.7 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 .
|
|
*/
|
|
|
|
#include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx>
|
|
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
|
|
|
|
|
|
using namespace com::sun::star;
|
|
|
|
|
|
namespace drawinglayer::primitive2d
|
|
{
|
|
TextHierarchyLinePrimitive2D::TextHierarchyLinePrimitive2D(Primitive2DContainer&& aChildren)
|
|
: GroupPrimitive2D(std::move(aChildren))
|
|
{
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyLinePrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
TextHierarchyParagraphPrimitive2D::TextHierarchyParagraphPrimitive2D(
|
|
Primitive2DContainer&& aChildren,
|
|
sal_Int16 nOutlineLevel)
|
|
: GroupPrimitive2D(std::move(aChildren)),
|
|
mnOutlineLevel(nOutlineLevel)
|
|
{
|
|
}
|
|
|
|
bool TextHierarchyParagraphPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
|
|
{
|
|
if(GroupPrimitive2D::operator==(rPrimitive))
|
|
{
|
|
const TextHierarchyParagraphPrimitive2D& rCompare = static_cast<const TextHierarchyParagraphPrimitive2D&>(rPrimitive);
|
|
|
|
return (getOutlineLevel() == rCompare.getOutlineLevel());
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyParagraphPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
|
|
TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(Primitive2DContainer&& aChildren)
|
|
: GroupPrimitive2D(std::move(aChildren))
|
|
{
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyBulletPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(Primitive2DContainer&& aChildren)
|
|
: GroupPrimitive2D(std::move(aChildren))
|
|
{
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyBlockPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D(
|
|
Primitive2DContainer&& aChildren,
|
|
const FieldType& rFieldType,
|
|
const std::vector< std::pair< OUString, OUString>>* pNameValue)
|
|
: GroupPrimitive2D(std::move(aChildren)),
|
|
meType(rFieldType)
|
|
{
|
|
if (nullptr != pNameValue)
|
|
{
|
|
meNameValue = *pNameValue;
|
|
}
|
|
}
|
|
|
|
OUString TextHierarchyFieldPrimitive2D::getValue(const OUString& rName) const
|
|
{
|
|
for (const std::pair< OUString, OUString >& candidate : meNameValue)
|
|
{
|
|
if (candidate.first.equals(rName))
|
|
{
|
|
return candidate.second;
|
|
}
|
|
}
|
|
|
|
return OUString();
|
|
}
|
|
|
|
bool TextHierarchyFieldPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
|
|
{
|
|
if(GroupPrimitive2D::operator==(rPrimitive))
|
|
{
|
|
const TextHierarchyFieldPrimitive2D& rCompare = static_cast<const TextHierarchyFieldPrimitive2D&>(rPrimitive);
|
|
|
|
return (getType() == rCompare.getType()
|
|
&& meNameValue == rCompare.meNameValue);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyFieldPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(Primitive2DContainer&& aContent)
|
|
: GroupPrimitive2D(std::move(aContent))
|
|
{
|
|
}
|
|
|
|
void TextHierarchyEditPrimitive2D::get2DDecomposition(
|
|
Primitive2DDecompositionVisitor& rVisitor,
|
|
const geometry::ViewInformation2D& rViewInformation) const
|
|
{
|
|
// check if TextEdit is active. If not, process. If yes, suppress the content
|
|
if (!rViewInformation.getTextEditActive())
|
|
GroupPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyEditPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D;
|
|
}
|
|
|
|
|
|
TextHierarchyEmphasisMarkPrimitive2D::TextHierarchyEmphasisMarkPrimitive2D(Primitive2DContainer&& aContent)
|
|
: GroupPrimitive2D(std::move(aContent))
|
|
{
|
|
}
|
|
|
|
// provide unique ID
|
|
sal_uInt32 TextHierarchyEmphasisMarkPrimitive2D::getPrimitive2DID() const
|
|
{
|
|
return PRIMITIVE2D_ID_TEXTHIERARCHYEMPHASISMARKPRIMITIVE2D;
|
|
}
|
|
|
|
} // end of namespace
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|