diff options
author | Troy Rollo <libreoffice@troy.rollo.name> | 2017-06-06 17:41:33 +1000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-06-13 18:55:15 +0200 |
commit | a5b4cb3f836c991d0647f55e1ef4920ce6115eac (patch) | |
tree | cb69d051ed559d806dd60657ddd0186a6b962b60 /xmloff | |
parent | 3c641c9c1f2ec01a9ae61e955ceb69c52e45f31e (diff) |
tdf#103091 conditional style conditions not saved
Change-Id: Iccf3eb531ee3382d27105e5ccce6013707a646b6
Reviewed-on: https://gerrit.libreoffice.org/38451
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/Library_xo.mk | 1 | ||||
-rw-r--r-- | xmloff/inc/prstylecond.hxx | 23 | ||||
-rw-r--r-- | xmloff/source/style/prstylecond.cxx | 125 | ||||
-rw-r--r-- | xmloff/source/style/styleexp.cxx | 50 |
4 files changed, 198 insertions, 1 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 1978f396c8a6..0f2156ce2364 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -252,6 +252,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/style/postuhdl \ xmloff/source/style/prhdlfac \ xmloff/source/style/prstylei \ + xmloff/source/style/prstylecond \ xmloff/source/style/shadwhdl \ xmloff/source/style/shdwdhdl \ xmloff/source/style/styleexp \ diff --git a/xmloff/inc/prstylecond.hxx b/xmloff/inc/prstylecond.hxx new file mode 100644 index 000000000000..85c9aae7e167 --- /dev/null +++ b/xmloff/inc/prstylecond.hxx @@ -0,0 +1,23 @@ +/* -*- 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 . + */ + +OUString GetParaStyleCondExternal( OUString const &); +OUString GetParaStyleCondInternal( OUString const &); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/prstylecond.cxx b/xmloff/source/style/prstylecond.cxx new file mode 100644 index 000000000000..28312fb5cd3b --- /dev/null +++ b/xmloff/source/style/prstylecond.cxx @@ -0,0 +1,125 @@ +/* -*- 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 <rtl/ustring.hxx> +#include "prstylecond.hxx" +#include <xmloff/xmltoken.hxx> + +using namespace ::xmloff::token; + +static struct ConditionMap +{ + char const* aInternal; + XMLTokenEnum nExternal; + int aValue; +} aConditionMap[] = +{ + { "TableHeader", XML_TABLE_HEADER, -1 }, + { "Table", XML_TABLE, -1 }, + { "Frame", XML_TEXT_BOX, -1 }, // FIXME - Not in ODF spec + { "Section", XML_SECTION, -1 }, + { "Footnote", XML_FOOTNOTE, -1 }, + { "Endnote", XML_ENDNOTE, -1 }, + { "Header", XML_HEADER, -1 }, + { "Footer", XML_FOOTER, -1 }, + { "OutlineLevel1", XML_OUTLINE_LEVEL, 1 }, + { "OutlineLevel2", XML_OUTLINE_LEVEL, 2 }, + { "OutlineLevel3", XML_OUTLINE_LEVEL, 3 }, + { "OutlineLevel4", XML_OUTLINE_LEVEL, 4 }, + { "OutlineLevel5", XML_OUTLINE_LEVEL, 5 }, + { "OutlineLevel6", XML_OUTLINE_LEVEL, 6 }, + { "OutlineLevel7", XML_OUTLINE_LEVEL, 7 }, + { "OutlineLevel8", XML_OUTLINE_LEVEL, 8 }, + { "OutlineLevel9", XML_OUTLINE_LEVEL, 9 }, + { "OutlineLevel10", XML_OUTLINE_LEVEL, 10 }, + { "NumberingLevel1", XML_LIST_LEVEL, 1 }, + { "NumberingLevel2", XML_LIST_LEVEL, 2 }, + { "NumberingLevel3", XML_LIST_LEVEL, 3 }, + { "NumberingLevel4", XML_LIST_LEVEL, 4 }, + { "NumberingLevel5", XML_LIST_LEVEL, 5 }, + { "NumberingLevel6", XML_LIST_LEVEL, 6 }, + { "NumberingLevel7", XML_LIST_LEVEL, 7 }, + { "NumberingLevel8", XML_LIST_LEVEL, 8 }, + { "NumberingLevel9", XML_LIST_LEVEL, 9 }, + { "NumberingLevel10", XML_LIST_LEVEL, 10 } +}; + +#define CONDITION_COUNT (sizeof(aConditionMap) / sizeof(aConditionMap[0])) + +OUString GetParaStyleCondExternal( OUString const &internal) +{ + unsigned i; + + for(i = 0; i < CONDITION_COUNT; ++i) + { + if(internal.compareToAscii( aConditionMap[i].aInternal ) == 0) + { + OUString aResult( GetXMLToken( aConditionMap[i].nExternal ) ); + + aResult += "()"; + if( aConditionMap[i].aValue != -1 ) + { + aResult += "="; + aResult += OUString::number( aConditionMap[i].aValue ); + } + return aResult; + } + } + return OUString(); +} + +OUString GetParaStyleCondInternal( OUString const &external) +{ + sal_Int32 paren = external.indexOf('('); + + if( paren > 0 && external[paren + 1] == ')' ) + { + OUString stub( external.getStr(), paren ); + int numval = -1; + unsigned i; + + if(external.getLength() > paren + 2) + { + if(external[paren + 2] == '=') + { + OUString num( external.getStr() + 3 ); + + numval = num.toInt32(); + } + else + { + return OUString(); + } + } + + for(i = 0; i < CONDITION_COUNT; ++i) + { + if( aConditionMap[i].aValue == numval && + stub == GetXMLToken( aConditionMap[i].nExternal ) ) + { + return OUString( aConditionMap[i].aInternal, + strlen( aConditionMap[i].aInternal ), + RTL_TEXTENCODING_ASCII_US ); + } + } + } + return OUString(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 08f6855fbf21..bd8588a1928a 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> @@ -43,6 +44,7 @@ #include <xmloff/maptype.hxx> #include <memory> #include <set> +#include "prstylecond.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -75,8 +77,54 @@ void XMLStyleExport::exportStyleAttributes( const Reference< XStyle >& ) { } -void XMLStyleExport::exportStyleContent( const Reference< XStyle >& ) +void XMLStyleExport::exportStyleContent( const Reference< XStyle >& rStyle ) { + Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY ); + + try + { + uno::Any aProperty = xPropSet->getPropertyValue( "ParaStyleConditions" ); + uno::Sequence< beans::NamedValue > aSeq; + int i; + + aProperty >>= aSeq; + + for(i = 0; i < aSeq.getLength(); ++i) + { + beans::NamedValue const& aNamedCond = aSeq[i]; + OUString aStyleName; + + if ( aNamedCond.Value >>= aStyleName ) + { + if ( aStyleName.getLength() > 0 ) + { + OUString aExternal = GetParaStyleCondExternal( aNamedCond.Name ); + + if (aExternal.getLength() > 0) + { + bool bEncoded; + + + GetExport().AddAttribute( XML_NAMESPACE_STYLE, + XML_CONDITION, + aExternal); + GetExport().AddAttribute( XML_NAMESPACE_STYLE, + XML_APPLY_STYLE_NAME, + GetExport().EncodeStyleName( aStyleName, + &bEncoded ) ); + SvXMLElementExport aElem( GetExport(), + XML_NAMESPACE_STYLE, + XML_MAP, + true, + true ); + } + } + } + } + } + catch( const beans::UnknownPropertyException& ) + { + } } bool XMLStyleExport::exportStyle( |