[Libreoffice-commits] core.git: 2 commits - writerfilter/CustomTarget_source.mk writerfilter/source
Jan Holesovsky
kendy at collabora.com
Thu Feb 13 12:59:17 CET 2014
writerfilter/CustomTarget_source.mk | 7 -
writerfilter/source/dmapper/DomainMapper.cxx | 26 ++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 +-
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 8 -
writerfilter/source/dmapper/TrackChangesHandler.cxx | 8 -
writerfilter/source/ooxml/factory_values.xsl | 31 +++---
writerfilter/source/ooxml/factoryimpl_values.xsl | 82 -----------------
writerfilter/source/ooxml/fasttokens.xsl | 8 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
9 files changed, 50 insertions(+), 136 deletions(-)
New commits:
commit f48d1df73bc3f777c178d6856f7dc2922265e08b
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Feb 11 14:52:44 2014 +0100
writerfilter: Get rid of a whole load of static OUStrings.
Change-Id: Ic5b254d1e6579baf2c9acdd24ddbaa95d554cf68
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 61744c7..0824258 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -47,7 +47,6 @@ writerfilter_ALL = \
$(writerfilter_GEN_model_SprmCodeToStr_cxx) \
$(writerfilter_GEN_ooxml_Factory_cxx) \
$(writerfilter_GEN_ooxml_Factory_hxx) \
- $(writerfilter_GEN_ooxml_FactoryValues_cxx) \
$(writerfilter_GEN_ooxml_FactoryValues_hxx) \
$(writerfilter_GEN_ooxml_FastTokens_hxx) \
$(writerfilter_GEN_ooxml_GperfFastToken_hxx) \
@@ -63,7 +62,6 @@ writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/gen
writerfilter_GEN_doctok_SprmIds_hxx=$(writerfilter_WORK)/doctok/sprmids.hxx
writerfilter_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx
writerfilter_GEN_model_SprmCodeToStr_tmp=$(writerfilter_WORK)/sprmcodetostr.tmp
-writerfilter_GEN_ooxml_FactoryValues_cxx=$(writerfilter_WORK)/OOXMLFactory_values.cxx
writerfilter_GEN_ooxml_FactoryValues_hxx=$(writerfilter_WORK)/OOXMLFactory_values.hxx
writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/OOXMLFactory_generated.cxx
writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/OOXMLFactory_generated.hxx
@@ -85,7 +83,6 @@ writerfilter_SRC_doctok_SprmIds_xsl=$(writerfilter_SRC)/doctok/sprmids.xsl
writerfilter_SRC_model_NamespacePreprocess=$(writerfilter_SRC)/resourcemodel/namespace_preprocess.pl
writerfilter_SRC_ooxml_Analyze_model_xsl=$(writerfilter_SRC)/ooxml/analyzemodel.xsl
writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl
-writerfilter_SRC_ooxml_FactoryValuesImpl_xsl=$(writerfilter_SRC)/ooxml/factoryimpl_values.xsl
writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl
writerfilter_SRC_ooxml_FastTokens_xsl=$(writerfilter_SRC)/ooxml/fasttokens.xsl
writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.xsl
@@ -115,10 +112,6 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.xsl
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
-$(writerfilter_GEN_ooxml_FactoryValues_cxx) : $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
- $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
-
$(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
diff --git a/writerfilter/source/ooxml/factory_values.xsl b/writerfilter/source/ooxml/factory_values.xsl
index 1d8b378..5f76b22 100644
--- a/writerfilter/source/ooxml/factory_values.xsl
+++ b/writerfilter/source/ooxml/factory_values.xsl
@@ -54,22 +54,23 @@
<!--
Generates constant declarations for attribute values.
-->
- <xsl:template name="valueconstantdecls">
- <xsl:text>
-extern OUString
- </xsl:text>
- <xsl:call-template name="valuestringname">
- <xsl:with-param name="string"></xsl:with-param>
- </xsl:call-template>
- <xsl:text>;</xsl:text>
- <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]">
- <xsl:text>
-extern OUString </xsl:text>
+ <xsl:template name="valueconstants">
+ <xsl:text>#define </xsl:text>
<xsl:call-template name="valuestringname">
- <xsl:with-param name="string" select="."/>
+ <xsl:with-param name="string"></xsl:with-param>
</xsl:call-template>
- <xsl:text>;</xsl:text>
- </xsl:for-each>
+ <xsl:text> ""
+</xsl:text>
+ <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]">
+ <xsl:text>#define </xsl:text>
+ <xsl:call-template name="valuestringname">
+ <xsl:with-param name="string" select="."/>
+ </xsl:call-template>
+ <xsl:text> "</xsl:text>
+ <xsl:value-of select="."/>
+ <xsl:text>"
+</xsl:text>
+ </xsl:for-each>
</xsl:template>
<xsl:template match="/">
@@ -77,7 +78,7 @@ extern OUString </xsl:text>
#ifndef INCLUDED_FACTORY_VALUES</xsl:text>
#include <rtl/ustring.hxx>
-<xsl:call-template name="valueconstantdecls"/>
+<xsl:call-template name="valueconstants"/>
<xsl:text>
#endif // INCLUDED_FACTORY_VALUES
</xsl:text>
</xsl:template>
diff --git a/writerfilter/source/ooxml/factoryimpl_values.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl
deleted file mode 100644
index 886553d..0000000
--- a/writerfilter/source/ooxml/factoryimpl_values.xsl
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
- * 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 .
--->
-<xsl:stylesheet
- version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
- xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
- xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
- xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
- xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
- xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
- xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
- xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
- xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
- xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
- xmlns:math="http://www.w3.org/1998/Math/MathML"
- xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
- xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
- xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
- xmlns:ooo="http://openoffice.org/2004/office"
- xmlns:ooow="http://openoffice.org/2004/writer"
- xmlns:oooc="http://openoffice.org/2004/calc"
- xmlns:dom="http://www.w3.org/2001/xml-events"
- xmlns:xforms="http://www.w3.org/2002/xforms"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rng="http://relaxng.org/ns/structure/1.0"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
- <xsl:output method="text" />
- <xsl:param name="prefix"/>
-
- <xsl:include href="factorytools.xsl"/>
-
- <!--
- Generates constant definitions for attribute values.
- -->
- <xsl:template name="valueconstants">
- <xsl:text>
-OUString </xsl:text>
-<xsl:call-template name="valuestringname">
- <xsl:with-param name="string"></xsl:with-param>
-</xsl:call-template>
-<xsl:text>("");</xsl:text>
-<xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]">
- <xsl:text>
-OUString </xsl:text>
-<xsl:call-template name="valuestringname">
- <xsl:with-param name="string" select="."/>
-</xsl:call-template>
-<xsl:text>("</xsl:text>
-<xsl:value-of select="."/>
-<xsl:text>");</xsl:text>
-</xsl:for-each>
- </xsl:template>
-
- <xsl:template match="/">
- <xsl:text>
-#include "OOXMLFactory_values.hxx"</xsl:text>
-<xsl:call-template name="valueconstants"/>
-<xsl:text>
</xsl:text>
- </xsl:template>
-</xsl:stylesheet>
commit 08aa1c83c7c5b1a244f0d70c9cfe368b99e0d5d2
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Feb 11 14:51:54 2014 +0100
writerfilter: No need to namespace these constants, they have prefix already.
Change-Id: I5590adbf0f60b10d309ddf2a6b9e50231245a659
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 61d32d8..900b95f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3152,23 +3152,23 @@ void DomainMapper::HandleRedline( Sprm& rSprm )
if (nSprmId == NS_ooxml::LN_CT_PPr_pPrChange)
{
- m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_ParagraphFormat );
+ m_pImpl->SetCurrentRedlineToken(OOXML_ParagraphFormat);
}
else if (nSprmId == NS_ooxml::LN_CT_TrPr_ins)
{
- m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowInsert );
+ m_pImpl->SetCurrentRedlineToken(OOXML_tableRowInsert);
}
else if (nSprmId == NS_ooxml::LN_CT_TrPr_del)
{
- m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableRowDelete );
+ m_pImpl->SetCurrentRedlineToken(OOXML_tableRowDelete);
}
else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellIns)
{
- m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableCellInsert );
+ m_pImpl->SetCurrentRedlineToken(OOXML_tableCellInsert);
}
else if (nSprmId == NS_ooxml::LN_CT_TcPrBase_cellDel)
{
- m_pImpl->SetCurrentRedlineToken( ooxml::OOXML_tableCellDelete );
+ m_pImpl->SetCurrentRedlineToken(OOXML_tableCellDelete);
}
resolveSprmProps(*this, rSprm );
@@ -3176,14 +3176,14 @@ void DomainMapper::HandleRedline( Sprm& rSprm )
sal_Int32 nToken = m_pImpl->GetCurrentRedlineToken();
switch( nToken & 0xffff )
{
- case ooxml::OOXML_mod :
- case ooxml::OOXML_ins :
- case ooxml::OOXML_del :
- case ooxml::OOXML_ParagraphFormat :
- case ooxml::OOXML_tableRowInsert:
- case ooxml::OOXML_tableRowDelete:
- case ooxml::OOXML_tableCellInsert:
- case ooxml::OOXML_tableCellDelete:
+ case OOXML_mod:
+ case OOXML_ins:
+ case OOXML_del:
+ case OOXML_ParagraphFormat:
+ case OOXML_tableRowInsert:
+ case OOXML_tableRowDelete:
+ case OOXML_tableCellInsert:
+ case OOXML_tableCellDelete:
break;
default: OSL_FAIL( "redline token other than mod, ins, del or table row" ); break;
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3e0c579..2cbc737 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1508,16 +1508,16 @@ void DomainMapper_Impl::CreateRedline( uno::Reference< text::XTextRange > xRange
PropertyNameSupplier & rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier( );
switch ( pRedline->m_nToken & 0xffff )
{
- case ooxml::OOXML_mod:
+ case OOXML_mod:
sType = rPropNameSupplier.GetName( PROP_FORMAT );
break;
- case ooxml::OOXML_ins:
+ case OOXML_ins:
sType = rPropNameSupplier.GetName( PROP_INSERT );
break;
- case ooxml::OOXML_del:
+ case OOXML_del:
sType = rPropNameSupplier.GetName( PROP_DELETE );
break;
- case ooxml::OOXML_ParagraphFormat:
+ case OOXML_ParagraphFormat:
sType = rPropNameSupplier.GetName( PROP_PARAGRAPH_FORMAT );
break;
default:
@@ -1561,8 +1561,8 @@ void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > xRange
// Adding the non-mod redlines to the temporary vector
if ( pIt->get( ) )
{
- if ( ( ( *pIt )->m_nToken & 0xffff ) != ooxml::OOXML_mod && ( ( *pIt )->m_nToken & 0xffff ) != ooxml::OOXML_ParagraphFormat)
- aCleaned.push_back( *pIt );
+ if (((*pIt)->m_nToken & 0xffff) != OOXML_mod && ((*pIt)->m_nToken & 0xffff) != OOXML_ParagraphFormat)
+ aCleaned.push_back(*pIt);
}
}
@@ -3949,7 +3949,7 @@ bool DomainMapper_Impl::ExecuteFrameConversion()
void DomainMapper_Impl::AddNewRedline( )
{
RedlineParamsPtr pNew( new RedlineParams );
- pNew->m_nToken = ooxml::OOXML_mod;
+ pNew->m_nToken = OOXML_mod;
if ( !m_bIsParaMarkerChange )
{
m_aRedlines.top().push_back( pNew );
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index dcb0b76..d8bcd05 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -117,10 +117,10 @@ namespace dmapper {
switch( nSprmId )
{
case NS_ooxml::LN_CT_TrPr_ins:
- nToken = ooxml::OOXML_tableRowInsert;
+ nToken = OOXML_tableRowInsert;
break;
case NS_ooxml::LN_CT_TrPr_del:
- nToken = ooxml::OOXML_tableRowDelete;
+ nToken = OOXML_tableRowDelete;
break;
default:
throw ::com::sun::star::lang::IllegalArgumentException("illegal redline token type", NULL, 0);
@@ -148,10 +148,10 @@ namespace dmapper {
switch( nSprmId )
{
case NS_ooxml::LN_CT_TcPrBase_cellIns:
- nToken = ooxml::OOXML_tableCellInsert;
+ nToken = OOXML_tableCellInsert;
break;
case NS_ooxml::LN_CT_TcPrBase_cellDel:
- nToken = ooxml::OOXML_tableCellDelete;
+ nToken = OOXML_tableCellDelete;
break;
default:
throw ::com::sun::star::lang::IllegalArgumentException("illegal redline token type", NULL, 0);
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx
index 0773fdc..383ce14 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.cxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx
@@ -69,16 +69,16 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties()
OUString sType;
switch ( m_pRedlineParams->m_nToken & 0xffff )
{
- case ooxml::OOXML_tableRowInsert:
+ case OOXML_tableRowInsert:
sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_INSERT );
break;
- case ooxml::OOXML_tableRowDelete:
+ case OOXML_tableRowDelete:
sType = rPropNameSupplier.GetName( PROP_TABLE_ROW_DELETE );
break;
- case ooxml::OOXML_tableCellInsert:
+ case OOXML_tableCellInsert:
sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_INSERT );
break;
- case ooxml::OOXML_tableCellDelete:
+ case OOXML_tableCellDelete:
sType = rPropNameSupplier.GetName( PROP_TABLE_CELL_DELETE );
break;
}
diff --git a/writerfilter/source/ooxml/fasttokens.xsl b/writerfilter/source/ooxml/fasttokens.xsl
index c87fc92..7a8cae3 100644
--- a/writerfilter/source/ooxml/fasttokens.xsl
+++ b/writerfilter/source/ooxml/fasttokens.xsl
@@ -83,18 +83,20 @@ const Token_t OOXML_FAST_TOKENS_END =</xsl:text>
#include <resourcemodel/WW8ResourceModel.hxx>
-namespace writerfilter {
-namespace ooxml {
using namespace ::std;
using namespace ::com::sun::star;
</xsl:text>
<xsl:call-template name="fasttokens"/>
<xsl:text>
+namespace writerfilter {
+namespace ooxml {
+
string fastTokenToId(sal_uInt32 nToken);
+}}
+
static const sal_uInt32 F_Attribute = 1U << 31;
-}}
#endif //INCLUDED_OOXML_FAST_TOKENS_HXX
</xsl:text></out></xsl:template>
<xsl:template match="*"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 05f4860..2533eaa 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3856,7 +3856,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
case RTF_DELETED:
case RTF_REVISED:
{
- RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_DELETED ? ooxml::OOXML_del : ooxml::OOXML_ins));
+ RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_DELETED ? OOXML_del : OOXML_ins));
lcl_putNestedAttribute(m_aStates.top().aCharacterSprms,
NS_ooxml::LN_trackchange, NS_ooxml::LN_token, pValue);
}
More information about the Libreoffice-commits
mailing list