f1f6c82e61
The types for the properties are defined in css::text::TextColumns
servise. But before commit 95ebd24a62
Author Mike Kaganski <mike.kaganski@collabora.com>
Date Thu May 27 13:00:10 2021 +0300
editengine-columns: ODF support [API CHANGE]
the implementation of the service (SwXTextColumns) used smaller types
for some properties. The export code (XMLTextColumnsExport::exportXML)
mathced those implementation types.
The mentioned commit changed the implementation to use proper types;
but the export code wasn't corrected.
This fixes the export code.
Change-Id: I95838dec382edc61bb2e5b39177bf57a7d79e0bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137900
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
196 lines
7.6 KiB
C++
196 lines
7.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 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <o3tl/any.hxx>
|
|
#include <rtl/ustrbuf.hxx>
|
|
|
|
|
|
#include <com/sun/star/text/XTextColumns.hpp>
|
|
#include <com/sun/star/text/ColumnSeparatorStyle.hpp>
|
|
#include <com/sun/star/text/TextColumn.hpp>
|
|
#include <com/sun/star/style/VerticalAlignment.hpp>
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
|
|
#include <sax/tools/converter.hxx>
|
|
|
|
#include <xmloff/xmltoken.hxx>
|
|
#include <xmloff/xmlnamespace.hxx>
|
|
#include <xmloff/xmluconv.hxx>
|
|
#include <xmloff/xmlexp.hxx>
|
|
#include <XMLTextColumnsExport.hxx>
|
|
|
|
using namespace ::com::sun::star::style;
|
|
using namespace ::com::sun::star::text;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::beans;
|
|
using namespace ::xmloff::token;
|
|
|
|
|
|
constexpr OUStringLiteral gsSeparatorLineIsOn(u"SeparatorLineIsOn");
|
|
constexpr OUStringLiteral gsSeparatorLineWidth(u"SeparatorLineWidth");
|
|
constexpr OUStringLiteral gsSeparatorLineColor(u"SeparatorLineColor");
|
|
constexpr OUStringLiteral gsSeparatorLineRelativeHeight(u"SeparatorLineRelativeHeight");
|
|
constexpr OUStringLiteral gsSeparatorLineVerticalAlignment(u"SeparatorLineVerticalAlignment");
|
|
constexpr OUStringLiteral gsIsAutomatic(u"IsAutomatic");
|
|
constexpr OUStringLiteral gsAutomaticDistance(u"AutomaticDistance");
|
|
constexpr OUStringLiteral gsSeparatorLineStyle(u"SeparatorLineStyle");
|
|
|
|
XMLTextColumnsExport::XMLTextColumnsExport( SvXMLExport& rExp ) :
|
|
rExport( rExp )
|
|
{
|
|
}
|
|
|
|
void XMLTextColumnsExport::exportXML( const Any& rAny )
|
|
{
|
|
Reference < XTextColumns > xColumns;
|
|
rAny >>= xColumns;
|
|
if (!xColumns)
|
|
return;
|
|
|
|
const Sequence < TextColumn > aColumns = xColumns->getColumns();
|
|
sal_Int32 nCount = aColumns.getLength();
|
|
|
|
OUStringBuffer sValue;
|
|
GetExport().AddAttribute( XML_NAMESPACE_FO, XML_COLUMN_COUNT,
|
|
OUString::number(nCount ? nCount : 1) );
|
|
|
|
// handle 'automatic' columns
|
|
Reference < XPropertySet > xPropSet( xColumns, UNO_QUERY );
|
|
if( xPropSet.is() )
|
|
{
|
|
Any aAny = xPropSet->getPropertyValue( gsIsAutomatic );
|
|
if ( *o3tl::doAccess<bool>(aAny) )
|
|
{
|
|
aAny = xPropSet->getPropertyValue( gsAutomaticDistance );
|
|
sal_Int32 nDistance = 0;
|
|
aAny >>= nDistance;
|
|
OUStringBuffer aBuffer;
|
|
GetExport().GetMM100UnitConverter().convertMeasureToXML(
|
|
aBuffer, nDistance );
|
|
GetExport().AddAttribute( XML_NAMESPACE_FO,
|
|
XML_COLUMN_GAP,
|
|
aBuffer.makeStringAndClear() );
|
|
}
|
|
}
|
|
|
|
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMNS,
|
|
true, true );
|
|
|
|
if( xPropSet.is() )
|
|
{
|
|
Any aAny = xPropSet->getPropertyValue( gsSeparatorLineIsOn );
|
|
if( *o3tl::doAccess<bool>(aAny) )
|
|
{
|
|
// style:width
|
|
aAny = xPropSet->getPropertyValue( gsSeparatorLineWidth );
|
|
sal_Int32 nWidth = 0;
|
|
aAny >>= nWidth;
|
|
GetExport().GetMM100UnitConverter().convertMeasureToXML( sValue,
|
|
nWidth );
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_WIDTH,
|
|
sValue.makeStringAndClear() );
|
|
|
|
// style:color
|
|
aAny = xPropSet->getPropertyValue( gsSeparatorLineColor );
|
|
sal_Int32 nColor = 0;
|
|
aAny >>= nColor;
|
|
::sax::Converter::convertColor( sValue, nColor );
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_COLOR,
|
|
sValue.makeStringAndClear() );
|
|
|
|
// style:height
|
|
aAny = xPropSet->getPropertyValue( gsSeparatorLineRelativeHeight );
|
|
sal_Int32 nHeight = 0;
|
|
aAny >>= nHeight;
|
|
::sax::Converter::convertPercent( sValue, nHeight );
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_HEIGHT,
|
|
sValue.makeStringAndClear() );
|
|
|
|
// style::style
|
|
aAny = xPropSet->getPropertyValue( gsSeparatorLineStyle );
|
|
sal_Int16 nStyle = css::text::ColumnSeparatorStyle::NONE;
|
|
aAny >>= nStyle;
|
|
|
|
enum XMLTokenEnum eStr = XML_TOKEN_INVALID;
|
|
switch ( nStyle )
|
|
{
|
|
case css::text::ColumnSeparatorStyle::NONE: eStr = XML_NONE; break;
|
|
case css::text::ColumnSeparatorStyle::SOLID: eStr = XML_SOLID; break;
|
|
case css::text::ColumnSeparatorStyle::DOTTED: eStr = XML_DOTTED; break;
|
|
case css::text::ColumnSeparatorStyle::DASHED: eStr = XML_DASHED; break;
|
|
default:
|
|
break;
|
|
}
|
|
if ( eStr != XML_TOKEN_INVALID )
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_STYLE, eStr );
|
|
|
|
// style:vertical-align
|
|
aAny = xPropSet->getPropertyValue( gsSeparatorLineVerticalAlignment );
|
|
VerticalAlignment eVertAlign;
|
|
aAny >>= eVertAlign;
|
|
|
|
eStr = XML_TOKEN_INVALID;
|
|
switch( eVertAlign )
|
|
{
|
|
// case VerticalAlignment_TOP: eStr = XML_TOP;
|
|
case VerticalAlignment_MIDDLE: eStr = XML_MIDDLE; break;
|
|
case VerticalAlignment_BOTTOM: eStr = XML_BOTTOM; break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if( eStr != XML_TOKEN_INVALID)
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
|
|
XML_VERTICAL_ALIGN, eStr );
|
|
|
|
// style:column-sep
|
|
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
|
|
XML_COLUMN_SEP,
|
|
true, true );
|
|
}
|
|
}
|
|
|
|
for (const auto& rColumn : aColumns)
|
|
{
|
|
// style:rel-width
|
|
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_REL_WIDTH,
|
|
OUString::number(rColumn.Width) + "*" );
|
|
|
|
// fo:margin-left
|
|
GetExport().GetMM100UnitConverter().convertMeasureToXML( sValue,
|
|
rColumn.LeftMargin );
|
|
GetExport().AddAttribute( XML_NAMESPACE_FO, XML_START_INDENT,
|
|
sValue.makeStringAndClear() );
|
|
|
|
// fo:margin-right
|
|
GetExport().GetMM100UnitConverter().convertMeasureToXML( sValue,
|
|
rColumn.RightMargin );
|
|
GetExport().AddAttribute( XML_NAMESPACE_FO, XML_END_INDENT,
|
|
sValue.makeStringAndClear() );
|
|
|
|
// style:column
|
|
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMN,
|
|
true, true );
|
|
}
|
|
}
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|